From 391313cd396f1487675dd560ae1f201dcc707390 Mon Sep 17 00:00:00 2001
From: Jon Bockhorst <jmbockhorst@gmail.com>
Date: Tue, 11 Feb 2020 13:32:55 -0600
Subject: [PATCH] Revert some formatting and remove puppeteer

---
 addons/xterm-addon-fit/src/FitAddon.api.ts |  16 +-
 package.json                               |   1 -
 test/api/CharWidth.api.ts                  |  16 +-
 test/api/InputHandler.api.ts               |  50 +--
 test/api/MouseTracking.api.ts              | 438 ++++++++++-----------
 yarn.lock                                  |  14 -
 6 files changed, 260 insertions(+), 275 deletions(-)

diff --git a/addons/xterm-addon-fit/src/FitAddon.api.ts b/addons/xterm-addon-fit/src/FitAddon.api.ts
index c170d75a..4a30db90 100644
--- a/addons/xterm-addon-fit/src/FitAddon.api.ts
+++ b/addons/xterm-addon-fit/src/FitAddon.api.ts
@@ -15,7 +15,7 @@ const width = 1024;
 const height = 768;
 
 describe('FitAddon', () => {
-  before(async function (): Promise<any> {
+  before(async function(): Promise<any> {
     this.timeout(20000);
     browser = await getBrowserType().launch({
       headless: process.argv.indexOf('--headless') !== -1,
@@ -31,7 +31,7 @@ describe('FitAddon', () => {
     await browser.close();
   });
 
-  it('no terminal', async function (): Promise<any> {
+  it('no terminal', async function(): Promise<any> {
     await page.evaluate(`window.fit = new FitAddon();`);
     assert.equal(await page.evaluate(`window.fit.proposeDimensions()`), undefined);
   });
@@ -41,7 +41,7 @@ describe('FitAddon', () => {
       return unloadFit();
     });
 
-    it('default', async function (): Promise<any> {
+    it('default', async function(): Promise<any> {
       await loadFit();
       assert.deepEqual(await page.evaluate(`window.fit.proposeDimensions()`), {
         cols: 87,
@@ -49,7 +49,7 @@ describe('FitAddon', () => {
       });
     });
 
-    it('width', async function (): Promise<any> {
+    it('width', async function(): Promise<any> {
       await loadFit(1008);
       assert.deepEqual(await page.evaluate(`window.fit.proposeDimensions()`), {
         cols: 110,
@@ -57,7 +57,7 @@ describe('FitAddon', () => {
       });
     });
 
-    it('small', async function (): Promise<any> {
+    it('small', async function(): Promise<any> {
       await loadFit(1, 1);
       assert.deepEqual(await page.evaluate(`window.fit.proposeDimensions()`), {
         cols: 2,
@@ -71,21 +71,21 @@ describe('FitAddon', () => {
       return unloadFit();
     });
 
-    it('default', async function (): Promise<any> {
+    it('default', async function(): Promise<any> {
       await loadFit();
       await page.evaluate(`window.fit.fit()`);
       assert.equal(await page.evaluate(`window.term.cols`), 87);
       assert.equal(await page.evaluate(`window.term.rows`), 26);
     });
 
-    it('width', async function (): Promise<any> {
+    it('width', async function(): Promise<any> {
       await loadFit(1008);
       await page.evaluate(`window.fit.fit()`);
       assert.equal(await page.evaluate(`window.term.cols`), 110);
       assert.equal(await page.evaluate(`window.term.rows`), 26);
     });
 
-    it('small', async function (): Promise<any> {
+    it('small', async function(): Promise<any> {
       await loadFit(1, 1);
       await page.evaluate(`window.fit.fit()`);
       assert.equal(await page.evaluate(`window.term.cols`), 2);
diff --git a/package.json b/package.json
index 2d61fac8..b4f3de39 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,6 @@
     "node-pty": "^0.9.0",
     "nyc": "13",
     "playwright": "^0.10.0",
-    "puppeteer": "^1.15.0",
     "source-map-loader": "^0.2.4",
     "ts-loader": "^6.0.4",
     "tslint": "^5.18.0",
diff --git a/test/api/CharWidth.api.ts b/test/api/CharWidth.api.ts
index 63b94aa7..79040942 100644
--- a/test/api/CharWidth.api.ts
+++ b/test/api/CharWidth.api.ts
@@ -14,8 +14,8 @@ let page: Page;
 const width = 800;
 const height = 600;
 
-describe('CharWidth Integration Tests', function (): void {
-  before(async function (): Promise<any> {
+describe('CharWidth Integration Tests', function(): void {
+  before(async function(): Promise<any> {
     browser = await getBrowserType().launch({
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
@@ -35,37 +35,37 @@ describe('CharWidth Integration Tests', function (): void {
       await page.evaluate(`window.term.reset()`);
     });
 
-    it('ASCII chars', async function (): Promise<void> {
+    it('ASCII chars', async function(): Promise<void> {
       const input = 'This is just ASCII text.#';
       await page.evaluate(`window.term.write('${input}')`);
       await pollFor(page, () => sumWidths(0, 1, '#'), 25);
     });
 
-    it('combining chars', async function (): Promise<void> {
+    it('combining chars', async function(): Promise<void> {
       const input = 'e\u0301e\u0301e\u0301e\u0301e\u0301e\u0301e\u0301e\u0301e\u0301#';
       await page.evaluate(`window.term.write('${input}')`);
       await pollFor(page, () => sumWidths(0, 1, '#'), 10);
     });
 
-    it('surrogate chars', async function (): Promise<void> {
+    it('surrogate chars', async function(): Promise<void> {
       const input = '𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞𝄞#';
       await page.evaluate(`window.term.write('${input}')`);
       await pollFor(page, () => sumWidths(0, 1, '#'), 28);
     });
 
-    it('surrogate combining chars', async function (): Promise<void> {
+    it('surrogate combining chars', async function(): Promise<void> {
       const input = '𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301𓂀\u0301#';
       await page.evaluate(`window.term.write('${input}')`);
       await pollFor(page, () => sumWidths(0, 1, '#'), 12);
     });
 
-    it('fullwidth chars', async function (): Promise<void> {
+    it('fullwidth chars', async function(): Promise<void> {
       const input = '１２３４５６７８９０#';
       await page.evaluate(`window.term.write('${input}')`);
       await pollFor(page, () => sumWidths(0, 1, '#'), 21);
     });
 
-    it('fullwidth chars offset 1', async function (): Promise<void> {
+    it('fullwidth chars offset 1', async function(): Promise<void> {
       const input = 'a１２３４５６７８９０#';
       await page.evaluate(`window.term.write('${input}')`);
       await pollFor(page, () => sumWidths(0, 1, '#'), 22);
diff --git a/test/api/InputHandler.api.ts b/test/api/InputHandler.api.ts
index c95b83f8..95682aa5 100644
--- a/test/api/InputHandler.api.ts
+++ b/test/api/InputHandler.api.ts
@@ -15,8 +15,8 @@ let page: Page;
 const width = 800;
 const height = 600;
 
-describe('InputHandler Integration Tests', function (): void {
-  before(async function (): Promise<any> {
+describe('InputHandler Integration Tests', function(): void {
+  before(async function(): Promise<any> {
     browser = await getBrowserType().launch({
       headless: process.argv.indexOf('--headless') !== -1,
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
@@ -36,7 +36,7 @@ describe('InputHandler Integration Tests', function (): void {
       await page.evaluate(`window.term.reset()`);
     });
 
-    it('ICH: Insert Ps (Blank) Character(s) (default = 1) - CSI Ps @', async function (): Promise<any> {
+    it('ICH: Insert Ps (Blank) Character(s) (default = 1) - CSI Ps @', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('foo\\x1b[3D\\x1b[@\\n\\r')
@@ -46,7 +46,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(2), [' foo', '    bar']);
     });
 
-    it('CUU: Cursor Up Ps Times (default = 1) - CSI Ps A', async function (): Promise<any> {
+    it('CUU: Cursor Up Ps Times (default = 1) - CSI Ps A', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('\\n\\n\\n\\n\x1b[Aa')
@@ -56,7 +56,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(4), ['', ' b', '', 'a']);
     });
 
-    it('CUD: Cursor Down Ps Times (default = 1) - CSI Ps B', async function (): Promise<any> {
+    it('CUD: Cursor Down Ps Times (default = 1) - CSI Ps B', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('\x1b[Ba')
@@ -66,7 +66,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(4), ['', 'a', '', ' b']);
     });
 
-    it('CUF: Cursor Forward Ps Times (default = 1) - CSI Ps C', async function (): Promise<any> {
+    it('CUF: Cursor Forward Ps Times (default = 1) - CSI Ps C', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('\x1b[Ca')
@@ -76,7 +76,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(1), [' a  b']);
     });
 
-    it('CUB: Cursor Backward Ps Times (default = 1) - CSI Ps D', async function (): Promise<any> {
+    it('CUB: Cursor Backward Ps Times (default = 1) - CSI Ps D', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('foo\x1b[Da')
@@ -86,7 +86,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(1), ['fba']);
     });
 
-    it('CNL: Cursor Next Line Ps Times (default = 1) - CSI Ps E', async function (): Promise<any> {
+    it('CNL: Cursor Next Line Ps Times (default = 1) - CSI Ps E', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('\x1b[Ea')
@@ -96,7 +96,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(4), ['', 'a', '', 'b']);
     });
 
-    it('CPL: Cursor Preceding Line Ps Times (default = 1) - CSI Ps F', async function (): Promise<any> {
+    it('CPL: Cursor Preceding Line Ps Times (default = 1) - CSI Ps F', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('\\n\\n\\n\\n\x1b[Fa')
@@ -106,7 +106,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(5), ['', 'b', '', 'a', '']);
     });
 
-    it('CHA: Cursor Character Absolute [column] (default = [row,1]) - CSI Ps G', async function (): Promise<any> {
+    it('CHA: Cursor Character Absolute [column] (default = [row,1]) - CSI Ps G', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('foo\x1b[Ga')
@@ -116,7 +116,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(1), ['aoo      b']);
     });
 
-    it('CUP: Cursor Position [row;column] (default = [1,1]) - CSI Ps ; Ps H', async function (): Promise<any> {
+    it('CUP: Cursor Position [row;column] (default = [1,1]) - CSI Ps ; Ps H', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('foo\x1b[Ha')
@@ -126,7 +126,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(3), ['aoo', '', '  b']);
     });
 
-    it('CHT: Cursor Forward Tabulation Ps tab stops (default = 1) - CSI Ps I', async function (): Promise<any> {
+    it('CHT: Cursor Forward Tabulation Ps tab stops (default = 1) - CSI Ps I', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('\x1b[Ia')
@@ -136,7 +136,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(2), ['        a', '                b']);
     });
 
-    it('ED: Erase in Display, VT100 - CSI Ps J', async function (): Promise<any> {
+    it('ED: Erase in Display, VT100 - CSI Ps J', async function(): Promise<any> {
       const fixture = 'abc\\n\\rdef\\n\\rghi\x1b[2;2H';
       await page.evaluate(`
         // Default: Erase Below
@@ -165,7 +165,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(5), ['   4', '    5', 'abc', 'def', 'ghi']);
     });
 
-    it('DECSED: Erase in Display, VT220 - CSI ? Ps J', async function (): Promise<any> {
+    it('DECSED: Erase in Display, VT220 - CSI ? Ps J', async function(): Promise<any> {
       const fixture = 'abc\\n\\rdef\\n\\rghi\x1b[2;2H';
       await page.evaluate(`
         // Default: Erase Below
@@ -194,7 +194,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(5), ['   4', '    5', 'abc', 'def', 'ghi']);
     });
 
-    it('IL: Insert Ps Line(s) (default = 1) - CSI Ps L', async function (): Promise<any> {
+    it('IL: Insert Ps Line(s) (default = 1) - CSI Ps L', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('foo\x1b[La')
@@ -204,7 +204,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(4), ['b', '', 'a', 'foo']);
     });
 
-    it('DL: Delete Ps Line(s) (default = 1) - CSI Ps M', async function (): Promise<any> {
+    it('DL: Delete Ps Line(s) (default = 1) - CSI Ps M', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('a\\nb\x1b[1F\x1b[M')
@@ -214,7 +214,7 @@ describe('InputHandler Integration Tests', function (): void {
       await pollFor(page, () => getLinesAsArray(5), [' b', '  f', '', '', '']);
     });
 
-    it('DCH: Delete Ps Character(s) (default = 1) - CSI Ps P', async function (): Promise<any> {
+    it('DCH: Delete Ps Character(s) (default = 1) - CSI Ps P', async function(): Promise<any> {
       await page.evaluate(`
         // Default
         window.term.write('abc\x1b[1;1H\x1b[P')
@@ -225,7 +225,7 @@ describe('InputHandler Integration Tests', function (): void {
     });
 
     describe('DSR: Device Status Report', () => {
-      it('Status Report - CSI 5 n', async function (): Promise<any> {
+      it('Status Report - CSI 5 n', async function(): Promise<any> {
         await page.evaluate(`
           window.term.onData(e => window.result = e);
           window.term.write('\\x1b[5n');
@@ -233,7 +233,7 @@ describe('InputHandler Integration Tests', function (): void {
         await pollFor(page, () => page.evaluate(`window.result`), '\x1b[0n');
       });
 
-      it('Report Cursor Position (CPR) - CSI 6 n', async function (): Promise<any> {
+      it('Report Cursor Position (CPR) - CSI 6 n', async function(): Promise<any> {
         await page.evaluate(`window.term.write('\\n\\nfoo')`);
         await pollFor(page, () => page.evaluate(`
           [window.term.buffer.cursorY, window.term.buffer.cursorX]
@@ -245,7 +245,7 @@ describe('InputHandler Integration Tests', function (): void {
         await pollFor(page, () => page.evaluate(`window.result`), '\x1b[3;4R');
       });
 
-      it('Report Cursor Position (DECXCPR) - CSI ? 6 n', async function (): Promise<any> {
+      it('Report Cursor Position (DECXCPR) - CSI ? 6 n', async function(): Promise<any> {
         await page.evaluate(`window.term.write('\\n\\nfoo')`);
         await pollFor(page, () => page.evaluate(`
           [window.term.buffer.cursorY, window.term.buffer.cursorX]
@@ -286,7 +286,7 @@ describe('InputHandler Integration Tests', function (): void {
           await pollFor(page, () => page.evaluate(`window.term.getSelection().length`), 0);
           await page.mouse.up();
         });
-        it('Pm = 2004, Set bracketed paste mode', async function (): Promise<any> {
+        it('Pm = 2004, Set bracketed paste mode', async function(): Promise<any> {
           await pollFor(page, () => simulatePaste('foo'), 'foo');
           await page.evaluate(`window.term.write('\x1b[?2004h')`);
           await pollFor(page, () => simulatePaste('bar'), '\x1b[200~bar\x1b[201~');
@@ -296,7 +296,7 @@ describe('InputHandler Integration Tests', function (): void {
       });
     });
 
-    it('REP: Repeat preceding character, ECMA48 - CSI Ps b', async function (): Promise<any> {
+    it('REP: Repeat preceding character, ECMA48 - CSI Ps b', async function(): Promise<any> {
       // default to 1
       await page.evaluate(`
         window.term.resize(10, 10);
@@ -347,7 +347,7 @@ describe('InputHandler Integration Tests', function (): void {
     });
 
     describe('Window Options - CSI Ps ; Ps ; Ps t', () => {
-      it('should be disabled by default', async function () {
+      it('should be disabled by default', async function() {
         await page.evaluate(`(() => {
           window._stack = [];
           const _h = window.term.onData(data => window._stack.push(data));
@@ -360,7 +360,7 @@ describe('InputHandler Integration Tests', function (): void {
         })()`);
         await pollFor(page, async () => await page.evaluate(`(() => _stack)()`), []);
       });
-      it('14 - GetWinSizePixels', async function () {
+      it('14 - GetWinSizePixels', async function() {
         await page.evaluate(`window.term.setOption('windowOptions', {getWinSizePixels: true});`);
         await page.evaluate(`(() => {
           window._stack = [];
@@ -371,7 +371,7 @@ describe('InputHandler Integration Tests', function (): void {
         const d = await getDimensions();
         await pollFor(page, async () => await page.evaluate(`(() => _stack)()`), [`\x1b[4;${d.height};${d.width}t`]);
       });
-      it('16 - GetCellSizePixels', async function () {
+      it('16 - GetCellSizePixels', async function() {
         await page.evaluate(`window.term.setOption('windowOptions', {getCellSizePixels: true});`);
         await page.evaluate(`(() => {
           window._stack = [];
diff --git a/test/api/MouseTracking.api.ts b/test/api/MouseTracking.api.ts
index 98b65b2a..65131760 100644
--- a/test/api/MouseTracking.api.ts
+++ b/test/api/MouseTracking.api.ts
@@ -77,10 +77,10 @@ async function mouseMove(col: number, row: number): Promise<void> {
   return await page.mouse.move(xPixels, yPixels);
 }
 async function mouseDown(button: 'left' | 'right' | 'middle' | undefined): Promise<void> {
-  return await page.mouse.down({ button });
+  return await page.mouse.down({button});
 }
 async function mouseUp(button: 'left' | 'right' | 'middle' | undefined): Promise<void> {
-  return await page.mouse.up({ button });
+  return await page.mouse.up({button});
 }
 async function wheelUp(): Promise<void> {
   const self = (page.mouse as any);
@@ -123,7 +123,7 @@ function toModifiersMask(modifiers: Set<String>): number {
 }
 
 // button definitions
-const buttons: { [key: string]: number } = {
+const buttons: {[key: string]: number} = {
   '<none>': -1,
   left: 0,
   middle: 1,
@@ -150,9 +150,9 @@ for (const el in buttons) {
 // extract button data from buttonCode
 function evalButtonCode(code: number): any {
   if (code > 255) {
-    return { button: 'invalid', action: 'invalid', modifier: {} };
+    return {button: 'invalid', action: 'invalid', modifier: {}};
   }
-  const modifier = { shift: !!(code & 4), meta: !!(code & 8), control: !!(code & 16) };
+  const modifier = {shift: !!(code & 4), meta: !!(code & 8), control: !!(code & 16)};
   const move = code & 32;
   let button = code & 3;
   if (code & 128) {
@@ -173,11 +173,11 @@ function evalButtonCode(code: number): any {
     buttonS = 'wheel';
     actionS = button === 4 ? 'up' : button === 5 ? 'down' : button === 6 ? 'left' : 'right';
   }
-  return { button: buttonS, action: actionS, modifier };
+  return {button: buttonS, action: actionS, modifier};
 }
 
 // parse a single mouse report
-function parseReport(encoding: string, msg: number[]): { state: any; row: number; col: number; } | string {
+function parseReport(encoding: string, msg: number[]): {state: any; row: number; col: number;} | string {
   let sReport: string;
   let buttonCode: number;
   let row: number;
@@ -202,7 +202,7 @@ function parseReport(encoding: string, msg: number[]): { state: any; row: number
       if (report[report.length - 1] === 'm') {
         state.action = 'release';
       }
-      return { state, row, col };
+      return {state, row, col};
     default:
       return {
         state: evalButtonCode(report.charCodeAt(3) - 32),
@@ -222,7 +222,7 @@ describe('Mouse Tracking Tests', () => {
       args: [`--window-size=${width},${height}`, `--no-sandbox`]
     });
     page = (await browser.defaultContext().pages())[0];
-    await page.setViewport({ width, height });
+    await page.setViewport({width, height});
   });
 
   after(async () => browser.close());
@@ -259,7 +259,7 @@ describe('Mouse Tracking Tests', () => {
 
       // test at 0,0
       await mouseDown('left');
-      await pollFor(page, () => getReports(encoding), [{ col: 1, row: 1, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
 
       // mouseup should not report
       await mouseUp('left');
@@ -270,14 +270,14 @@ describe('Mouse Tracking Tests', () => {
       await pollFor(page, () => getReports(encoding), []);
       await mouseDown('left');
       await mouseUp('left');
-      await pollFor(page, () => getReports(encoding), [{ col: 51, row: 11, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
 
       // test at max rows/cols
       // capped at 223 (1-based)
       await mouseMove(223 - 1, rows - 1);
       await mouseDown('left');
       await mouseUp('left');
-      await pollFor(page, () => getReports(encoding), [{ col: 223, row: rows, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 223, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
 
       // higher than 223 should not report at all
       await mouseMove(257, rows - 1);
@@ -292,7 +292,7 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseMove(44, 24);
       await mouseUp('left');
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
       // middle button
       // bug: default action not cancelled (adds data to getReports from clipboard under X11)
       // await mouseMove(43, 24);
@@ -308,7 +308,7 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('right');
       await mouseMove(44, 24);
       await mouseUp('right');
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}}]);
 
       // wheel
       await mouseMove(43, 24);
@@ -328,7 +328,7 @@ describe('Mouse Tracking Tests', () => {
       await mouseUp('left');
       await wheelDown();
       await page.keyboard.up('Control');
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
 
 
       // ALT
@@ -340,7 +340,7 @@ describe('Mouse Tracking Tests', () => {
       await mouseUp('left');
       await wheelDown();
       await page.keyboard.up('Alt');
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
 
       // SHIFT
       // note: caught by selection manager
@@ -358,7 +358,7 @@ describe('Mouse Tracking Tests', () => {
         await pollFor(page, () => getReports(encoding), []);
       } else {
         await pollFor(page, () => getReports(encoding), [
-          { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+          {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
         ]);
       }
 
@@ -376,7 +376,7 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Control');
       await page.keyboard.up('Alt');
       // await page.keyboard.up('Shift');
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
     });
     it('SGR encoding', async () => {
       const encoding = 'SGR';
@@ -386,7 +386,7 @@ describe('Mouse Tracking Tests', () => {
 
       // test at 0,0
       await mouseDown('left');
-      await pollFor(page, () => getReports(encoding), [{ col: 1, row: 1, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
 
       // mouseup should not report
       await mouseUp('left');
@@ -397,13 +397,13 @@ describe('Mouse Tracking Tests', () => {
       await pollFor(page, () => getReports(encoding), []);
       await mouseDown('left');
       await mouseUp('left');
-      await pollFor(page, () => getReports(encoding), [{ col: 51, row: 11, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
 
       // test at max rows/cols
       await mouseMove(cols - 1, rows - 1);
       await mouseDown('left');
       await mouseUp('left');
-      await pollFor(page, () => getReports(encoding), [{ col: cols, row: rows, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: cols, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
 
       // button press/move/release tests
       // left button
@@ -412,7 +412,7 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseMove(44, 24);
       await mouseUp('left');
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
       // middle button
       // bug: default action not cancelled (adds data to getReports from clipboard under X11)
       // await mouseMove(43, 24);
@@ -428,7 +428,7 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('right');
       await mouseMove(44, 24);
       await mouseUp('right');
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}}]);
 
       // wheel
       await mouseMove(43, 24);
@@ -448,7 +448,7 @@ describe('Mouse Tracking Tests', () => {
       await mouseUp('left');
       await wheelDown();
       await page.keyboard.up('Control');
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
 
 
       // ALT
@@ -460,7 +460,7 @@ describe('Mouse Tracking Tests', () => {
       await mouseUp('left');
       await wheelDown();
       await page.keyboard.up('Alt');
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
 
       // SHIFT
       // note: caught by selection manager
@@ -476,7 +476,7 @@ describe('Mouse Tracking Tests', () => {
         await pollFor(page, () => getReports(encoding), []);
       } else {
         await pollFor(page, () => getReports(encoding), [
-          { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+          {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
         ]);
       }
 
@@ -494,7 +494,7 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Control');
       await page.keyboard.up('Alt');
       // await page.keyboard.up('Shift');
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}]);
     });
   });
   describe('DECSET 1000 (VT200 mouse)', () => {
@@ -514,13 +514,13 @@ describe('Mouse Tracking Tests', () => {
       // test at 0,0
       await mouseDown('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mouseup should report, encoding cannot report released button
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mousemove should not report
@@ -529,8 +529,8 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 51, row: 11, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 51, row: 11, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 51, row: 11, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // test at max rows/cols
@@ -539,8 +539,8 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 223, row: rows, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 223, row: rows, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 223, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 223, row: rows, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // button press/move/release tests
@@ -551,8 +551,8 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
       // middle button
       // bug: default action not cancelled (adds data to getReports from clipboard under X11)
@@ -570,17 +570,17 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('right');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // wheel
       await mouseMove(43, 24);
       await getReports(encoding); // clear reports
       await wheelUp();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
       await wheelDown();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
 
       // modifiers
       // CTRL
@@ -593,9 +593,9 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Control');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: false}}}
       ]);
 
       // ALT
@@ -608,9 +608,9 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Alt');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: true}}}
       ]);
 
       // SHIFT
@@ -626,13 +626,13 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Shift');
       if (noShift) {
         await pollFor(page, () => getReports(encoding), [
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       } else {
         await pollFor(page, () => getReports(encoding), [
-          { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       }
 
@@ -651,9 +651,9 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Alt');
       // await page.keyboard.up('Shift');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: true}}}
       ]);
     });
     it('SGR encoding', async () => {
@@ -665,13 +665,13 @@ describe('Mouse Tracking Tests', () => {
       // test at 0,0
       await mouseDown('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mouseup should report
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mousemove should not report
@@ -680,8 +680,8 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 51, row: 11, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 51, row: 11, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 51, row: 11, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // test at max rows/cols
@@ -689,8 +689,8 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: cols, row: rows, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: cols, row: rows, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: cols, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: cols, row: rows, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // button press/move/release tests
@@ -701,8 +701,8 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
       // middle button
       // bug: default action not cancelled (adds data to getReports from clipboard under X11)
@@ -720,17 +720,17 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('right');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'right', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'right', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // wheel
       await mouseMove(43, 24);
       await getReports(encoding); // clear reports
       await wheelUp();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
       await wheelDown();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
 
       // modifiers
       // CTRL
@@ -743,9 +743,9 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Control');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: false}}}
       ]);
 
       // ALT
@@ -758,9 +758,9 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Alt');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: true}}}
       ]);
 
       // SHIFT
@@ -775,13 +775,13 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Shift');
       if (noShift) {
         await pollFor(page, () => getReports(encoding), [
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       } else {
         await pollFor(page, () => getReports(encoding), [
-          { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       }
 
@@ -800,9 +800,9 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Alt');
       // await page.keyboard.up('Shift');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: true}}}
       ]);
     });
   });
@@ -823,13 +823,13 @@ describe('Mouse Tracking Tests', () => {
       // test at 0,0
       await mouseDown('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mouseup should report, encoding cannot report released button
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mousemove should not report
@@ -838,8 +838,8 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 51, row: 11, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 51, row: 11, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 51, row: 11, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // test at max rows/cols
@@ -848,8 +848,8 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 223, row: rows, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 223, row: rows, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 223, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 223, row: rows, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // button press/move/release tests
@@ -860,9 +860,9 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
       // middle button
       // bug: default action not cancelled (adds data to getReports from clipboard under X11)
@@ -880,18 +880,18 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('right');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'right', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'right', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // wheel
       await mouseMove(43, 24);
       await getReports(encoding); // clear reports
       await wheelUp();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
       await wheelDown();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
 
       // modifiers
       // CTRL
@@ -904,10 +904,10 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Control');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: false}}}
       ]);
 
       // ALT
@@ -920,10 +920,10 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Alt');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: true}}}
       ]);
 
       // SHIFT
@@ -938,14 +938,14 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Shift');
       if (noShift) {
         await pollFor(page, () => getReports(encoding), [
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       } else {
         await pollFor(page, () => getReports(encoding), [
-          { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       }
 
@@ -964,10 +964,10 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Alt');
       // await page.keyboard.up('Shift');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: true}}}
       ]);
     });
     it('SGR encoding', async () => {
@@ -980,13 +980,13 @@ describe('Mouse Tracking Tests', () => {
       // bug: release is fired immediately
       await mouseDown('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mouseup should report, encoding cannot report released button
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mousemove should not report
@@ -995,8 +995,8 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 51, row: 11, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 51, row: 11, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 51, row: 11, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // test at max rows/cols
@@ -1004,8 +1004,8 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: cols, row: rows, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: cols, row: rows, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: cols, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: cols, row: rows, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // button press/move/release tests
@@ -1016,9 +1016,9 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
       // middle button
       // bug: default action not cancelled (adds data to getReports from clipboard under X11)
@@ -1036,18 +1036,18 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('right');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'right', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'right', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'right', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'right', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // wheel
       await mouseMove(43, 24);
       await getReports(encoding); // clear reports
       await wheelUp();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
       await wheelDown();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
 
       // modifiers
       // CTRL
@@ -1060,10 +1060,10 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Control');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: false}}}
       ]);
 
       // ALT
@@ -1076,10 +1076,10 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Alt');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: true}}}
       ]);
 
       // SHIFT
@@ -1094,14 +1094,14 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Shift');
       if (noShift) {
         await pollFor(page, () => getReports(encoding), [
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       } else {
         await pollFor(page, () => getReports(encoding), [
-          { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       }
 
@@ -1120,10 +1120,10 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Alt');
       // await page.keyboard.up('Shift');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: true}}}
       ]);
     });
   });
@@ -1141,25 +1141,25 @@ describe('Mouse Tracking Tests', () => {
       // test at 0,0
       await mouseDown('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mouseup should report, encoding cannot report released button
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mousemove should report
       await mouseMove(50, 10);
       await pollFor(page, () => getReports(encoding), [
-        { col: 51, row: 11, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 51, row: 11, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 51, row: 11, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 51, row: 11, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 51, row: 11, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // test at max rows/cols
@@ -1168,9 +1168,9 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 223, row: rows, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: false } } },
-        { col: 223, row: rows, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 223, row: rows, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 223, row: rows, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
+        {col: 223, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 223, row: rows, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // button press/move/release tests
@@ -1180,10 +1180,10 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: false } } },
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
       // middle button
       // bug: default action not cancelled (adds data to getReports from clipboard under X11)
@@ -1200,19 +1200,19 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('right');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: false } } },
-        { col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'right', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
+        {col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'right', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // wheel
       await mouseMove(43, 24);
       await getReports(encoding); // clear reports
       await wheelUp();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
       await wheelDown();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
 
       // modifiers
       // CTRL
@@ -1224,11 +1224,11 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Control');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: true, shift: false, meta: false } } },
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: true, shift: false, meta: false}}},
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: false}}}
       ]);
 
       // ALT
@@ -1240,11 +1240,11 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Alt');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: true } } },
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: true}}},
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: true}}}
       ]);
 
       // SHIFT
@@ -1258,16 +1258,16 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Shift');
       if (noShift) {
         await pollFor(page, () => getReports(encoding), [
-          { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       } else {
         await pollFor(page, () => getReports(encoding), [
-          { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
-          { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
+          {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       }
 
@@ -1285,11 +1285,11 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Alt');
       // await page.keyboard.up('Shift');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: true, shift: false, meta: true } } },
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: '<none>', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: true, shift: false, meta: true}}},
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: '<none>', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: true}}}
       ]);
     });
     it('SGR encoding', async () => {
@@ -1301,25 +1301,25 @@ describe('Mouse Tracking Tests', () => {
       // test at 0,0
       await mouseDown('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mouseup should report, encoding cannot report released button
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 1, row: 1, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 1, row: 1, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // mousemove should report
       await mouseMove(50, 10);
       await pollFor(page, () => getReports(encoding), [
-        { col: 51, row: 11, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: false } } }
+        {col: 51, row: 11, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}}
       ]);
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 51, row: 11, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 51, row: 11, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 51, row: 11, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 51, row: 11, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // test at max rows/cols
@@ -1329,9 +1329,9 @@ describe('Mouse Tracking Tests', () => {
       await mouseDown('left');
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: cols, row: rows, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: false } } },
-        { col: cols, row: rows, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: cols, row: rows, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: cols, row: rows, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
+        {col: cols, row: rows, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: cols, row: rows, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // button press/move/release tests
@@ -1341,10 +1341,10 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('left');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: false } } },
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: false}}}
       ]);
       // middle button
       // bug: default action not cancelled (adds data to getReports from clipboard under X11)
@@ -1361,19 +1361,19 @@ describe('Mouse Tracking Tests', () => {
       await mouseMove(44, 24);
       await mouseUp('right');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: false } } },
-        { col: 44, row: 25, state: { action: 'press', button: 'right', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'right', modifier: { control: false, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'right', modifier: { control: false, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: false}}},
+        {col: 44, row: 25, state: {action: 'press', button: 'right', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'right', modifier: {control: false, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'right', modifier: {control: false, shift: false, meta: false}}}
       ]);
 
       // wheel
       await mouseMove(43, 24);
       await getReports(encoding); // clear reports
       await wheelUp();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'up', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'up', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
       await wheelDown();
-      await pollFor(page, () => getReports(encoding), [{ col: 44, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: false } } }]);
+      await pollFor(page, () => getReports(encoding), [{col: 44, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: false}}}]);
 
       // modifiers
       // CTRL
@@ -1385,11 +1385,11 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Control');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: true, shift: false, meta: false } } },
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: false } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: false } } }
+        {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: true, shift: false, meta: false}}},
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: true, shift: false, meta: false}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: false}}}
       ]);
 
       // ALT
@@ -1401,11 +1401,11 @@ describe('Mouse Tracking Tests', () => {
       await wheelDown();
       await page.keyboard.up('Alt');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: false, meta: true } } },
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: false, meta: true}}},
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: false, meta: true}}}
       ]);
 
       // SHIFT
@@ -1419,16 +1419,16 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Shift');
       if (noShift) {
         await pollFor(page, () => getReports(encoding), [
-          { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       } else {
         await pollFor(page, () => getReports(encoding), [
-          { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: false, shift: true, meta: false } } },
-          { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: false, shift: true, meta: false } } },
-          { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: false, shift: true, meta: false } } }
+          {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: false, shift: true, meta: false}}},
+          {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: false, shift: true, meta: false}}},
+          {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: false, shift: true, meta: false}}}
         ]);
       }
 
@@ -1446,11 +1446,11 @@ describe('Mouse Tracking Tests', () => {
       await page.keyboard.up('Alt');
       // await page.keyboard.up('Shift');
       await pollFor(page, () => getReports(encoding), [
-        { col: 44, row: 25, state: { action: 'move', button: '<none>', modifier: { control: true, shift: false, meta: true } } },
-        { col: 44, row: 25, state: { action: 'press', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'move', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'release', button: 'left', modifier: { control: true, shift: false, meta: true } } },
-        { col: 45, row: 25, state: { action: 'down', button: 'wheel', modifier: { control: true, shift: false, meta: true } } }
+        {col: 44, row: 25, state: {action: 'move', button: '<none>', modifier: {control: true, shift: false, meta: true}}},
+        {col: 44, row: 25, state: {action: 'press', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'move', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'release', button: 'left', modifier: {control: true, shift: false, meta: true}}},
+        {col: 45, row: 25, state: {action: 'down', button: 'wheel', modifier: {control: true, shift: false, meta: true}}}
       ]);
     });
   });
diff --git a/yarn.lock b/yarn.lock
index f19014b1..168016c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4170,20 +4170,6 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-puppeteer@^1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.15.0.tgz#1680fac13e51f609143149a5b7fa99eec392b34f"
-  integrity sha512-D2y5kwA9SsYkNUmcBzu9WZ4V1SGHiQTmgvDZSx6sRYFsgV25IebL4V6FaHjF6MbwLK9C6f3G3pmck9qmwM8H3w==
-  dependencies:
-    debug "^4.1.0"
-    extract-zip "^1.6.6"
-    https-proxy-agent "^2.2.1"
-    mime "^2.0.3"
-    progress "^2.0.1"
-    proxy-from-env "^1.0.0"
-    rimraf "^2.6.1"
-    ws "^6.1.0"
-
 puppeteer@^1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.17.0.tgz#371957d227a2f450fa74b78e78a2dadb2be7f14f"