diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractMethodGenericParamsInstantiated.ts b/tests/cases/fourslash/codeFixClassExtendsAbstractMethodGenericParamsInstantiated.ts
new file mode 100644
index 00000000000..64f74262ba8
--- /dev/null
+++ b/tests/cases/fourslash/codeFixClassExtendsAbstractMethodGenericParamsInstantiated.ts
@@ -0,0 +1,13 @@
+/// <reference path='fourslash.ts' />
+
+//// abstract class A<T> {
+////    abstract f<T>();
+//// }
+////
+//// class C<U> extends A<U> {[|
+//// |]}
+
+verify.rangeAfterCodeFix(`f<U>(){
+    throw new Error('Method not Implemented');
+}
+`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractProperty.ts b/tests/cases/fourslash/codeFixClassExtendsAbstractProperty.ts
index 0fa6dd3dc51..46de88f7511 100644
--- a/tests/cases/fourslash/codeFixClassExtendsAbstractProperty.ts
+++ b/tests/cases/fourslash/codeFixClassExtendsAbstractProperty.ts
@@ -8,5 +8,5 @@
 //// |]}
 
 verify.rangeAfterCodeFix(`
-abstract x: number;
+x: number;
 `);
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractProtectedProperty.ts b/tests/cases/fourslash/codeFixClassExtendsAbstractProtectedProperty.ts
index dae05f58ac2..6d0571fce6b 100644
--- a/tests/cases/fourslash/codeFixClassExtendsAbstractProtectedProperty.ts
+++ b/tests/cases/fourslash/codeFixClassExtendsAbstractProtectedProperty.ts
@@ -8,5 +8,5 @@
 //// |]}
 
 verify.rangeAfterCodeFix(`
-protected abstract x: number;
+protected x: number;
 `);
diff --git a/tests/cases/fourslash/codeFixClassExtendsAbstractPublicProperty.ts b/tests/cases/fourslash/codeFixClassExtendsAbstractPublicProperty.ts
index 2862c329235..917f75051f1 100644
--- a/tests/cases/fourslash/codeFixClassExtendsAbstractPublicProperty.ts
+++ b/tests/cases/fourslash/codeFixClassExtendsAbstractPublicProperty.ts
@@ -8,5 +8,5 @@
 //// |]}
 
 verify.rangeAfterCodeFix(`
-public abstract x: number;
+public x: number;
 `);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixUnImplementedClassMissingAbstractProperty.ts b/tests/cases/fourslash/codeFixUnImplementedClassMissingAbstractProperty.ts
index 89060b0dfb7..25edca0964e 100644
--- a/tests/cases/fourslash/codeFixUnImplementedClassMissingAbstractProperty.ts
+++ b/tests/cases/fourslash/codeFixUnImplementedClassMissingAbstractProperty.ts
@@ -1,10 +1,10 @@
 /// <reference path='fourslash.ts' />
 
-//// abstract class C1 {
+//// abstract class A {
 ////     abstract x: number;
 //// }
 ////
-//// class C3 implements C2 {[| |]}
+//// class C implements A {[| |]}
 
 verify.rangeAfterCodeFix(`
 x: number;
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingMethodWithReturnType.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingMethodWithReturnType.ts
new file mode 100644
index 00000000000..89ee457a521
--- /dev/null
+++ b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingMethodWithReturnType.ts
@@ -0,0 +1,13 @@
+/// <reference path='fourslash.ts' />
+
+//// interface I {
+////     f1(): string;
+//// }
+////
+//// class C implements I {[|
+//// |]}
+
+verify.rangeAfterCodeFix(`f1(): string {
+    throw new Error('Method not Implemented');
+}
+`);
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingPropertyIntersection.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingPropertyIntersection.ts
index 9b10cf5d316..5221810bc40 100644
--- a/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingPropertyIntersection.ts
+++ b/tests/cases/fourslash/codeFixUnImplementedInterfaceMissingPropertyIntersection.ts
@@ -8,5 +8,5 @@
 //// |]}
 
 verify.rangeAfterCodeFix(`
-x: number & { __iBrand: any }
+x: number & { __iBrand: any; };
 `);
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceSomePropertiesPresent.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceSomePropertiesPresent.ts
index 03c9e535d8d..5a932941e07 100644
--- a/tests/cases/fourslash/codeFixUnImplementedInterfaceSomePropertiesPresent.ts
+++ b/tests/cases/fourslash/codeFixUnImplementedInterfaceSomePropertiesPresent.ts
@@ -5,10 +5,11 @@
 ////     y: number;
 //// }
 ////
-//// class C2 implements C {[| |]
-////     x: number
-//// }
+//// class C2 implements I {[|
+////     x: number;
+//// |]}
 
 verify.rangeAfterCodeFix(`
 y: number;
+x: number;
 `);
diff --git a/tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateDeeply.ts b/tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateDeeply.ts
index a5bd006ec06..dacbdc7eb51 100644
--- a/tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateDeeply.ts
+++ b/tests/cases/fourslash/codeFixUnimplementedInterfaceTypeParamInstantiateDeeply.ts
@@ -11,7 +11,7 @@ interface I<T> {
    x: { y: T, z: T[] };
 }
 
-class C<number> implements I<number> {
-    x: { y: number, z: number[] };
+class C implements I<number> {
+    x: { y: number; z: number[]; };
 } 
 `);