@@ -1,8 +1,6 @@
 'use strict';
 
 import * as vscode from 'vscode';
-import * as path from 'path';
-import * as fs from 'fs';
 import {RefactorProxy} from '../refactor/proxy';
 import {getTextEditsFromPatch} from '../common/editor';
 import {PythonSettings, IPythonSettings} from '../common/configSettings';
@@ -94,10 +92,7 @@ function extractName(extensionDir: string, textEditor: vscode.TextEditor, range:
         return null;
     }).then(newWordPosition => {        
         if (newWordPosition) {
-            return textEditor.document.save().then(saved=>{
-                if (!saved){
-                    return;
-                }
+            return textEditor.document.save().then(()=>{
                 // Now that we have selected the new variable, lets invoke the rename command
                 return vscode.commands.executeCommand('editor.action.rename');
             });
 
@@ -91,21 +91,29 @@ class MockTextDocument implements vscode.TextDocument {
 }
 
 suite('Method Extraction', () => {
+    // Hack hac hack
+    const oldExecuteCommand = vscode.commands.executeCommand;
     suiteSetup(done => {
         fs.copySync(refactorSourceFile, refactorTargetFile, { clobber: true });
         pythonSettings.pythonPath = PYTHON_PATH;
         initialize().then(() => done(), () => done());
     });
     suiteTeardown(done => {
+        vscode.commands.executeCommand = oldExecuteCommand;
         closeActiveWindows().then(done, done);
     });
-    setup(() => {
+    setup(done => {
         if (fs.existsSync(refactorTargetFile)) {
             fs.unlinkSync(refactorTargetFile);
         }
         fs.copySync(refactorSourceFile, refactorTargetFile, { clobber: true });
+        closeActiveWindows().then(() => {
+            vscode.commands.executeCommand = (cmd) => Promise.resolve();
+            done();
+        }).catch(done);
     });
     teardown(done => {
+        vscode.commands.executeCommand = oldExecuteCommand;
         closeActiveWindows().then(done, done);
     });
 
 
@@ -92,24 +92,30 @@ class MockTextDocument implements vscode.TextDocument {
 }
 
 suite('Variable Extraction', () => {
+    // Hack hac hack
+    const oldExecuteCommand = vscode.commands.executeCommand;
     suiteSetup(done => {
         fs.copySync(refactorSourceFile, refactorTargetFile, { clobber: true });
-        initialize().then(() => {
-            pythonSettings.pythonPath = PYTHON_PATH;
-            initialize().then(() => done(), () => done());
-        });
+        pythonSettings.pythonPath = PYTHON_PATH;
+        initialize().then(() => done(), () => done());
     });
     suiteTeardown(done => {
-        closeActiveWindows().then(done).catch(done);
+        vscode.commands.executeCommand = oldExecuteCommand;
+        closeActiveWindows().then(done, done);
     });
-    setup(() => {
+    setup(done => {
         if (fs.existsSync(refactorTargetFile)) {
             fs.unlinkSync(refactorTargetFile);
         }
         fs.copySync(refactorSourceFile, refactorTargetFile, { clobber: true });
+        closeActiveWindows().then(() => {
+            vscode.commands.executeCommand = (cmd) => Promise.resolve();
+            done();
+        }).catch(done);
     });
     teardown(done => {
-        closeActiveWindows().then(done).catch(done);
+        vscode.commands.executeCommand = oldExecuteCommand;
+        closeActiveWindows().then(done, done);
     });
 
     function testingVariableExtraction(shouldError: boolean, pythonSettings: settings.IPythonSettings, startPos: Position, endPos: Position) {