diff --git a/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts b/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts
index 0812cb138d2..7f8ef32e1ad 100644
--- a/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts
+++ b/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts
@@ -16,7 +16,7 @@
 
 //// function func2({ a, b/*parameter2*/
 
-test.markers().forEach((m) => {
+test.markers().forEach(m => {
     goTo.position(m.position, m.fileName);
     verify.completionListIsEmpty();
 });
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
index ad72bd99bb8..a72023a1028 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
@@ -5,17 +5,17 @@
 ////    property2: string;
 ////}
 ////
-////function f({ [|property1|]: p1 }: I,
+////function f({ /**/[|property1|]: p1 }: I,
 ////           { [|property1|] }: I,
 ////           { property1: p2 }) {
+////
+////    return property1 + 1;
 ////}
 
-let ranges = test.ranges();
-for (let range of ranges) {
-    goTo.position(range.start);
+goTo.marker();
 
-    verify.referencesCountIs(ranges.length);
-    for (let expectedRange of ranges) {
-        verify.referencesAtPositionContains(expectedRange);
-    }
+let ranges = test.ranges();
+verify.referencesCountIs(ranges.length);
+for (let expectedRange of ranges) {
+    verify.referencesAtPositionContains(expectedRange);
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
index aa6432fa62e..f7e3b80fe45 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
@@ -5,17 +5,9 @@
 ////    property2: string;
 ////}
 ////
-////function f({ [|property1|]: p }, { property1 }) {
+////function f({ /**/property1: p }, { property1 }) {
 ////    let x = property1;
 ////}
 
-// Notice only one range.
-let ranges = test.ranges();
-for (let range of ranges) {
-    goTo.position(range.start);
-
-    verify.referencesCountIs(ranges.length);
-    for (let expectedRange of ranges) {
-        verify.referencesAtPositionContains(expectedRange);
-    }
-}
\ No newline at end of file
+goTo.marker();
+verify.referencesCountIs(0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
index 4ce33f2b6ad..67c7029861e 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
@@ -5,12 +5,19 @@
 ////    property2: string;
 ////}
 ////
-////for (let { [|property1|]: p } of <I[]>[]) {
+////var elems: I[];
+////for (let { [|property1|]: p } of elems) {
 ////}
-////for (let { [|property1|] } of <I[]>[]) {
+////for (let { property1 } of elems) {
 ////}
-////for (var { [|property1|]: p } of <I[]>[]) {
+////for (var { [|property1|]: p1 } of elems) {
 ////}
+////var p2;
+////for ({ property1 : p2 } of elems) {
+////}
+
+// Note: if this test ever changes, consider updating
+//       'quickInfoForObjectBindingElementPropertyName05.ts'
 
 let ranges = test.ranges();
 for (let range of ranges) {
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
new file mode 100644
index 00000000000..0b82c73e31d
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    [|property1|]: number;
+////    property2: string;
+////}
+////
+////function f({ [|property1|]: p1 }: I,
+////           { /**/[|property1|] }: I,
+////           { property1: p2 }) {
+////
+////    return [|property1|] + 1;
+////}
+
+goTo.marker();
+
+let ranges = test.ranges();
+verify.referencesCountIs(ranges.length);
+for (let expectedRange of ranges) {
+    verify.referencesAtPositionContains(expectedRange);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
new file mode 100644
index 00000000000..ea38f35d103
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts'/>
+
+////interface Recursive {
+////    [|next|]?: Recursive;
+////    value: any;
+////}
+////
+////function f ({ [|next|]: { [|next|]: x} }: Recursive) {
+////}
+
+goTo.marker();
+
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedRange of ranges) {
+        verify.referencesAtPositionContains(expectedRange);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts
new file mode 100644
index 00000000000..cfdeef111dc
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////interface Recursive {
+////    next?: Recursive;
+////    value: any;
+////}
+////
+////function f ({ /*1*/next: { /*2*/next: x} }: Recursive) {
+////}
+
+for (let { position } of test.markers()) {
+    goTo.position(position)
+    verify.quickInfoIs("(property) Recursive.next: Recursive");
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName04.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName04.ts
new file mode 100644
index 00000000000..6a0a6cb792a
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName04.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////interface Recursive {
+////    next?: Recursive;
+////    value: any;
+////}
+////
+////function f ({ /*1*/next: { /*2*/next: x} }) {
+////}
+
+for (let { position } of test.markers()) {
+    goTo.position(position)
+    verify.quickInfoIs("(property) next: any");
+}
\ No newline at end of file