diff --git a/tests/cases/fourslash/server/codefix.ts b/tests/cases/fourslash/codeFixAddSuperCall.ts
similarity index 100%
rename from tests/cases/fourslash/server/codefix.ts
rename to tests/cases/fourslash/codeFixAddSuperCall.ts
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractPrivateNumber.ts b/tests/cases/fourslash/codeFixClassExtendsAbstractPrivateNumber.ts
new file mode 100644
index 00000000000..a7218ec8fd5
--- /dev/null
+++ b/tests/cases/fourslash/codeFixClassExtendsAbstractPrivateNumber.ts
@@ -0,0 +1,16 @@
+/// <reference path='fourslash.ts' />
+
+//// abstract class A {
+////    private abstract x: number;
+//// }
+////
+//// class C extends A {[|
+//// |]}
+
+// We don't know how to fix this problem. We can:
+// 1) Make x protected, and then insert.
+// 2) Make x private, and then insert.
+// 3) Make x not abstract.
+// So we offer no fixes for now.
+// TODO: (arozga) change this behavior.
+verify.not.codeFixAvailable();
diff --git a/tests/cases/fourslash/fixUnImplementedInterface24.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayNumber.ts
similarity index 89%
rename from tests/cases/fourslash/fixUnImplementedInterface24.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingArrayNumber.ts
index dead538d04d..530a651315e 100644
--- a/tests/cases/fourslash/fixUnImplementedInterface24.ts
+++ b/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayNumber.ts
@@ -4,7 +4,6 @@
 ////     x:Array<Number>;
 //// }
 ////
-////
 //// var x: I1 ={[|
 //// |]}
 
diff --git a/tests/cases/fourslash/fixUnImplementedInterface25.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayNumber2.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface25.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingArrayNumber2.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface22.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayString.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface22.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingArrayString.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface23.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingArrayString2.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface23.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingArrayString2.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface18.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingBoolean.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface18.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingBoolean.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface21.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingBoolean2.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface21.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingBoolean2.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface26.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingClassT.ts
similarity index 89%
rename from tests/cases/fourslash/fixUnImplementedInterface26.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingClassT.ts
index b75eac7184e..7343aeaf971 100644
--- a/tests/cases/fourslash/fixUnImplementedInterface26.ts
+++ b/tests/cases/fourslash/codeFixObjectInterfaceMissingClassT.ts
@@ -6,7 +6,6 @@
 ////
 //// class T {}
 ////
-////
 //// var x: I1 ={[|
 //// |]}
 
