diff --git a/tests/cases/fourslash/codeFixInterfaceInExtendsClause.ts b/tests/cases/fourslash/codeFixInterfaceInExtendsClause.ts
index c08cdc30952..82debc0109a 100644
--- a/tests/cases/fourslash/codeFixInterfaceInExtendsClause.ts
+++ b/tests/cases/fourslash/codeFixInterfaceInExtendsClause.ts
@@ -1,12 +1,14 @@
 /// <reference path='fourslash.ts' />
 
-//// interface I {
-////    f1();
-//// }
-////
-//// class /*0*/C/*1*/ /*2*/extend/*3*/s/*4*/ /*5*/I/*6*/ {/*7*/}
+//// interface I1 { }
+//// class C1 extends I1 { }
+//// interface I2 { }
+//// class C2 extends I2 { }
 
-for (let i = 0; i < 8; ++i) {
-    goTo.marker("" + i);
-    verify.codeFixAtPosition("");
-}
\ No newline at end of file
+// verify.codeFixAvailable();
+verify.fileAfterCodeFixes(`
+interface I1 { }
+class C1 implements I1 { }
+interface I2 { }
+class C2 implements I2 { }
+`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayNumber.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayNumber.ts
deleted file mode 100644
index 530a651315e..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayNumber.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:Array<Number>;
-//// }
-////
-//// var x: I1 ={[|
-//// |]}
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : null 
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayNumber2.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayNumber2.ts
deleted file mode 100644
index 84a018edc16..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayNumber2.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:Array<Number>;
-////     f1();
-//// }
-////
-////
-//// var x: I1 ={[|
-////     |]f1(){}
-//// }
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : null,
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayString.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayString.ts
deleted file mode 100644
index 8caeb26eb45..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayString.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:[string];
-//// }
-////
-////
-//// var x: I1 ={[|
-//// |]}
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : null 
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayString2.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayString2.ts
deleted file mode 100644
index 70e3db4f57d..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayString2.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:[string];
-////     f1();
-//// }
-////
-////
-//// var x: I1 ={[|
-////     |]f1(){}
-//// }
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : null,
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingBoolean.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingBoolean.ts
deleted file mode 100644
index 0fa0eaefa56..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingBoolean.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:boolean;
-//// }
-////
-//// var x: I1 ={[|
-////
-//// |]}
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : false 
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingBoolean2.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingBoolean2.ts
deleted file mode 100644
index 39e9aaf0e96..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingBoolean2.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:boolean;
-////     f1();
-//// }
-////
-////
-//// var x: I1 ={[|
-////     |]f1(){}
-//// }
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : false,
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingClassT.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingClassT.ts
deleted file mode 100644
index 7343aeaf971..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingClassT.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:T;
-//// }
-////
-//// class T {}
-////
-//// var x: I1 ={[|
-//// |]}
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : null 
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingFromUnion.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingFromUnion.ts
deleted file mode 100644
index 0e3aa3e95fb..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingFromUnion.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     f1();
-//// }
-////
-//// interface I2 {
-////     f2();
-//// }
-////
-//// var x: I1|I2 ={[|
-////
-//// |]}
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`f1(){
-//     throw new Error('Method not Implemented');
-// }
-// f2(){
-//     throw new Error('Method not Implemented');
-// }
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingFunction1.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingFunction1.ts
deleted file mode 100644
index 005ece4ea50..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingFunction1.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     f1();
-//// }
-////
-//// var x: I1 = {[|
-////
-//// |]}
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`
-// f1(){
-//     throw new Error('Method not Implemented');
-// }
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingFunction2.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingFunction2.ts
deleted file mode 100644
index d5da3231b7b..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingFunction2.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     f1();
-////     f2();
-//// }
-////
-////
-//// var x: I1 ={[|
-////     |]f2() {}
-//// }
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`f1(){
-//     throw new Error('Method not Implemented');
-// },
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingNumber.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingNumber.ts
deleted file mode 100644
index 7fa3cc61be3..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingNumber.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:number;
-//// }
-////
-//// var x: I1 ={[|
-//// |]}
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : 0 
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingNumber2.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingNumber2.ts
deleted file mode 100644
index ffd3c8914b8..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingNumber2.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:number;
-////     f1();
-//// }
-////
-////
-//// var x: I1 ={[|
-////     |]f1(){}
-//// }
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : 0,
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingString1.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingString1.ts
deleted file mode 100644
index 091174b47c4..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingString1.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:string;
-//// }
-////
-////
-//// var x: I1 ={[|
-//// |]}
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : "" 
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixObjectInterfaceMissingString2.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingString2.ts
deleted file mode 100644
index d037a8611b3..00000000000
--- a/tests/cases/fourslash/codeFixObjectInterfaceMissingString2.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:string;
-////     f1();
-//// }
-////
-//// var x: I1 ={[|
-////     |]f1(){}
-//// }
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : "",
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterface38.ts b/tests/cases/fourslash/codeFixUnImplementedInterface38.ts
deleted file mode 100644
index 8d1e06c4c47..00000000000
--- a/tests/cases/fourslash/codeFixUnImplementedInterface38.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// abstract class C2 {
-////     abstract f1<T extends number>();
-//// }
-////
-//// var x: C2 = {[|  |]}
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`f1<T extends number>(){
-//     throw new Error('Method not Implemented');
-// }`);
\ No newline at end of file