diff --git a/tests/cases/fourslash/codeFixUnImplementedClassMissingAbstractProperty.ts b/tests/cases/fourslash/codeFixUnImplementedClassMissingPropertyModifiers.ts
similarity index 55%
rename from tests/cases/fourslash/codeFixUnImplementedClassMissingAbstractProperty.ts
rename to tests/cases/fourslash/codeFixUnImplementedClassMissingPropertyModifiers.ts
index 25edca0964e..a40ffc8aeb0 100644
--- a/tests/cases/fourslash/codeFixUnImplementedClassMissingAbstractProperty.ts
+++ b/tests/cases/fourslash/codeFixUnImplementedClassMissingPropertyModifiers.ts
@@ -2,10 +2,15 @@
 
 //// abstract class A {
 ////     abstract x: number;
+////     private y: number;
+////     protected z: number;
+////     public w: number;
 //// }
 ////
 //// class C implements A {[| |]}
 
 verify.rangeAfterCodeFix(`
 x: number;
+protected z: number;
+public w: number;
 `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingMethodWithParams.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMethodWithParams.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceMissingMethodWithParams.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfaceMethodWithParams.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingProperty.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingProperty.ts
deleted file mode 100644
index 4e08a30cde4..00000000000
--- a/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingProperty.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x: number;
-//// }
-////
-//// class C1 implements I1 {[|
-//// |]}
-
-verify.rangeAfterCodeFix(`x: number;
-`);
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingPropertyIntersection.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingPropertyIntersection.ts
deleted file mode 100644
index 5221810bc40..00000000000
--- a/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingPropertyIntersection.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-//// interface I1 {
-////     x: number & { __iBrand: any };
-//// }
-////
-//// class C1 implements I1 {[|
-//// |]}
-
-verify.rangeAfterCodeFix(`
-x: number & { __iBrand: any; };
-`);
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceNamespaceConflict.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceNamespaceConflict.ts
index 8e0a35c7fe7..4fea72aa48f 100644
--- a/tests/cases/fourslash/codeFixUnImplementedInterfaceNamespaceConflict.ts
+++ b/tests/cases/fourslash/codeFixUnImplementedInterfaceNamespaceConflict.ts
@@ -14,4 +14,4 @@
 
 verify.rangeAfterCodeFix(`
 x: number;
-`);
+`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingPropertyFromParentConstructorFunction.ts b/tests/cases/fourslash/codeFixUnImplementedInterfacePropertyFromParentConstructorFunction.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnImplementedInterfaceMissingPropertyFromParentConstructorFunction.ts
rename to tests/cases/fourslash/codeFixUnImplementedInterfacePropertyFromParentConstructorFunction.ts
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceSomePropertiesPresent.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceSomePropertiesPresent.ts
index 6fea1a38d1b..6e0658019f5 100644
--- a/tests/cases/fourslash/codeFixUnImplementedInterfaceSomePropertiesPresent.ts
+++ b/tests/cases/fourslash/codeFixUnImplementedInterfaceSomePropertiesPresent.ts
@@ -3,7 +3,7 @@
 //// interface I {
 ////     x: number;
 ////     y: number;
-////     z: number;
+////     z: number & { __iBrand: any };
 //// }
 ////
 //// class C implements I {[|   |]
@@ -12,5 +12,5 @@
 //// }
 
 verify.rangeAfterCodeFix(`
-z: number;
+z: number & { __iBrand: any; };
 `);
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceMissingMultipleImplements1.ts b/tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplements1.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceMissingMultipleImplements1.ts
rename to tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplements1.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceMissingMultipleImplements2.ts b/tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplements2.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceMissingMultipleImplements2.ts
rename to tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplements2.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceMissingMultipleImplementsIntersection1.ts b/tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplementsIntersection1.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceMissingMultipleImplementsIntersection1.ts
rename to tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplementsIntersection1.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceMissingMultipleImplementsIntersection2.ts b/tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplementsIntersection2.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceMissingMultipleImplementsIntersection2.ts
rename to tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleImplementsIntersection2.ts
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceMissingMultipleMembersAndPunctuation.ts b/tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleMembersAndPunctuation.ts
similarity index 100%
rename from tests/cases/fourslash/codeFixUnimplementedInterfaceMissingMultipleMembersAndPunctuation.ts
rename to tests/cases/fourslash/codeFixUnimplementedInterfaceMultipleMembersAndPunctuation.ts