diff --git a/scripts/test.bat b/scripts/test.bat
index 829b88abb5..b1430b516e 100644
--- a/scripts/test.bat
+++ b/scripts/test.bat
@@ -5,6 +5,7 @@ set ELECTRON_RUN_AS_NODE=
 
 pushd %~dp0\..
 
+:: Get Code.exe location
 for /f "tokens=2 delims=:," %%a in ('findstr /R /C:"\"nameShort\":.*" product.json') do set NAMESHORT=%%~a
 set NAMESHORT=%NAMESHORT: "=%
 set NAMESHORT=%NAMESHORT:"=%.exe
@@ -15,23 +16,14 @@ node build\lib\electron.js
 if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron
 
 :: Run tests
-rem TFS Builds
-if not "%BUILD_BUILDID%" == "" (
-	if not "%ADD_REPORTER%" == "" (
-		%CODE% .\test\electron\index.js --reporter mocha-junit-reporter %*
-	)
 
-	if "%ADD_REPORTER%" == "" (
-		:: Run tests
 		%CODE% .\test\electron\index.js %*
-	)
-)
 
-rem Otherwise
-if "%BUILD_BUILDID%" == "" (
-	%CODE% .\test\electron\index.js %*
-)
 popd
 
 endlocal
+:: app.exit(0) is exiting with code 255 in Electron 1.7.4.
+:: See https://github.com/Microsoft/vscode/issues/28582
+echo errorlevel: %errorlevel%
+if %errorlevel% == 255 set errorlevel=0
 exit /b %errorlevel%
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index f99e79b186..6fadebb8f8 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -647,7 +647,6 @@ export class MouseController<T> implements IDisposable {
 			}
 
 			const newSelection = disjunction(rangeSelection, relativeComplement(selection, contiguousRange));
-			this.list.setFocus([focus]);
 			this.list.setSelection(newSelection, e.browserEvent);
 
 		} else if (this.isSelectionSingleChangeEvent(e)) {
diff --git a/src/vs/platform/accessibility/common/accessibilityService.ts b/src/vs/platform/accessibility/common/accessibilityService.ts
index 68f53da6b5..368e3862c5 100644
--- a/src/vs/platform/accessibility/common/accessibilityService.ts
+++ b/src/vs/platform/accessibility/common/accessibilityService.ts
@@ -3,33 +3,22 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter, Event } from 'vs/base/common/event';
-import { IAccessibilityService, AccessibilitySupport, CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
-import { Disposable } from 'vs/base/common/lifecycle';
-import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { AbstractAccessibilityService } from 'vs/platform/accessibility/common/abstractAccessibilityService';
 
-export class BrowserAccessibilityService extends Disposable implements IAccessibilityService {
+export class BrowserAccessibilityService extends AbstractAccessibilityService implements IAccessibilityService {
 
 	_serviceBrand: any;
 
 	private _accessibilitySupport = AccessibilitySupport.Unknown;
-	private _accessibilityModeEnabledContext: IContextKey<boolean>;
-	private readonly _onDidChangeAccessibilitySupport = new Emitter<void>();
-	readonly onDidChangeAccessibilitySupport: Event<void> = this._onDidChangeAccessibilitySupport.event;
 
 	constructor(
-		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IContextKeyService readonly contextKeyService: IContextKeyService,
+		@IConfigurationService readonly configurationService: IConfigurationService,
 	) {
-		super();
-		this._accessibilityModeEnabledContext = CONTEXT_ACCESSIBILITY_MODE_ENABLED.bindTo(this._contextKeyService);
-		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('editor.accessibilitySupport')) {
-				this._updateContextKey();
-			}
-		}));
-		this._updateContextKey();
+		super(contextKeyService, configurationService);
 	}
 
 	alwaysUnderlineAccessKeys(): Promise<boolean> {
@@ -43,16 +32,9 @@ export class BrowserAccessibilityService extends Disposable implements IAccessib
 
 		this._accessibilitySupport = accessibilitySupport;
 		this._onDidChangeAccessibilitySupport.fire();
-		this._updateContextKey();
 	}
 
 	getAccessibilitySupport(): AccessibilitySupport {
 		return this._accessibilitySupport;
 	}
-
-	private _updateContextKey(): void {
-		const detected = this.getAccessibilitySupport() === AccessibilitySupport.Enabled;
-		const config = this._configurationService.getValue('editor.accessibilitySupport');
-		this._accessibilityModeEnabledContext.set(config === 'on' || (config === 'auto' && detected));
-	}
 }
diff --git a/src/vs/platform/telemetry/node/telemetryIpc.ts b/src/vs/platform/telemetry/node/telemetryIpc.ts
index b8b4d73c57..9c49393043 100644
--- a/src/vs/platform/telemetry/node/telemetryIpc.ts
+++ b/src/vs/platform/telemetry/node/telemetryIpc.ts
@@ -37,7 +37,8 @@ export class TelemetryAppenderClient implements ITelemetryAppender {
 		return Promise.resolve(null);
 	}
 
-	flush(): any {
+	flush(): Promise<void> {
 		// TODO
+		return Promise.resolve();
 	}
 }
diff --git a/src/vs/workbench/services/telemetry/browser/telemetryService.ts b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
index fb15d82c28..3d3c40d08e 100644
--- a/src/vs/workbench/services/telemetry/browser/telemetryService.ts
+++ b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
@@ -51,7 +51,7 @@ export class WebTelemetryAppender implements ITelemetryAppender {
 		});
 	}
 
-	flush(): Promise<any> | undefined {
+	flush(): Promise<void> {
 		if (this._aiClient) {
 			return new Promise(resolve => {
 				this._aiClient!.flush();
@@ -60,7 +60,7 @@ export class WebTelemetryAppender implements ITelemetryAppender {
 			});
 		}
 
-		return undefined;
+		return Promise.resolve();
 	}
 }