diff --git a/tests/cases/fourslash/unusedClassInNamespace1.ts b/tests/cases/fourslash/unusedClassInNamespace1.ts
index 6b70adffb7c..e13c889d327 100644
--- a/tests/cases/fourslash/unusedClassInNamespace1.ts
+++ b/tests/cases/fourslash/unusedClassInNamespace1.ts
@@ -7,4 +7,4 @@
 //// } |]
 
 verify.rangeAfterCodeFix(`namespace greeter {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedClassInNamespace1AddUnderscore.ts b/tests/cases/fourslash/unusedClassInNamespace1AddUnderscore.ts
deleted file mode 100644
index 8f8ceab8615..00000000000
--- a/tests/cases/fourslash/unusedClassInNamespace1AddUnderscore.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// @noUnusedLocals: true
-//// [| namespace greeter {
-////   class class1 {
-////   }
-//// } |]
-
-verify.rangeAfterCodeFix(`namespace greeter {
-    class _class1 { }
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);
diff --git a/tests/cases/fourslash/unusedClassInNamespace2.ts b/tests/cases/fourslash/unusedClassInNamespace2.ts
index 54de4886bbd..0b6b7504633 100644
--- a/tests/cases/fourslash/unusedClassInNamespace2.ts
+++ b/tests/cases/fourslash/unusedClassInNamespace2.ts
@@ -11,5 +11,5 @@
 verify.rangeAfterCodeFix(`namespace greeter {
     export class class2 {
     }
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
 
diff --git a/tests/cases/fourslash/unusedClassInNamespace3.ts b/tests/cases/fourslash/unusedClassInNamespace3.ts
index 7f4b00fc3b8..95e691d3ee1 100644
--- a/tests/cases/fourslash/unusedClassInNamespace3.ts
+++ b/tests/cases/fourslash/unusedClassInNamespace3.ts
@@ -22,4 +22,4 @@ verify.rangeAfterCodeFix(`namespace Validation {
 
     export class c2 {
     }
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedClassInNamespace4.ts b/tests/cases/fourslash/unusedClassInNamespace4.ts
index ab7cd44cc42..8b856379acb 100644
--- a/tests/cases/fourslash/unusedClassInNamespace4.ts
+++ b/tests/cases/fourslash/unusedClassInNamespace4.ts
@@ -24,4 +24,4 @@ verify.rangeAfterCodeFix(`namespace Validation {
     export class c2 {
 
     }
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedClassInNamespaceWithTrivia.ts b/tests/cases/fourslash/unusedClassInNamespaceWithTrivia.ts
index d491ad24d7a..cae0c52ac79 100644
--- a/tests/cases/fourslash/unusedClassInNamespaceWithTrivia.ts
+++ b/tests/cases/fourslash/unusedClassInNamespaceWithTrivia.ts
@@ -8,4 +8,4 @@
 //// } |]
 
 verify.rangeAfterCodeFix(`namespace greeter {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedClassInNamespaceWithTriviaAddUnderscore.ts b/tests/cases/fourslash/unusedClassInNamespaceWithTriviaAddUnderscore.ts
deleted file mode 100644
index 524b0abebc9..00000000000
--- a/tests/cases/fourslash/unusedClassInNamespaceWithTriviaAddUnderscore.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// @noUnusedLocals: true
-//// [| namespace greeter {
-////   /* comment1 */
-////   class /* comment2 */ class1 {
-////   }
-//// } |]
-
-verify.rangeAfterCodeFix(`namespace greeter {
-    /* comment1 */
-    class /* comment2 */ _class1 {
-    }
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);
diff --git a/tests/cases/fourslash/unusedConstantInFunction1.ts b/tests/cases/fourslash/unusedConstantInFunction1.ts
index 14868d34f65..b0fe913e722 100644
--- a/tests/cases/fourslash/unusedConstantInFunction1.ts
+++ b/tests/cases/fourslash/unusedConstantInFunction1.ts
@@ -6,5 +6,5 @@
 //// } |]
 
 verify.rangeAfterCodeFix(`function f1 () {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
 
diff --git a/tests/cases/fourslash/unusedEnumInFunction1.ts b/tests/cases/fourslash/unusedEnumInFunction1.ts
index 84f03ef488e..ae72b7b3da6 100644
--- a/tests/cases/fourslash/unusedEnumInFunction1.ts
+++ b/tests/cases/fourslash/unusedEnumInFunction1.ts
@@ -7,5 +7,5 @@
 
 verify.rangeAfterCodeFix(`function f1 () {
 }
-`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+`);
 
diff --git a/tests/cases/fourslash/unusedEnumInNamespace1.ts b/tests/cases/fourslash/unusedEnumInNamespace1.ts
index 1f2998c466e..e856a084bfe 100644
--- a/tests/cases/fourslash/unusedEnumInNamespace1.ts
+++ b/tests/cases/fourslash/unusedEnumInNamespace1.ts
@@ -8,4 +8,4 @@
 //// } |]
 
 verify.rangeAfterCodeFix(`namespace greeter {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespac4AddUnderscore.ts b/tests/cases/fourslash/unusedFunctionInNamespac4AddUnderscore.ts
deleted file mode 100644
index a017fd81f1f..00000000000
--- a/tests/cases/fourslash/unusedFunctionInNamespac4AddUnderscore.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// @noUnusedLocals: true
-// @noUnusedParameters:true
-//// [| namespace Validation {
-////    var function1 = function() {
-////    }
-////} |]
-
-verify.rangeAfterCodeFix(`namespace Validation {
-   var _function1 = function() {
-   }
-} `, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace1.ts b/tests/cases/fourslash/unusedFunctionInNamespace1.ts
index fe394fbccd1..7a63ff13caa 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace1.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace1.ts
@@ -8,4 +8,4 @@
 //// } |]
 
 verify.rangeAfterCodeFix(`namespace greeter {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace2.ts b/tests/cases/fourslash/unusedFunctionInNamespace2.ts
index d32e9848772..5a2ac44d3d0 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace2.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace2.ts
@@ -11,4 +11,4 @@
 verify.rangeAfterCodeFix(`namespace greeter {
     export function function2() {
     }
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace3.ts b/tests/cases/fourslash/unusedFunctionInNamespace3.ts
index 1d8b5e74376..69df15cb3c7 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace3.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace3.ts
@@ -9,4 +9,4 @@
 ////} |]
 
 verify.rangeAfterCodeFix(`namespace Validation {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace4.ts b/tests/cases/fourslash/unusedFunctionInNamespace4.ts
index f59169ed729..36ceb319ff9 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace4.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace4.ts
@@ -8,4 +8,4 @@
 ////} |]
 
 verify.rangeAfterCodeFix(`namespace Validation {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedFunctionInNamespace5.ts b/tests/cases/fourslash/unusedFunctionInNamespace5.ts
index 85c638aaa43..3c2f20ce082 100644
--- a/tests/cases/fourslash/unusedFunctionInNamespace5.ts
+++ b/tests/cases/fourslash/unusedFunctionInNamespace5.ts
@@ -25,4 +25,4 @@ verify.rangeAfterCodeFix(`function function3() {
         function1();
     }
 
-    export let a = function3;`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+    export let a = function3;`);
diff --git a/tests/cases/fourslash/unusedImports10FS.ts b/tests/cases/fourslash/unusedImports10FS.ts
index 9c12c576329..ea016b73cc2 100644
--- a/tests/cases/fourslash/unusedImports10FS.ts
+++ b/tests/cases/fourslash/unusedImports10FS.ts
@@ -12,5 +12,5 @@
 ////     [|import a = A;|]
 //// }
 
-verify.rangeAfterCodeFix("", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("");
 
diff --git a/tests/cases/fourslash/unusedImports11FS.ts b/tests/cases/fourslash/unusedImports11FS.ts
index 9747279d4db..c29b5612e88 100644
--- a/tests/cases/fourslash/unusedImports11FS.ts
+++ b/tests/cases/fourslash/unusedImports11FS.ts
@@ -11,4 +11,4 @@
 //// export function f2(s: string){};
 //// export default f1;
 
-verify.rangeAfterCodeFix('import * as s from "./file1";', /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix('import * as s from "./file1";');
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports12FS.ts b/tests/cases/fourslash/unusedImports12FS.ts
index 54e12bf2f18..d86bc98c6cf 100644
--- a/tests/cases/fourslash/unusedImports12FS.ts
+++ b/tests/cases/fourslash/unusedImports12FS.ts
@@ -10,4 +10,4 @@
 //// export function f2(s: string){};
 //// export default f1;
 
-verify.rangeAfterCodeFix('import f1 from "./file1";', /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix('import f1 from "./file1";');
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports1FS.ts b/tests/cases/fourslash/unusedImports1FS.ts
index 4c02cabc4ba..0fc2d36aac7 100644
--- a/tests/cases/fourslash/unusedImports1FS.ts
+++ b/tests/cases/fourslash/unusedImports1FS.ts
@@ -9,4 +9,4 @@
 ////
 ////    }
 
-verify.rangeAfterCodeFix('', /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix('');
diff --git a/tests/cases/fourslash/unusedImports2FS.ts b/tests/cases/fourslash/unusedImports2FS.ts
index 5dff4dc9237..ec3f2056e36 100644
--- a/tests/cases/fourslash/unusedImports2FS.ts
+++ b/tests/cases/fourslash/unusedImports2FS.ts
@@ -16,4 +16,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix(`import {Calculator} from "./file1"`, /*includeWhiteSpace*/ true, /*errorCode*/ 0, /*index*/ 0);
+verify.rangeAfterCodeFix(`import {Calculator} from "./file1"`, /*includeWhiteSpace*/ true, /*errorCode*/ 0);
diff --git a/tests/cases/fourslash/unusedImports3FS.ts b/tests/cases/fourslash/unusedImports3FS.ts
index 9cc53839f17..6926f97bb4f 100644
--- a/tests/cases/fourslash/unusedImports3FS.ts
+++ b/tests/cases/fourslash/unusedImports3FS.ts
@@ -20,5 +20,5 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix(`import {/*some comments*/ test, test2} from "./file1"`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix(`import {/*some comments*/ test, test2} from "./file1"`);
 
diff --git a/tests/cases/fourslash/unusedImports4FS.ts b/tests/cases/fourslash/unusedImports4FS.ts
index a923bd389c9..4f7e8882429 100644
--- a/tests/cases/fourslash/unusedImports4FS.ts
+++ b/tests/cases/fourslash/unusedImports4FS.ts
@@ -21,4 +21,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix(`import {Calculator, test2} from "./file1"`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix(`import {Calculator, test2} from "./file1"`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports5FS.ts b/tests/cases/fourslash/unusedImports5FS.ts
index 11def13df4d..15262df01fd 100644
--- a/tests/cases/fourslash/unusedImports5FS.ts
+++ b/tests/cases/fourslash/unusedImports5FS.ts
@@ -21,4 +21,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix(`import {Calculator, test} from "./file1"`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix(`import {Calculator, test} from "./file1"`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports6FS.ts b/tests/cases/fourslash/unusedImports6FS.ts
index 36ef2813ee0..1d6a9a3232e 100644
--- a/tests/cases/fourslash/unusedImports6FS.ts
+++ b/tests/cases/fourslash/unusedImports6FS.ts
@@ -17,4 +17,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix('', /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix('');
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports7FS.ts b/tests/cases/fourslash/unusedImports7FS.ts
index bacca3a06a8..1a23ea85925 100644
--- a/tests/cases/fourslash/unusedImports7FS.ts
+++ b/tests/cases/fourslash/unusedImports7FS.ts
@@ -13,4 +13,4 @@
 //// export default function test2() {
 //// }
 
-verify.rangeAfterCodeFix('', /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix('');
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports8FS.ts b/tests/cases/fourslash/unusedImports8FS.ts
index 3b01b54a342..81bdeda36ac 100644
--- a/tests/cases/fourslash/unusedImports8FS.ts
+++ b/tests/cases/fourslash/unusedImports8FS.ts
@@ -21,4 +21,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix(`import {Calculator as calc, test as t1} from "./file1"`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix(`import {Calculator as calc, test as t1} from "./file1"`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedImports9FS.ts b/tests/cases/fourslash/unusedImports9FS.ts
index bea5517574d..f81f9a9f5ae 100644
--- a/tests/cases/fourslash/unusedImports9FS.ts
+++ b/tests/cases/fourslash/unusedImports9FS.ts
@@ -17,4 +17,4 @@
 ////
 //// }
 
-verify.rangeAfterCodeFix("", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix("");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedInterfaceInNamespace1.ts b/tests/cases/fourslash/unusedInterfaceInNamespace1.ts
index b9410f41a58..f979069690b 100644
--- a/tests/cases/fourslash/unusedInterfaceInNamespace1.ts
+++ b/tests/cases/fourslash/unusedInterfaceInNamespace1.ts
@@ -8,4 +8,4 @@
 
 verify.rangeAfterCodeFix(`
 namespace greeter {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedInterfaceInNamespace2.ts b/tests/cases/fourslash/unusedInterfaceInNamespace2.ts
index 0155b851f93..7737f9ce247 100644
--- a/tests/cases/fourslash/unusedInterfaceInNamespace2.ts
+++ b/tests/cases/fourslash/unusedInterfaceInNamespace2.ts
@@ -9,4 +9,4 @@
 ////}
 
 verify.rangeAfterCodeFix(`export interface interface2 {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction1.ts b/tests/cases/fourslash/unusedLocalsInFunction1.ts
index cf165184671..e74f5dbd962 100644
--- a/tests/cases/fourslash/unusedLocalsInFunction1.ts
+++ b/tests/cases/fourslash/unusedLocalsInFunction1.ts
@@ -7,4 +7,4 @@
 
 verify.rangeAfterCodeFix(`
 function greeter() {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction2.ts b/tests/cases/fourslash/unusedLocalsInFunction2.ts
index 2da97abea20..83816e68038 100644
--- a/tests/cases/fourslash/unusedLocalsInFunction2.ts
+++ b/tests/cases/fourslash/unusedLocalsInFunction2.ts
@@ -6,4 +6,4 @@
 ////    x+1;
 ////}
 
-verify.rangeAfterCodeFix("var x;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("var x;");
diff --git a/tests/cases/fourslash/unusedLocalsInFunction3.ts b/tests/cases/fourslash/unusedLocalsInFunction3.ts
index ba3f73b5bd0..ec5d72d83b6 100644
--- a/tests/cases/fourslash/unusedLocalsInFunction3.ts
+++ b/tests/cases/fourslash/unusedLocalsInFunction3.ts
@@ -7,4 +7,4 @@
 ////    z+1;
 ////}
 
-verify.rangeAfterCodeFix("var x,z = 1;", /*includeWhiteSpace*/ undefined, /*errorCode*/ 6133, /*index*/ 0);
+verify.rangeAfterCodeFix("var x,z = 1;", /*includeWhiteSpace*/ undefined, /*errorCode*/ 6133);
diff --git a/tests/cases/fourslash/unusedLocalsInFunction4.ts b/tests/cases/fourslash/unusedLocalsInFunction4.ts
index 62cbf589d76..a458d6d824c 100644
--- a/tests/cases/fourslash/unusedLocalsInFunction4.ts
+++ b/tests/cases/fourslash/unusedLocalsInFunction4.ts
@@ -7,4 +7,4 @@
 ////    z++;
 ////}
 
-verify.rangeAfterCodeFix("var y = 0,z = 1;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("var y = 0,z = 1;");
diff --git a/tests/cases/fourslash/unusedLocalsInMethodFS1.ts b/tests/cases/fourslash/unusedLocalsInMethodFS1.ts
index 8ed3e080143..dc73ab86663 100644
--- a/tests/cases/fourslash/unusedLocalsInMethodFS1.ts
+++ b/tests/cases/fourslash/unusedLocalsInMethodFS1.ts
@@ -9,4 +9,4 @@
 ////    }
 ////}
 
-verify.rangeAfterCodeFix("var y = 10;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("var y = 10;");
diff --git a/tests/cases/fourslash/unusedLocalsInMethodFS2.ts b/tests/cases/fourslash/unusedLocalsInMethodFS2.ts
index 9104ba3973a..012bf87a222 100644
--- a/tests/cases/fourslash/unusedLocalsInMethodFS2.ts
+++ b/tests/cases/fourslash/unusedLocalsInMethodFS2.ts
@@ -9,4 +9,4 @@
 ////    }
 ////}
 
-verify.rangeAfterCodeFix("var  y;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("var  y;");
diff --git a/tests/cases/fourslash/unusedLocalsinConstructorFS1.ts b/tests/cases/fourslash/unusedLocalsinConstructorFS1.ts
index c091562f8a4..4ed58d3142d 100644
--- a/tests/cases/fourslash/unusedLocalsinConstructorFS1.ts
+++ b/tests/cases/fourslash/unusedLocalsinConstructorFS1.ts
@@ -9,4 +9,4 @@
 ////}
 
 verify.rangeAfterCodeFix(`constructor() {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedLocalsinConstructorFS2.ts b/tests/cases/fourslash/unusedLocalsinConstructorFS2.ts
index 764f380e49b..eeaf66050d4 100644
--- a/tests/cases/fourslash/unusedLocalsinConstructorFS2.ts
+++ b/tests/cases/fourslash/unusedLocalsinConstructorFS2.ts
@@ -15,4 +15,4 @@ verify.rangeAfterCodeFix(`
         var used = "dummy";
         used = used + "second part";
     }
-`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedLocalsinConstructorFS2AddUnderscore.ts b/tests/cases/fourslash/unusedLocalsinConstructorFS2AddUnderscore.ts
deleted file mode 100644
index ecad94397c8..00000000000
--- a/tests/cases/fourslash/unusedLocalsinConstructorFS2AddUnderscore.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// @noUnusedLocals: true
-// @noUnusedParameters: true
-////class greeter {
-////    [|constructor() {
-////        var unused = 20;
-////        var used = "dummy";
-////        used = used + "second part";
-////    } |]
-////}
-
-verify.rangeAfterCodeFix(`
-    constructor() {
-        var _unused = 20;
-        var used = "dummy";
-        used = used + "second part";
-    }
-`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedMethodInClass1.ts b/tests/cases/fourslash/unusedMethodInClass1.ts
index 43cc2d192c2..a5e3789c8af 100644
--- a/tests/cases/fourslash/unusedMethodInClass1.ts
+++ b/tests/cases/fourslash/unusedMethodInClass1.ts
@@ -8,4 +8,4 @@
 
 verify.rangeAfterCodeFix(`
 class greeter {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedMethodInClass2.ts b/tests/cases/fourslash/unusedMethodInClass2.ts
index 51db9367deb..cce621236d4 100644
--- a/tests/cases/fourslash/unusedMethodInClass2.ts
+++ b/tests/cases/fourslash/unusedMethodInClass2.ts
@@ -12,4 +12,4 @@ verify.rangeAfterCodeFix(`
 class greeter {
     public function2() {
     }
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedMethodInClass3.ts b/tests/cases/fourslash/unusedMethodInClass3.ts
index f07f0f4a892..ccf98c4bbc5 100644
--- a/tests/cases/fourslash/unusedMethodInClass3.ts
+++ b/tests/cases/fourslash/unusedMethodInClass3.ts
@@ -8,4 +8,4 @@
 
 verify.rangeAfterCodeFix(`
 class greeter {
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedMethodInClass4.ts b/tests/cases/fourslash/unusedMethodInClass4.ts
index 19ad173e76b..962b80f5bc1 100644
--- a/tests/cases/fourslash/unusedMethodInClass4.ts
+++ b/tests/cases/fourslash/unusedMethodInClass4.ts
@@ -9,4 +9,4 @@
 ////}
 
 verify.rangeAfterCodeFix(`public function2(){
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedMethodInClass5.ts b/tests/cases/fourslash/unusedMethodInClass5.ts
index ac27874bafe..806e619817f 100644
--- a/tests/cases/fourslash/unusedMethodInClass5.ts
+++ b/tests/cases/fourslash/unusedMethodInClass5.ts
@@ -5,4 +5,4 @@
 ////     private ["string"] (){} 
 //// }|]
 
-verify.rangeAfterCodeFix("class C { }", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix("class C { }");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedMethodInClass6.ts b/tests/cases/fourslash/unusedMethodInClass6.ts
index b8c65c56fa1..d223b3d6857 100644
--- a/tests/cases/fourslash/unusedMethodInClass6.ts
+++ b/tests/cases/fourslash/unusedMethodInClass6.ts
@@ -5,4 +5,4 @@
 ////     private "string" (){} 
 //// }|]
 
-verify.rangeAfterCodeFix("class C { }", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix("class C { }");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedNamespaceInNamespace.ts b/tests/cases/fourslash/unusedNamespaceInNamespace.ts
index 5f1892e1a2f..802336454c6 100644
--- a/tests/cases/fourslash/unusedNamespaceInNamespace.ts
+++ b/tests/cases/fourslash/unusedNamespaceInNamespace.ts
@@ -9,5 +9,5 @@
 verify.rangeAfterCodeFix(`
 namespace A {
 }
-`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+`);
 
diff --git a/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts b/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts
index bd7c914a614..2314ebbe447 100644
--- a/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts
+++ b/tests/cases/fourslash/unusedTypeAliasInNamespace1.ts
@@ -8,4 +8,4 @@
 
 verify.rangeAfterCodeFix(`namespace greeter {
     export type nw = "No" | "Way";
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass1.ts b/tests/cases/fourslash/unusedTypeParametersInClass1.ts
index ba31e053727..322921ab471 100644
--- a/tests/cases/fourslash/unusedTypeParametersInClass1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInClass1.ts
@@ -4,4 +4,4 @@
 ////[|class greeter<T> |] {
 ////}
 
-verify.rangeAfterCodeFix("class greeter", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix("class greeter");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass2.ts b/tests/cases/fourslash/unusedTypeParametersInClass2.ts
index a56f1cf827b..feaf9d3a14b 100644
--- a/tests/cases/fourslash/unusedTypeParametersInClass2.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInClass2.ts
@@ -5,4 +5,4 @@
 ////    public a: X;
 ////}
 
-verify.rangeAfterCodeFix("class greeter<X>", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix("class greeter<X>");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass3.ts b/tests/cases/fourslash/unusedTypeParametersInClass3.ts
index e5f90dd4066..b1151265fe3 100644
--- a/tests/cases/fourslash/unusedTypeParametersInClass3.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInClass3.ts
@@ -6,4 +6,4 @@
 ////    public b: Z;
 ////}
 
-verify.rangeAfterCodeFix("class greeter<X, Z>", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("class greeter<X, Z>");
diff --git a/tests/cases/fourslash/unusedTypeParametersInClass3AddUnderscore.ts b/tests/cases/fourslash/unusedTypeParametersInClass3AddUnderscore.ts
deleted file mode 100644
index b1bf52d3043..00000000000
--- a/tests/cases/fourslash/unusedTypeParametersInClass3AddUnderscore.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// @noUnusedLocals: true
-////[|class greeter<X, Y, Z> |] {
-////    public a: X;
-////    public b: Z;
-////}
-
-verify.rangeAfterCodeFix("class greeter<X, _Y, Z>", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 1);
diff --git a/tests/cases/fourslash/unusedTypeParametersInFunction1.ts b/tests/cases/fourslash/unusedTypeParametersInFunction1.ts
index d5755275a5a..a11156badaa 100644
--- a/tests/cases/fourslash/unusedTypeParametersInFunction1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInFunction1.ts
@@ -3,4 +3,4 @@
 // @noUnusedLocals: true
 //// [|function f1<T>() {}|]
 
-verify.rangeAfterCodeFix("function f1() {}", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("function f1() {}");
diff --git a/tests/cases/fourslash/unusedTypeParametersInFunction2.ts b/tests/cases/fourslash/unusedTypeParametersInFunction2.ts
index f20010402a8..a011f093dab 100644
--- a/tests/cases/fourslash/unusedTypeParametersInFunction2.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInFunction2.ts
@@ -3,4 +3,4 @@
 // @noUnusedLocals: true
 //// [|function f1<X, Y>(a: X) {a}|]
 
-verify.rangeAfterCodeFix("function f1<X>(a: X) {a}", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("function f1<X>(a: X) {a}");
diff --git a/tests/cases/fourslash/unusedTypeParametersInFunction3.ts b/tests/cases/fourslash/unusedTypeParametersInFunction3.ts
index 5e46ca56aff..6dc56ccc7cb 100644
--- a/tests/cases/fourslash/unusedTypeParametersInFunction3.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInFunction3.ts
@@ -3,4 +3,4 @@
 // @noUnusedLocals: true
 //// [|function f1<X, Y, Z>(a: X) {a;var b:Z;b}|]
 
-verify.rangeAfterCodeFix("function f1<X, Z>(a: X) {a;var b:Z;b}", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("function f1<X, Z>(a: X) {a;var b:Z;b}");
diff --git a/tests/cases/fourslash/unusedTypeParametersInInterface1.ts b/tests/cases/fourslash/unusedTypeParametersInInterface1.ts
index 6ce19679fce..b5363b369be 100644
--- a/tests/cases/fourslash/unusedTypeParametersInInterface1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInInterface1.ts
@@ -4,4 +4,4 @@
 // @noUnusedParameters: true
 //// [|interface I<T> {}|]
 
-verify.rangeAfterCodeFix("interface I {}", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix("interface I {}");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda1.ts b/tests/cases/fourslash/unusedTypeParametersInLambda1.ts
index 8f094b73170..01c1ebd24f5 100644
--- a/tests/cases/fourslash/unusedTypeParametersInLambda1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda1.ts
@@ -6,4 +6,4 @@
 ////     [|return <T>(x:number) => {x}|]
 //// }
 
-verify.rangeAfterCodeFix("return (x:number) => {x}", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("return (x:number) => {x}");
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda2.ts b/tests/cases/fourslash/unusedTypeParametersInLambda2.ts
index fc9ccc80f8f..e5a4acc31c5 100644
--- a/tests/cases/fourslash/unusedTypeParametersInLambda2.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda2.ts
@@ -6,4 +6,4 @@
 ////     [|new <T, U>(a: T): void;|]
 //// }
 
-verify.rangeAfterCodeFix("new <T>(a: T): void;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("new <T>(a: T): void;");
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda3.ts b/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
index 1d2fb9af8d6..e6d866dcb6a 100644
--- a/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda3.ts
@@ -7,4 +7,4 @@
 ////     [|new <T, U, K>(a: T): A<U>;|]
 //// }
 
-verify.rangeAfterCodeFix("new <T, U>(a: T): A<U>;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("new <T, U>(a: T): A<U>;");
diff --git a/tests/cases/fourslash/unusedTypeParametersInLambda4.ts b/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
index a34e344d17d..04bd7c7e9be 100644
--- a/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInLambda4.ts
@@ -6,4 +6,4 @@
 //// }
 //// [|var y: new <T,U>(a:T)=>void;|]
 
-verify.rangeAfterCodeFix("var y: new <T>(a:T)=>void;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix("var y: new <T>(a:T)=>void;");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInMethod1.ts b/tests/cases/fourslash/unusedTypeParametersInMethod1.ts
index 36a124fc424..bc14952eca9 100644
--- a/tests/cases/fourslash/unusedTypeParametersInMethod1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInMethod1.ts
@@ -5,4 +5,4 @@
 ////    [|f1<T extends number>()|] {}
 //// }
 
-verify.rangeAfterCodeFix("f1()", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix("f1()");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInMethod2.ts b/tests/cases/fourslash/unusedTypeParametersInMethod2.ts
index 1d7203f86ac..c12fd53f66b 100644
--- a/tests/cases/fourslash/unusedTypeParametersInMethod2.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInMethod2.ts
@@ -5,4 +5,4 @@
 ////    [|f1<T extends number, U>(a: U)|] {a;}
 //// }
 
-verify.rangeAfterCodeFix("f1<U>(a: U)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix("f1<U>(a: U)");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedTypeParametersInMethods1.ts b/tests/cases/fourslash/unusedTypeParametersInMethods1.ts
index 2a4822628ce..d0b170491f5 100644
--- a/tests/cases/fourslash/unusedTypeParametersInMethods1.ts
+++ b/tests/cases/fourslash/unusedTypeParametersInMethods1.ts
@@ -5,4 +5,4 @@
 ////     [|public f1<X, Y, Z>(a: X)|] { a; var b: Z; b }
 //// }
 
-verify.rangeAfterCodeFix("public f1<X, Z>(a: X)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("public f1<X, Z>(a: X)");
diff --git a/tests/cases/fourslash/unusedVariableInBlocks.ts b/tests/cases/fourslash/unusedVariableInBlocks.ts
index 51deb5c313d..2a33d0c4cf5 100644
--- a/tests/cases/fourslash/unusedVariableInBlocks.ts
+++ b/tests/cases/fourslash/unusedVariableInBlocks.ts
@@ -12,4 +12,4 @@
 verify.rangeAfterCodeFix(`let x = 10;
    {
    }
-   x;`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+   x;`);
diff --git a/tests/cases/fourslash/unusedVariableInClass1.ts b/tests/cases/fourslash/unusedVariableInClass1.ts
index 177cf7f0197..8b0ca0db727 100644
--- a/tests/cases/fourslash/unusedVariableInClass1.ts
+++ b/tests/cases/fourslash/unusedVariableInClass1.ts
@@ -5,4 +5,4 @@
 ////    [|private greeting: string;|]
 ////}
 
-verify.rangeAfterCodeFix("", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("");
diff --git a/tests/cases/fourslash/unusedVariableInClass2.ts b/tests/cases/fourslash/unusedVariableInClass2.ts
index 2f5cf2e3278..6503dd02872 100644
--- a/tests/cases/fourslash/unusedVariableInClass2.ts
+++ b/tests/cases/fourslash/unusedVariableInClass2.ts
@@ -6,4 +6,4 @@
 ////    private greeting: string;|]
 ////}
 
-verify.rangeAfterCodeFix("public greeting1;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("public greeting1;");
diff --git a/tests/cases/fourslash/unusedVariableInClass3.ts b/tests/cases/fourslash/unusedVariableInClass3.ts
index 1e05c00f0a1..3ac306170a2 100644
--- a/tests/cases/fourslash/unusedVariableInClass3.ts
+++ b/tests/cases/fourslash/unusedVariableInClass3.ts
@@ -5,4 +5,4 @@
 ////    private X = function() {};
 ////|]}
 
-verify.rangeAfterCodeFix("", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("");
diff --git a/tests/cases/fourslash/unusedVariableInForLoop1FS.ts b/tests/cases/fourslash/unusedVariableInForLoop1FS.ts
index 15727ab70a7..760d8487b34 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop1FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop1FS.ts
@@ -7,5 +7,5 @@
 ////     }
 //// }
 
-verify.rangeAfterCodeFix("for(; ;)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("for(; ;)");
 
diff --git a/tests/cases/fourslash/unusedVariableInForLoop2FS.ts b/tests/cases/fourslash/unusedVariableInForLoop2FS.ts
index 5a06ad036f4..a16f21e8417 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop2FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop2FS.ts
@@ -7,4 +7,4 @@
 ////     }
 //// }
 
-verify.rangeAfterCodeFix("for(var i = 0; ;i++)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("for(var i = 0; ;i++)");
diff --git a/tests/cases/fourslash/unusedVariableInForLoop3FS.ts b/tests/cases/fourslash/unusedVariableInForLoop3FS.ts
index 32bb54c2241..07d13307ca7 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop3FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop3FS.ts
@@ -7,4 +7,4 @@
 ////     }
 //// }
 
-verify.rangeAfterCodeFix("for(var i = 0, k=0; ;i++,k++)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+verify.rangeAfterCodeFix("for(var i = 0, k=0; ;i++,k++)");
\ No newline at end of file
diff --git a/tests/cases/fourslash/unusedVariableInForLoop4FS.ts b/tests/cases/fourslash/unusedVariableInForLoop4FS.ts
index c5589366245..d54f8baaa3d 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop4FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop4FS.ts
@@ -7,4 +7,4 @@
 ////     }
 //// }
 
-verify.rangeAfterCodeFix("for(var j = 0, k=0; ;j++,k++)", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("for(var j = 0, k=0; ;j++,k++)");
diff --git a/tests/cases/fourslash/unusedVariableInForLoop5FS.ts b/tests/cases/fourslash/unusedVariableInForLoop5FS.ts
index fdcc51f696f..2948bfab207 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop5FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop5FS.ts
@@ -7,4 +7,4 @@
 ////     }
 //// }
 
-verify.rangeAfterCodeFix(`for (const _elem in ["a", "b", "c"])`, /*includeWhiteSpace*/ true, /*errorCode*/ 0, /*index*/ 0);
+verify.rangeAfterCodeFix(`for (const _elem in ["a", "b", "c"])`, /*includeWhiteSpace*/ true, /*errorCode*/ 0);
diff --git a/tests/cases/fourslash/unusedVariableInForLoop7FS.ts b/tests/cases/fourslash/unusedVariableInForLoop7FS.ts
index 94f4defca01..95dee56acf9 100644
--- a/tests/cases/fourslash/unusedVariableInForLoop7FS.ts
+++ b/tests/cases/fourslash/unusedVariableInForLoop7FS.ts
@@ -13,4 +13,4 @@ verify.rangeAfterCodeFix(`{
     for (const elem of ["a", "b", "c"]) {
         elem;
     }
-}`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+}`);
diff --git a/tests/cases/fourslash/unusedVariableInModule1.ts b/tests/cases/fourslash/unusedVariableInModule1.ts
index 115af8bc15d..e9fe9515e6d 100644
--- a/tests/cases/fourslash/unusedVariableInModule1.ts
+++ b/tests/cases/fourslash/unusedVariableInModule1.ts
@@ -6,4 +6,4 @@
 //// [|var x: string;
 //// export var y: string;|]
 
-verify.rangeAfterCodeFix("export var y: string;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("export var y: string;");
diff --git a/tests/cases/fourslash/unusedVariableInModule2.ts b/tests/cases/fourslash/unusedVariableInModule2.ts
index d2aeea0e82b..ac6e7120d8b 100644
--- a/tests/cases/fourslash/unusedVariableInModule2.ts
+++ b/tests/cases/fourslash/unusedVariableInModule2.ts
@@ -7,4 +7,4 @@
 //// z;
 //// export var y: string;
 
-verify.rangeAfterCodeFix("var z: number;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("var z: number;");
diff --git a/tests/cases/fourslash/unusedVariableInModule3.ts b/tests/cases/fourslash/unusedVariableInModule3.ts
index f7d565dd50b..0185b89e3a6 100644
--- a/tests/cases/fourslash/unusedVariableInModule3.ts
+++ b/tests/cases/fourslash/unusedVariableInModule3.ts
@@ -6,4 +6,4 @@
 //// [|var x = function f1() {}
 //// export var y: string;|]
 
-verify.rangeAfterCodeFix("export var y: string;", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("export var y: string;");
diff --git a/tests/cases/fourslash/unusedVariableInNamespace1.ts b/tests/cases/fourslash/unusedVariableInNamespace1.ts
index d90b7e50603..c9f38473a51 100644
--- a/tests/cases/fourslash/unusedVariableInNamespace1.ts
+++ b/tests/cases/fourslash/unusedVariableInNamespace1.ts
@@ -5,4 +5,4 @@
 ////    [|let a = "dummy entry";|]
 ////}
 
-verify.rangeAfterCodeFix("", /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix("");
diff --git a/tests/cases/fourslash/unusedVariableInNamespace2.ts b/tests/cases/fourslash/unusedVariableInNamespace2.ts
index 664d76130b4..992c229014a 100644
--- a/tests/cases/fourslash/unusedVariableInNamespace2.ts
+++ b/tests/cases/fourslash/unusedVariableInNamespace2.ts
@@ -9,4 +9,4 @@
 ////    }
 ////}
 
-verify.rangeAfterCodeFix(`let a = "dummy entry", c = 0;`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix(`let a = "dummy entry", c = 0;`);
diff --git a/tests/cases/fourslash/unusedVariableInNamespace3.ts b/tests/cases/fourslash/unusedVariableInNamespace3.ts
index 4de5c0f1534..0039036b2f8 100644
--- a/tests/cases/fourslash/unusedVariableInNamespace3.ts
+++ b/tests/cases/fourslash/unusedVariableInNamespace3.ts
@@ -9,4 +9,4 @@
 ////    }
 ////}
 
-verify.rangeAfterCodeFix(`let a = "dummy entry", b;`, /*includeWhiteSpace*/ false, /*errorCode*/ undefined, /*index*/ 0);
+verify.rangeAfterCodeFix(`let a = "dummy entry", b;`);