Fix tests

src/vs/test/utils/servicesTestUtils.ts

@@ -579,8 +579,16 @@ export const TestFileService = {
 		});
 	},
 
+	discardBackup: function (resource: URI) {
+		return TPromise.as(void 0);
+	},
+
 	discardBackups: function () {
 		return TPromise.as(void 0);
+	},
+
+	isHotExitEnabled: function () {
+		return false;
 	}
 };
 

src/vs/workbench/services/files/node/fileService.ts

@@ -135,10 +135,12 @@ export class FileService implements IFileService {
 
 		// Configuration changes
 		this.toUnbind = [];
-		this.toUnbind.push(this.configurationService.onDidUpdateConfiguration(e => this.onConfigurationChange(e.config)));
+		if (this.configurationService) {
+			this.toUnbind.push(this.configurationService.onDidUpdateConfiguration(e => this.onConfigurationChange(e.config)));
 
-		const configuration = this.configurationService.getConfiguration<IFilesConfiguration>();
-		this.onConfigurationChange(configuration);
+			const configuration = this.configurationService.getConfiguration<IFilesConfiguration>();
+			this.onConfigurationChange(configuration);
+		}
 	}
 
 	private onConfigurationChange(configuration: IFilesConfiguration): void {