diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 5610eaf1510..ace3df96daa 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -2720,8 +2720,13 @@ Actual: ${stringify(fullActual)}`);
             }
         }
 
-        public verifyRangesWithSameTextAreRenameLocations() {
-            this.rangesByText().forEach(ranges => this.verifyRangesAreRenameLocations(ranges));
+        public verifyRangesWithSameTextAreRenameLocations(...texts: string[]) {
+            if (texts.length) {
+                texts.forEach(text => this.verifyRangesAreRenameLocations(this.rangesByText().get(text)!));
+            }
+            else {
+                this.rangesByText().forEach(ranges => this.verifyRangesAreRenameLocations(ranges));
+            }
         }
 
         public verifyRangesWithSameTextAreDocumentHighlights() {
@@ -4088,8 +4093,8 @@ namespace FourSlashInterface {
             this.state.verifyRangesAreOccurrences(isWriteAccess, ranges);
         }
 
-        public rangesWithSameTextAreRenameLocations() {
-            this.state.verifyRangesWithSameTextAreRenameLocations();
+        public rangesWithSameTextAreRenameLocations(...texts: string[]) {
+            this.state.verifyRangesWithSameTextAreRenameLocations(...texts);
         }
 
         public rangesAreRenameLocations(options?: FourSlash.Range[] | { findInStrings?: boolean, findInComments?: boolean, ranges?: FourSlash.Range[] }) {
diff --git a/tests/cases/fourslash/findAllRefsOnImportAliases2.ts b/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
index 7be887c6af2..6faccc01dc9 100644
--- a/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
+++ b/tests/cases/fourslash/findAllRefsOnImportAliases2.ts
@@ -1,14 +1,14 @@
 /// <reference path="fourslash.ts" />
 
 //@Filename: a.ts
-////export class [|{| "isWriteAccess": true, "isDefinition": true |}Class|] {}
+////[|export class [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}Class|] {}|]
 
 //@Filename: b.ts
-////import { [|Class|] as [|{| "isWriteAccess": true, "isDefinition": true |}C2|] } from "./a";
+////[|import { [|{| "declarationRangeIndex": 2 |}Class|] as [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}C2|] } from "./a";|]
 ////var c = new [|C2|]();
 
 //@Filename: c.ts
-////export { [|Class|] as [|{| "isWriteAccess": true, "isDefinition": true |}C3|] } from "./a";
+////[|export { [|{| "declarationRangeIndex": 6 |}Class|] as [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 6 |}C3|] } from "./a";|]
 
 const ranges = test.rangesByText();
 const classRanges = ranges.get("Class");
@@ -26,4 +26,4 @@ verify.referenceGroups(c2Ranges, [c2s])
 
 verify.referenceGroups(c3Ranges, [c3s]);
 
-verify.rangesWithSameTextAreRenameLocations();
+verify.rangesWithSameTextAreRenameLocations("Class", "C2", "C3");
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index b01f8842dee..249d6d909c1 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -229,7 +229,7 @@ declare namespace FourSlashInterface {
         referenceGroups(starts: ArrayOrSingle<string> | ArrayOrSingle<Range>, parts: ReadonlyArray<ReferenceGroup>): void;
         singleReferenceGroup(definition: ReferencesDefinition, ranges?: Range[]): void;
         rangesAreOccurrences(isWriteAccess?: boolean, ranges?: Range[]): void;
-        rangesWithSameTextAreRenameLocations(): void;
+        rangesWithSameTextAreRenameLocations(...texts: string[]): void;
         rangesAreRenameLocations(options?: Range[] | { findInStrings?: boolean, findInComments?: boolean, ranges?: Range[] });
         findReferencesDefinitionDisplayPartsAtCaretAre(expected: ts.SymbolDisplayPart[]): void;
         noSignatureHelp(...markers: string[]): void;
diff --git a/tests/cases/fourslash/javaScriptClass2.ts b/tests/cases/fourslash/javaScriptClass2.ts
index 130976dfe57..d13a7727214 100644
--- a/tests/cases/fourslash/javaScriptClass2.ts
+++ b/tests/cases/fourslash/javaScriptClass2.ts
@@ -14,4 +14,4 @@
 //// var x = new Foo();
 //// x.[|union|];
 
-verify.rangesAreRenameLocations(test.rangesByText().get("union"));
+verify.rangesWithSameTextAreRenameLocations("union");
diff --git a/tests/cases/fourslash/jsxSpreadReference.ts b/tests/cases/fourslash/jsxSpreadReference.ts
index 3b8b9e9425a..310b5cbadb4 100644
--- a/tests/cases/fourslash/jsxSpreadReference.ts
+++ b/tests/cases/fourslash/jsxSpreadReference.ts
@@ -18,5 +18,4 @@
 //// var x = <MyClass {...[|n/*src*/n|]}></MyClass>;
 
 verify.goToDefinition("src", "dst");
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("nn");
diff --git a/tests/cases/fourslash/renameAcrossMultipleProjects.ts b/tests/cases/fourslash/renameAcrossMultipleProjects.ts
index 272fe2bb393..adad26a957a 100644
--- a/tests/cases/fourslash/renameAcrossMultipleProjects.ts
+++ b/tests/cases/fourslash/renameAcrossMultipleProjects.ts
@@ -11,5 +11,4 @@
 /////// <reference path="a.ts" />
 ////[|x|]++;
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("x");
diff --git a/tests/cases/fourslash/renameAlias.ts b/tests/cases/fourslash/renameAlias.ts
index 18b9ff47010..58dfc4c460e 100644
--- a/tests/cases/fourslash/renameAlias.ts
+++ b/tests/cases/fourslash/renameAlias.ts
@@ -4,5 +4,4 @@
 ////[|import [|{| "declarationRangeIndex": 0 |}M|] = SomeModule;|]
 ////import C = [|M|].SomeClass;
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("M");
diff --git a/tests/cases/fourslash/renameAlias2.ts b/tests/cases/fourslash/renameAlias2.ts
index 4559976af80..25540f45304 100644
--- a/tests/cases/fourslash/renameAlias2.ts
+++ b/tests/cases/fourslash/renameAlias2.ts
@@ -4,5 +4,4 @@
 ////import M = [|SomeModule|];
 ////import C = M.SomeClass;
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
\ No newline at end of file
+verify.rangesWithSameTextAreRenameLocations("SomeModule");
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameAlias3.ts b/tests/cases/fourslash/renameAlias3.ts
index 70e3446dbe0..d20b58c75e8 100644
--- a/tests/cases/fourslash/renameAlias3.ts
+++ b/tests/cases/fourslash/renameAlias3.ts
@@ -4,5 +4,4 @@
 ////import M = SomeModule;
 ////import C = M.[|SomeClass|];
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("SomeClass");
diff --git a/tests/cases/fourslash/renameAliasExternalModule.ts b/tests/cases/fourslash/renameAliasExternalModule.ts
index 8d753febc2b..71bce0dd282 100644
--- a/tests/cases/fourslash/renameAliasExternalModule.ts
+++ b/tests/cases/fourslash/renameAliasExternalModule.ts
@@ -8,5 +8,4 @@
 ////[|import [|{| "declarationRangeIndex": 0 |}M|] = require("./a");|]
 ////import C = [|M|].SomeClass;
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("M");
diff --git a/tests/cases/fourslash/renameAliasExternalModule3.ts b/tests/cases/fourslash/renameAliasExternalModule3.ts
index 6966b94b8a6..1d2df353a3f 100644
--- a/tests/cases/fourslash/renameAliasExternalModule3.ts
+++ b/tests/cases/fourslash/renameAliasExternalModule3.ts
@@ -8,5 +8,4 @@
 ////import M = require("./a");
 ////import C = M.[|SomeClass|];
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("SomeClass");
diff --git a/tests/cases/fourslash/renameCommentsAndStrings1.ts b/tests/cases/fourslash/renameCommentsAndStrings1.ts
index 7d3f5890b7d..cef7088b09c 100644
--- a/tests/cases/fourslash/renameCommentsAndStrings1.ts
+++ b/tests/cases/fourslash/renameCommentsAndStrings1.ts
@@ -7,5 +7,4 @@
 ////    "this is a reference to Bar in a string"
 ////}|]
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("Bar");
diff --git a/tests/cases/fourslash/renameContextuallyTypedProperties.ts b/tests/cases/fourslash/renameContextuallyTypedProperties.ts
index 118c53be2b7..4b5b03dbe94 100644
--- a/tests/cases/fourslash/renameContextuallyTypedProperties.ts
+++ b/tests/cases/fourslash/renameContextuallyTypedProperties.ts
@@ -55,4 +55,4 @@
 ////    set ["prop2"](v) { }
 ////};
 
-verify.rangesAreRenameLocations(test.rangesByText().get("prop1"));
+verify.rangesWithSameTextAreRenameLocations("prop1");
diff --git a/tests/cases/fourslash/renameContextuallyTypedProperties2.ts b/tests/cases/fourslash/renameContextuallyTypedProperties2.ts
index 5439a2215d2..44bc668fd25 100644
--- a/tests/cases/fourslash/renameContextuallyTypedProperties2.ts
+++ b/tests/cases/fourslash/renameContextuallyTypedProperties2.ts
@@ -55,4 +55,4 @@
 ////    [|set ["[|{| "declarationRangeIndex": 20 |}prop2|]"](v) { }|]
 ////};
 
-verify.rangesAreRenameLocations(test.rangesByText().get("prop2"));
+verify.rangesWithSameTextAreRenameLocations("prop2");
diff --git a/tests/cases/fourslash/renameDestructuringAssignment.ts b/tests/cases/fourslash/renameDestructuringAssignment.ts
index 7833f4166a2..cc4a9eb6fe1 100644
--- a/tests/cases/fourslash/renameDestructuringAssignment.ts
+++ b/tests/cases/fourslash/renameDestructuringAssignment.ts
@@ -7,4 +7,4 @@
 ////var x;
 ////([|{ [|{| "declarationRangeIndex": 2 |}x|]: x } = a|]);
 
-verify.rangesAreRenameLocations(test.rangesByText().get("x"));
+verify.rangesWithSameTextAreRenameLocations("x");
diff --git a/tests/cases/fourslash/renameImportOfExportEquals2.ts b/tests/cases/fourslash/renameImportOfExportEquals2.ts
index 67cb06b761b..df915f45fb7 100644
--- a/tests/cases/fourslash/renameImportOfExportEquals2.ts
+++ b/tests/cases/fourslash/renameImportOfExportEquals2.ts
@@ -33,7 +33,4 @@ verify.referenceGroups(oRanges, [os, ps, qs]);
 verify.referenceGroups(pRanges, [ps, qs]);
 verify.referenceGroups(qRanges, [qs]);
 
-verify.rangesAreRenameLocations(nRanges);
-verify.rangesAreRenameLocations(oRanges);
-verify.rangesAreRenameLocations(pRanges);
-verify.rangesAreRenameLocations(qRanges);
+verify.rangesWithSameTextAreRenameLocations("N", "O", "P", "Q");
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameInheritedProperties1.ts b/tests/cases/fourslash/renameInheritedProperties1.ts
index 2cd8ec23781..784d77cb609 100644
--- a/tests/cases/fourslash/renameInheritedProperties1.ts
+++ b/tests/cases/fourslash/renameInheritedProperties1.ts
@@ -7,5 +7,4 @@
 //// var v: class1;
 //// v.[|propName|];
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("propName");
diff --git a/tests/cases/fourslash/renameInheritedProperties2.ts b/tests/cases/fourslash/renameInheritedProperties2.ts
index de6c6e14d15..632ff0b30ca 100644
--- a/tests/cases/fourslash/renameInheritedProperties2.ts
+++ b/tests/cases/fourslash/renameInheritedProperties2.ts
@@ -7,5 +7,4 @@
 //// var v: class1;
 //// v.[|doStuff|]();
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("doStuff");
diff --git a/tests/cases/fourslash/renameInheritedProperties3.ts b/tests/cases/fourslash/renameInheritedProperties3.ts
index 9d8e9b65476..511bf8e0a01 100644
--- a/tests/cases/fourslash/renameInheritedProperties3.ts
+++ b/tests/cases/fourslash/renameInheritedProperties3.ts
@@ -7,5 +7,4 @@
 //// var v: interface1;
 //// v.[|propName|];
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("propName");
diff --git a/tests/cases/fourslash/renameInheritedProperties4.ts b/tests/cases/fourslash/renameInheritedProperties4.ts
index 1fe0bc9de7b..e3ac0da7e63 100644
--- a/tests/cases/fourslash/renameInheritedProperties4.ts
+++ b/tests/cases/fourslash/renameInheritedProperties4.ts
@@ -7,5 +7,4 @@
 //// var v: interface1;
 //// v.[|doStuff|]();
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("doStuff");
diff --git a/tests/cases/fourslash/renameInheritedProperties5.ts b/tests/cases/fourslash/renameInheritedProperties5.ts
index 352201999a4..2c6340eaab2 100644
--- a/tests/cases/fourslash/renameInheritedProperties5.ts
+++ b/tests/cases/fourslash/renameInheritedProperties5.ts
@@ -9,6 +9,5 @@
 //// var d: D;
 //// d.[|propD|];
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("propD");
 
diff --git a/tests/cases/fourslash/renameInheritedProperties6.ts b/tests/cases/fourslash/renameInheritedProperties6.ts
index 5f997f3c664..a07587bb9ff 100644
--- a/tests/cases/fourslash/renameInheritedProperties6.ts
+++ b/tests/cases/fourslash/renameInheritedProperties6.ts
@@ -9,5 +9,4 @@
 //// var d: D;
 //// d.[|propC|];
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("propC");
diff --git a/tests/cases/fourslash/renameInheritedProperties7.ts b/tests/cases/fourslash/renameInheritedProperties7.ts
index 94becfd2e5b..38d36a5416c 100644
--- a/tests/cases/fourslash/renameInheritedProperties7.ts
+++ b/tests/cases/fourslash/renameInheritedProperties7.ts
@@ -11,5 +11,4 @@
 //// var c: C;
 //// c.[|prop1|];
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("prop1");
diff --git a/tests/cases/fourslash/renameInheritedProperties8.ts b/tests/cases/fourslash/renameInheritedProperties8.ts
index f27ded79dae..4762178aacf 100644
--- a/tests/cases/fourslash/renameInheritedProperties8.ts
+++ b/tests/cases/fourslash/renameInheritedProperties8.ts
@@ -11,4 +11,4 @@
 //// var c: C;
 //// c.[|prop1|];
 
-verify.rangesAreRenameLocations(test.rangesByText().get("prop1"));
+verify.rangesWithSameTextAreRenameLocations("prop1");
diff --git a/tests/cases/fourslash/renameJsPropertyAssignment.ts b/tests/cases/fourslash/renameJsPropertyAssignment.ts
index a764bc18fd9..75b1a486255 100644
--- a/tests/cases/fourslash/renameJsPropertyAssignment.ts
+++ b/tests/cases/fourslash/renameJsPropertyAssignment.ts
@@ -7,5 +7,4 @@
 ////[|bar.[|{| "declarationRangeIndex": 0 |}foo|] = "foo";|]
 ////console.log(bar.[|foo|]);
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("foo");
diff --git a/tests/cases/fourslash/renameJsPropertyAssignment2.ts b/tests/cases/fourslash/renameJsPropertyAssignment2.ts
index dbd1749b3ed..0539fcf87d6 100644
--- a/tests/cases/fourslash/renameJsPropertyAssignment2.ts
+++ b/tests/cases/fourslash/renameJsPropertyAssignment2.ts
@@ -7,5 +7,4 @@
 ////[|Minimatch.[|{| "declarationRangeIndex": 0 |}staticProperty|] = "string";|]
 ////console.log(Minimatch.[|staticProperty|]);
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("staticProperty");
diff --git a/tests/cases/fourslash/renameJsPropertyAssignment3.ts b/tests/cases/fourslash/renameJsPropertyAssignment3.ts
index 462fbd06c8c..acd44682b41 100644
--- a/tests/cases/fourslash/renameJsPropertyAssignment3.ts
+++ b/tests/cases/fourslash/renameJsPropertyAssignment3.ts
@@ -7,5 +7,4 @@
 ////[|C.[|{| "declarationRangeIndex": 0 |}staticProperty|] = "string";|]
 ////console.log(C.[|staticProperty|]);
 
-const [rDef, ...ranges] = test.ranges();
-verify.rangesAreRenameLocations(ranges);
+verify.rangesWithSameTextAreRenameLocations("staticProperty");
diff --git a/tests/cases/fourslash/renameJsPrototypeProperty01.ts b/tests/cases/fourslash/renameJsPrototypeProperty01.ts
index b171ccdf005..519c161e727 100644
--- a/tests/cases/fourslash/renameJsPrototypeProperty01.ts
+++ b/tests/cases/fourslash/renameJsPrototypeProperty01.ts
@@ -8,5 +8,4 @@
 ////var t = new bar();
 ////[|t.[|{| "declarationRangeIndex": 2 |}x|] = 11;|]
 
-const [r0Def, r0, r1Def, r1] = test.ranges();
-verify.rangesAreRenameLocations([r0, r1]);
+verify.rangesWithSameTextAreRenameLocations("x");
diff --git a/tests/cases/fourslash/renameJsPrototypeProperty02.ts b/tests/cases/fourslash/renameJsPrototypeProperty02.ts
index b171ccdf005..519c161e727 100644
--- a/tests/cases/fourslash/renameJsPrototypeProperty02.ts
+++ b/tests/cases/fourslash/renameJsPrototypeProperty02.ts
@@ -8,5 +8,4 @@
 ////var t = new bar();
 ////[|t.[|{| "declarationRangeIndex": 2 |}x|] = 11;|]
 
-const [r0Def, r0, r1Def, r1] = test.ranges();
-verify.rangesAreRenameLocations([r0, r1]);
+verify.rangesWithSameTextAreRenameLocations("x");
diff --git a/tests/cases/fourslash/renameJsThisProperty01.ts b/tests/cases/fourslash/renameJsThisProperty01.ts
index 7cd55020e20..d08e11455bc 100644
--- a/tests/cases/fourslash/renameJsThisProperty01.ts
+++ b/tests/cases/fourslash/renameJsThisProperty01.ts
@@ -8,5 +8,4 @@
 ////var t = new bar();
 ////[|t.[|{| "declarationRangeIndex": 2 |}x|] = 11;|]
 
-const [r0Def, r0, r1Def, r1] = test.ranges();
-verify.rangesAreRenameLocations([r0, r1]);
+verify.rangesWithSameTextAreRenameLocations("x");
diff --git a/tests/cases/fourslash/renameJsThisProperty03.ts b/tests/cases/fourslash/renameJsThisProperty03.ts
index da5fc01e57a..14150674e91 100644
--- a/tests/cases/fourslash/renameJsThisProperty03.ts
+++ b/tests/cases/fourslash/renameJsThisProperty03.ts
@@ -10,5 +10,4 @@
 ////var t = new C(12);
 ////[|t.[|{| "declarationRangeIndex": 2 |}x|] = 11;|]
 
-const [rDef, r0, r1Def, r1] = test.ranges();
-verify.rangesAreRenameLocations([r0, r1]);
+verify.rangesWithSameTextAreRenameLocations("x");
diff --git a/tests/cases/fourslash/renameJsThisProperty05.ts b/tests/cases/fourslash/renameJsThisProperty05.ts
index 95a514e0abc..1277df32288 100644
--- a/tests/cases/fourslash/renameJsThisProperty05.ts
+++ b/tests/cases/fourslash/renameJsThisProperty05.ts
@@ -11,5 +11,4 @@
 ////var t = new C(12);
 ////[|t.[|{| "declarationRangeIndex": 2 |}z|] = 11;|]
 
-const [r0Def, r0, r1Def, r1] = test.ranges();
-verify.rangesAreRenameLocations([r0, r1]);
+verify.rangesWithSameTextAreRenameLocations("z");
diff --git a/tests/cases/fourslash/renameJsThisProperty06.ts b/tests/cases/fourslash/renameJsThisProperty06.ts
index e7ae3256139..ab773cc2764 100644
--- a/tests/cases/fourslash/renameJsThisProperty06.ts
+++ b/tests/cases/fourslash/renameJsThisProperty06.ts
@@ -11,5 +11,4 @@
 ////var t = new C(12);
 ////[|t.[|{| "declarationRangeIndex": 2 |}z|] = 11;|]
 
-const [r0Def, r0, r1Def, r1] = test.ranges();
-verify.rangesAreRenameLocations([r0, r1]);
+verify.rangesWithSameTextAreRenameLocations("z");
diff --git a/tests/cases/fourslash/renameLocationsForClassExpression01.ts b/tests/cases/fourslash/renameLocationsForClassExpression01.ts
index 6379306608e..b6bdb7eccb0 100644
--- a/tests/cases/fourslash/renameLocationsForClassExpression01.ts
+++ b/tests/cases/fourslash/renameLocationsForClassExpression01.ts
@@ -20,5 +20,4 @@
 ////}
 ////var z = class Foo {}
 
-const [rDef, ...rest] = test.ranges();
-verify.rangesAreRenameLocations(rest);
+verify.rangesWithSameTextAreRenameLocations("Foo");
diff --git a/tests/cases/fourslash/renameLocationsForFunctionExpression01.ts b/tests/cases/fourslash/renameLocationsForFunctionExpression01.ts
index e32a080683a..f0ff6ee222d 100644
--- a/tests/cases/fourslash/renameLocationsForFunctionExpression01.ts
+++ b/tests/cases/fourslash/renameLocationsForFunctionExpression01.ts
@@ -4,5 +4,4 @@
 ////    [|f|]([|f|], g);
 ////}|]
 
-const [rDef, ...rest] = test.ranges();
-verify.rangesAreRenameLocations(rest);
+verify.rangesWithSameTextAreRenameLocations("f");
diff --git a/tests/cases/fourslash/renameLocationsForFunctionExpression02.ts b/tests/cases/fourslash/renameLocationsForFunctionExpression02.ts
index ab835b5305c..0eb34d2baf9 100644
--- a/tests/cases/fourslash/renameLocationsForFunctionExpression02.ts
+++ b/tests/cases/fourslash/renameLocationsForFunctionExpression02.ts
@@ -10,5 +10,4 @@
 ////    let foo = () => [|f|]([|f|], g);
 ////}|]
 
-const [rDef, ...rest] = test.ranges();
-verify.rangesAreRenameLocations(rest);
+verify.rangesWithSameTextAreRenameLocations("f");
diff --git a/tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts b/tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts
index 526838995c3..b9f733e3bf5 100644
--- a/tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts
+++ b/tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts
@@ -9,4 +9,4 @@
 ////[|var { [|{| "declarationRangeIndex": 2 |}property1|]: prop1 } = foo;|]
 
 
-verify.rangesAreRenameLocations(test.rangesByText().get("property1"));
+verify.rangesWithSameTextAreRenameLocations("property1");
diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts
index 90939afbaa0..c3dfb37ca6f 100644
--- a/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts
+++ b/tests/cases/fourslash/renameParameterPropertyDeclaration1.ts
@@ -7,5 +7,4 @@
 ////     }
 //// }
 
-const [rDef, ...rest] = test.ranges();
-verify.rangesAreRenameLocations(rest);
+verify.rangesWithSameTextAreRenameLocations("privateParam");
diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts
index a131106e4bf..a4e8acc3074 100644
--- a/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts
+++ b/tests/cases/fourslash/renameParameterPropertyDeclaration2.ts
@@ -7,5 +7,4 @@
 ////     }
 //// }
 
-const [rDef, ...rest] = test.ranges();
-verify.rangesAreRenameLocations(rest);
+verify.rangesWithSameTextAreRenameLocations("publicParam");
diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts
index 73ab9b40c51..3d8b5510c98 100644
--- a/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts
+++ b/tests/cases/fourslash/renameParameterPropertyDeclaration3.ts
@@ -7,5 +7,4 @@
 ////     }
 //// }
 
-const [rDef, ...rest] = test.ranges();
-verify.rangesAreRenameLocations(rest);
+verify.rangesWithSameTextAreRenameLocations("protectedParam");
diff --git a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts
index f92fd53b6f9..8cacfbad0fa 100644
--- a/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts
+++ b/tests/cases/fourslash/renameParameterPropertyDeclaration5.ts
@@ -6,5 +6,4 @@
 ////     }
 //// }
 
-const [rDef, ...rest] = test.ranges();
-verify.rangesAreRenameLocations(rest);
+verify.rangesWithSameTextAreRenameLocations("protectedParam");
diff --git a/tests/cases/fourslash/renamePropertyAccessExpressionHeritageClause.ts b/tests/cases/fourslash/renamePropertyAccessExpressionHeritageClause.ts
index ae6a1c70b90..32993d730e7 100644
--- a/tests/cases/fourslash/renamePropertyAccessExpressionHeritageClause.ts
+++ b/tests/cases/fourslash/renamePropertyAccessExpressionHeritageClause.ts
@@ -7,5 +7,4 @@
 //// class C extends (foo()).[|B|] {}
 //// class C1 extends foo().[|B|] {}
 
-const ranges = test.rangesByText();
-verify.rangesAreRenameLocations(ranges.get("B"));
\ No newline at end of file
+verify.rangesWithSameTextAreRenameLocations("B");
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameRest.ts b/tests/cases/fourslash/renameRest.ts
index da1f590dd70..8540586857b 100644
--- a/tests/cases/fourslash/renameRest.ts
+++ b/tests/cases/fourslash/renameRest.ts
@@ -8,6 +8,4 @@
 ////var { x, ...rest } = t;
 ////rest.[|parent|];
 
-
-const rangesByText = test.rangesByText();
-verify.rangesAreRenameLocations(rangesByText.get("parent"));
+verify.rangesWithSameTextAreRenameLocations("parent");
diff --git a/tests/cases/fourslash/renameStringPropertyNames.ts b/tests/cases/fourslash/renameStringPropertyNames.ts
index 8d34ee458ea..609d45c62b3 100644
--- a/tests/cases/fourslash/renameStringPropertyNames.ts
+++ b/tests/cases/fourslash/renameStringPropertyNames.ts
@@ -12,5 +12,4 @@
 ////o['[|prop|]'];
 ////o.[|prop|];
 
-const rangesByText = test.rangesByText();
-verify.rangesAreRenameLocations(rangesByText.get("prop"));
+verify.rangesWithSameTextAreRenameLocations("prop");
diff --git a/tests/cases/fourslash/renameUMDModuleAlias1.ts b/tests/cases/fourslash/renameUMDModuleAlias1.ts
index 510e117007b..36c67241a10 100644
--- a/tests/cases/fourslash/renameUMDModuleAlias1.ts
+++ b/tests/cases/fourslash/renameUMDModuleAlias1.ts
@@ -10,5 +10,4 @@
 //// /// <reference path="0.d.ts" />
 //// [|myLib|].doThing();
 
-const rangesByText = test.rangesByText();
-verify.rangesAreRenameLocations(rangesByText.get("myLib"));
+verify.rangesWithSameTextAreRenameLocations("myLib");
diff --git a/tests/cases/fourslash/tsxRename1.ts b/tests/cases/fourslash/tsxRename1.ts
index 25a4032032d..047bc391a38 100644
--- a/tests/cases/fourslash/tsxRename1.ts
+++ b/tests/cases/fourslash/tsxRename1.ts
@@ -12,5 +12,4 @@
 ////     }
 //// }
 //// var x = <[|div|] />;
-const rangesByText = test.rangesByText();
-verify.rangesAreRenameLocations(rangesByText.get("div"));
+verify.rangesWithSameTextAreRenameLocations("div");
diff --git a/tests/cases/fourslash/tsxRename2.ts b/tests/cases/fourslash/tsxRename2.ts
index e79e7746d52..c6cb9d16ca8 100644
--- a/tests/cases/fourslash/tsxRename2.ts
+++ b/tests/cases/fourslash/tsxRename2.ts
@@ -13,5 +13,4 @@
 //// }
 //// var x = <div [|[|{| "declarationRangeIndex": 2 |}name|]="hello"|] />;
 
-const rangesByText = test.rangesByText();
-verify.rangesAreRenameLocations(rangesByText.get("name"));
+verify.rangesWithSameTextAreRenameLocations("name");
diff --git a/tests/cases/fourslash/tsxRename3.ts b/tests/cases/fourslash/tsxRename3.ts
index 7970c314f45..c7c68abfa00 100644
--- a/tests/cases/fourslash/tsxRename3.ts
+++ b/tests/cases/fourslash/tsxRename3.ts
@@ -16,5 +16,4 @@
 ////
 //// var x = <MyClass [|[|{| "declarationRangeIndex": 2 |}name|]='hello'|]/>;
 
-const rangesByText = test.rangesByText();
-verify.rangesAreRenameLocations(rangesByText.get("name"));
+verify.rangesWithSameTextAreRenameLocations("name");
diff --git a/tests/cases/fourslash/tsxRename4.ts b/tests/cases/fourslash/tsxRename4.ts
index cfd9b379fb7..0bc9fa10f0c 100644
--- a/tests/cases/fourslash/tsxRename4.ts
+++ b/tests/cases/fourslash/tsxRename4.ts
@@ -17,7 +17,4 @@
 ////<[|div|]> </[|div|]>
 
 verify.noErrors();
-
-const rangesByText = test.rangesByText();
-verify.rangesAreRenameLocations(rangesByText.get("MyClass"));
-verify.rangesAreRenameLocations(rangesByText.get("div"));
\ No newline at end of file
+verify.rangesWithSameTextAreRenameLocations("MyClass", "div");
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxRename5.ts b/tests/cases/fourslash/tsxRename5.ts
index d57da4b083a..953e950e6a6 100644
--- a/tests/cases/fourslash/tsxRename5.ts
+++ b/tests/cases/fourslash/tsxRename5.ts
@@ -16,5 +16,4 @@
 //// [|var [|{| "declarationRangeIndex": 0 |}nn|]: string;|]
 //// var x = <MyClass name={[|nn|]}></MyClass>;
 
-const rangesByText = test.rangesByText();
-verify.rangesAreRenameLocations(rangesByText.get("nn"));
+verify.rangesWithSameTextAreRenameLocations("nn");
diff --git a/tests/cases/fourslash/tsxRename6.ts b/tests/cases/fourslash/tsxRename6.ts
index 3b0068d16b9..1cafd1332b0 100644
--- a/tests/cases/fourslash/tsxRename6.ts
+++ b/tests/cases/fourslash/tsxRename6.ts
@@ -22,6 +22,4 @@
 //// let opt3 = <[|Opt|] wrong />;
 //// let opt4 = <[|Opt|] propx={100} propString="hi" />;
 
-//verify.rangesAreRenameLocations();
-const rangesByText = test.rangesByText();
-verify.rangesAreRenameLocations(rangesByText.get("Opt"));
+verify.rangesWithSameTextAreRenameLocations("Opt");
diff --git a/tests/cases/fourslash/tsxRename7.ts b/tests/cases/fourslash/tsxRename7.ts
index 57b5da71cfc..13b16cf0ba5 100644
--- a/tests/cases/fourslash/tsxRename7.ts
+++ b/tests/cases/fourslash/tsxRename7.ts
@@ -21,5 +21,4 @@
 //// let opt2 = <Opt [|[|{| "declarationRangeIndex": 4 |}propx|]={100}|] optional/>;
 //// let opt3 = <Opt wrong />;
 
-const rangesByText = test.rangesByText();
-verify.rangesAreRenameLocations(rangesByText.get("propx"));
+verify.rangesWithSameTextAreRenameLocations("propx");
diff --git a/tests/cases/fourslash/tsxRename9.ts b/tests/cases/fourslash/tsxRename9.ts
index 8de7a1c6d86..29a54d51cae 100644
--- a/tests/cases/fourslash/tsxRename9.ts
+++ b/tests/cases/fourslash/tsxRename9.ts
@@ -30,22 +30,10 @@
 //// let opt = <[|MainButton|] [|[|{| "declarationRangeIndex": 20 |}goTo|]="goTo"|] />;
 //// let opt = <[|MainButton|] [|wrong|] />;
 
-const [
-    onClickDef_0, onClick_1,
-    goToDef_2, goTo_3,
-    mainButtonDef_4, mainButton_5,
-    mainButtonDef_6, mainButton_7,
-    mainButtonDef_8, mainButton_9,
-    mainButton_10,
-    mainButton_11,
-    mainButton_12, onClickDef_13, onClick_14,
-    mainButton_15, onClickDef_16, onClick_17, ignoreProp_18,
-    mainButton_19, goToDef_20, goTo_21,
-    mainButton_22, wrong_23
-] = test.ranges();
-const rangesByText = test.rangesByText();
-verify.rangesAreRenameLocations(rangesByText.get("onClick"));
-verify.rangesAreRenameLocations(rangesByText.get("goTo"));
-verify.rangesAreRenameLocations(rangesByText.get("MainButton"));
-verify.rangesAreRenameLocations(rangesByText.get("ignore-prop"));
-verify.rangesAreRenameLocations(rangesByText.get("wrong"));
\ No newline at end of file
+verify.rangesWithSameTextAreRenameLocations(
+    "onClick",
+    "goTo",
+    "MainButton",
+    "ignore-prop",
+    "wrong"
+);
\ No newline at end of file