diff --git a/tests/cases/fourslash/fixUnImplementedInterface28.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingFromUnion.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface28.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingFromUnion.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface15.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingFunction1.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface15.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingFunction1.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface14.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingFunction2.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface14.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingFunction2.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface17.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingNumber.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface17.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingNumber.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface20.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingNumber2.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface20.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingNumber2.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface16.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingString1.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface16.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingString1.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface19.ts b/tests/cases/fourslash/codeFixObjectInterfaceMissingString2.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface19.ts
rename to tests/cases/fourslash/codeFixObjectInterfaceMissingString2.ts
diff --git a/tests/cases/fourslash/superFix2.ts b/tests/cases/fourslash/codeFixReOrderSuper.ts
similarity index 100%
rename from tests/cases/fourslash/superFix2.ts
rename to tests/cases/fourslash/codeFixReOrderSuper.ts
diff --git a/tests/cases/fourslash/superFix3.ts b/tests/cases/fourslash/codeFixThisUsedInSuperCall.ts
similarity index 100%
rename from tests/cases/fourslash/superFix3.ts
rename to tests/cases/fourslash/codeFixThisUsedInSuperCall.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface36.ts b/tests/cases/fourslash/codeFixUnImplementedInterface36.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface36.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterface36.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface37.ts b/tests/cases/fourslash/codeFixUnImplementedInterface37.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface37.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterface37.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface38.ts b/tests/cases/fourslash/codeFixUnImplementedInterface38.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface38.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterface38.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface39.ts b/tests/cases/fourslash/codeFixUnImplementedInterface39.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface39.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterface39.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface34.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingAbstractFunctionGenericParamExtendsNumber.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface34.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingAbstractFunctionGenericParamExtendsNumber.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface33.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingAbstractFunctionGenericParamExtendsNumberViaHeritageClause.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface33.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingAbstractFunctionGenericParamExtendsNumberViaHeritageClause.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface35.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingAbstractFunctionGenericParamExtendsNumberViaHeritageClause2.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface35.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingAbstractFunctionGenericParamExtendsNumberViaHeritageClause2.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface32.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingAbstractFunctionGenericParamViaHeritageClause.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface32.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingAbstractFunctionGenericParamViaHeritageClause.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface31.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingAbstractFunctionViaHeritageClause.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface31.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingAbstractFunctionViaHeritageClause.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface01.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunction.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface01.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunction.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface09.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionAndExtends.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface09.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionAndExtends.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface29.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromAbstract.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface29.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromAbstract.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface30.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromAbstractClassViaHeritageClause.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface30.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromAbstractClassViaHeritageClause.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface10.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromHeritageClause1.ts
similarity index 91%
rename from tests/cases/fourslash/fixUnImplementedInterface10.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromHeritageClause1.ts
index aa61cbc1836..c6c2998ac9a 100644
--- a/tests/cases/fourslash/fixUnImplementedInterface10.ts
+++ b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromHeritageClause1.ts
@@ -8,7 +8,6 @@
 ////
 //// }
 ////
-////
 //// class C1 implements I2 {[|
 //// |]}
 
diff --git a/tests/cases/fourslash/fixUnImplementedInterface11.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromHeritageClause2.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface11.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromHeritageClause2.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface12.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromHeritageClause3.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface12.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromHeritageClause3.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface13.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromHeritageClause4.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface13.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionFromHeritageClause4.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface08.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionGenericParamExtendsString.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface08.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionGenericParamExtendsString.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface07.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionGenericParams.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface07.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionGenericParams.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface04.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionNoSemicolon.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface04.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionNoSemicolon.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface05.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionWithParams.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface05.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionWithParams.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface06.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionWithParamsClass.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface06.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingFunctionWithParamsClass.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface02.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingNumber.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface02.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingNumber.ts
diff --git a/tests/cases/fourslash/fixUnImplementedInterface03.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingNumberNoSemicolon.ts
similarity index 100%
rename from tests/cases/fourslash/fixUnImplementedInterface03.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMissingNumberNoSemicolon.ts
diff --git a/tests/cases/fourslash/fixInterfaceInExtendsClause.ts b/tests/cases/fourslash/fixInterfaceInExtendsClause.ts
deleted file mode 100644
index e9a20143acc..00000000000
--- a/tests/cases/fourslash/fixInterfaceInExtendsClause.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I { }
-////
-//// class C extends I {[|
-//// |]}
-
-verify.codeFixAtPosition(`f1(){
-    throw new Error('Method not Implemented');
-}
-`);
diff --git a/tests/cases/fourslash/fixUnImplementedInterface27.ts b/tests/cases/fourslash/fixUnImplementedInterface27.ts
deleted file mode 100644
index 10460158694..00000000000
--- a/tests/cases/fourslash/fixUnImplementedInterface27.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x:T;
-////     f1();
-//// }
-////
-//// class T {}
-////
-////
-//// var x: I1 ={[|
-////     |]f1(){}
-//// }
-
-verify.not.codeFixAvailable();
-// verify.codeFixAtPosition(`x : null,
-// `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/superFix1.ts b/tests/cases/fourslash/server/codeFixAddSuperCall.ts
similarity index 100%
rename from tests/cases/fourslash/superFix1.ts
rename to tests/cases/fourslash/server/codeFixAddSuperCall.ts