diff --git a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt
new file mode 100644
index 00000000000..407e984c5d1
--- /dev/null
+++ b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.errors.txt
@@ -0,0 +1,24 @@
+tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(7,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
+tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts(13,15): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
+
+
+==== tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts (2 errors) ====
+    class B {
+        constructor(x?: string) {}
+        x(): string { return ""; }
+    }
+    class C1 extends B {
+        constructor() {
+            super.x();
+            ~~~~~
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
+            super();
+        }
+    }
+    class C2 extends B {
+        constructor() {
+            super(super.x());
+                  ~~~~~
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
new file mode 100644
index 00000000000..15bc0c40f37
--- /dev/null
+++ b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
@@ -0,0 +1,46 @@
+//// [superPropertyInConstructorBeforeSuperCall.ts]
+class B {
+    constructor(x?: string) {}
+    x(): string { return ""; }
+}
+class C1 extends B {
+    constructor() {
+        super.x();
+        super();
+    }
+}
+class C2 extends B {
+    constructor() {
+        super(super.x());
+    }
+}
+
+//// [superPropertyInConstructorBeforeSuperCall.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var B = (function () {
+    function B(x) {
+    }
+    B.prototype.x = function () { return ""; };
+    return B;
+}());
+var C1 = (function (_super) {
+    __extends(C1, _super);
+    function C1() {
+        var _this;
+        _super.prototype.x.call(_this);
+        _this = _super.call(this) || this;
+        return _this;
+    }
+    return C1;
+}(B));
+var C2 = (function (_super) {
+    __extends(C2, _super);
+    function C2() {
+        return _super.call(this, _super.x.call(_this)) || this;
+    }
+    return C2;
+}(B));
diff --git a/tests/baselines/reference/superWithTypeArgument.errors.txt b/tests/baselines/reference/superWithTypeArgument.errors.txt
index d749cbd5157..5860cb466d9 100644
--- a/tests/baselines/reference/superWithTypeArgument.errors.txt
+++ b/tests/baselines/reference/superWithTypeArgument.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/compiler/superWithTypeArgument.ts(6,5): error TS2377: Constructors for derived classes must contain a 'super' call.
+tests/cases/compiler/superWithTypeArgument.ts(7,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument.ts(7,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
-==== tests/cases/compiler/superWithTypeArgument.ts (2 errors) ====
+==== tests/cases/compiler/superWithTypeArgument.ts (3 errors) ====
     class C {
         
     }
@@ -12,6 +13,8 @@ tests/cases/compiler/superWithTypeArgument.ts(7,14): error TS1034: 'super' must
         ~~~~~~~~~~~~~~~
             super<T>();
     ~~~~~~~~~~~~~~~~~~~
+            ~~~~~
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }
diff --git a/tests/baselines/reference/superWithTypeArgument2.errors.txt b/tests/baselines/reference/superWithTypeArgument2.errors.txt
index 766327c5c81..473e7f3b7ad 100644
--- a/tests/baselines/reference/superWithTypeArgument2.errors.txt
+++ b/tests/baselines/reference/superWithTypeArgument2.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/compiler/superWithTypeArgument2.ts(6,5): error TS2377: Constructors for derived classes must contain a 'super' call.
+tests/cases/compiler/superWithTypeArgument2.ts(7,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument2.ts(7,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
-==== tests/cases/compiler/superWithTypeArgument2.ts (2 errors) ====
+==== tests/cases/compiler/superWithTypeArgument2.ts (3 errors) ====
     class C<T> {
         foo: T;
     }
@@ -12,6 +13,8 @@ tests/cases/compiler/superWithTypeArgument2.ts(7,14): error TS1034: 'super' must
         ~~~~~~~~~~~~~~~~
             super<T>(x);
     ~~~~~~~~~~~~~~~~~~~~
+            ~~~~~
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }
diff --git a/tests/baselines/reference/superWithTypeArgument3.errors.txt b/tests/baselines/reference/superWithTypeArgument3.errors.txt
index 323b2958fcb..37e6681d770 100644
--- a/tests/baselines/reference/superWithTypeArgument3.errors.txt
+++ b/tests/baselines/reference/superWithTypeArgument3.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/compiler/superWithTypeArgument3.ts(7,5): error TS2377: Constructors for derived classes must contain a 'super' call.
+tests/cases/compiler/superWithTypeArgument3.ts(8,9): error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
 tests/cases/compiler/superWithTypeArgument3.ts(8,14): error TS1034: 'super' must be followed by an argument list or member access.
 
 
-==== tests/cases/compiler/superWithTypeArgument3.ts (2 errors) ====
+==== tests/cases/compiler/superWithTypeArgument3.ts (3 errors) ====
     class C<T> {
         foo: T;
         bar<U>(x: U) { }
@@ -13,6 +14,8 @@ tests/cases/compiler/superWithTypeArgument3.ts(8,14): error TS1034: 'super' must
         ~~~~~~~~~~~~~~~
             super<T>();
     ~~~~~~~~~~~~~~~~~~~
+            ~~~~~
+!!! error TS17011: 'super' must be called before accessing a property of 'super' in the constructor of a derived class.
                  ~
 !!! error TS1034: 'super' must be followed by an argument list or member access.
         }
diff --git a/tests/baselines/reference/systemModuleTrailingComments.js b/tests/baselines/reference/systemModuleTrailingComments.js
new file mode 100644
index 00000000000..41b0bd299a0
--- /dev/null
+++ b/tests/baselines/reference/systemModuleTrailingComments.js
@@ -0,0 +1,18 @@
+//// [systemModuleTrailingComments.ts]
+export const test = "TEST";
+
+//some comment
+
+//// [systemModuleTrailingComments.js]
+System.register([], function (exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var test;
+    return {
+        setters: [],
+        execute: function () {
+            exports_1("test", test = "TEST");
+            //some comment 
+        }
+    };
+});
diff --git a/tests/baselines/reference/systemModuleTrailingComments.symbols b/tests/baselines/reference/systemModuleTrailingComments.symbols
new file mode 100644
index 00000000000..4df59b45faa
--- /dev/null
+++ b/tests/baselines/reference/systemModuleTrailingComments.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/systemModuleTrailingComments.ts ===
+export const test = "TEST";
+>test : Symbol(test, Decl(systemModuleTrailingComments.ts, 0, 12))
+
+//some comment
diff --git a/tests/baselines/reference/systemModuleTrailingComments.types b/tests/baselines/reference/systemModuleTrailingComments.types
new file mode 100644
index 00000000000..235b46e6e8f
--- /dev/null
+++ b/tests/baselines/reference/systemModuleTrailingComments.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/systemModuleTrailingComments.ts ===
+export const test = "TEST";
+>test : "TEST"
+>"TEST" : "TEST"
+
+//some comment
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.js b/tests/baselines/reference/unionTypeWithLeadingOperator.js
new file mode 100644
index 00000000000..0fb366d538e
--- /dev/null
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.js
@@ -0,0 +1,10 @@
+//// [unionTypeWithLeadingOperator.ts]
+type A = | string;
+type B =
+  | { type: "INCREMENT" }
+  | { type: "DECREMENT" };
+
+type C = [| 0 | 1, | "foo" | "bar"];
+
+
+//// [unionTypeWithLeadingOperator.js]
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.symbols b/tests/baselines/reference/unionTypeWithLeadingOperator.symbols
new file mode 100644
index 00000000000..8c15d299c48
--- /dev/null
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/unionTypeWithLeadingOperator.ts ===
+type A = | string;
+>A : Symbol(A, Decl(unionTypeWithLeadingOperator.ts, 0, 0))
+
+type B =
+>B : Symbol(B, Decl(unionTypeWithLeadingOperator.ts, 0, 18))
+
+  | { type: "INCREMENT" }
+>type : Symbol(type, Decl(unionTypeWithLeadingOperator.ts, 2, 5))
+
+  | { type: "DECREMENT" };
+>type : Symbol(type, Decl(unionTypeWithLeadingOperator.ts, 3, 5))
+
+type C = [| 0 | 1, | "foo" | "bar"];
+>C : Symbol(C, Decl(unionTypeWithLeadingOperator.ts, 3, 26))
+
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.types b/tests/baselines/reference/unionTypeWithLeadingOperator.types
new file mode 100644
index 00000000000..2ca15fb54a2
--- /dev/null
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.types
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/unionTypeWithLeadingOperator.ts ===
+type A = | string;
+>A : string
+
+type B =
+>B : B
+
+  | { type: "INCREMENT" }
+>type : "INCREMENT"
+
+  | { type: "DECREMENT" };
+>type : "DECREMENT"
+
+type C = [| 0 | 1, | "foo" | "bar"];
+>C : [0 | 1, "foo" | "bar"]
+
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation2.errors.txt b/tests/baselines/reference/untypedModuleImport_withAugmentation2.errors.txt
new file mode 100644
index 00000000000..628533b93d5
--- /dev/null
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation2.errors.txt
@@ -0,0 +1,19 @@
+/node_modules/augmenter/index.d.ts(3,16): error TS2665: Invalid module name in augmentation. Module 'js' resolves to an untyped module at '/node_modules/js/index.js', which cannot be augmented.
+
+
+==== /a.ts (0 errors) ====
+    import { } from "augmenter";
+    
+==== /node_modules/augmenter/index.d.ts (1 errors) ====
+    // This tests that augmenting an untyped module is forbidden even in an ambient context. Contrast with `moduleAugmentationInDependency.ts`.
+    
+    declare module "js" {
+                   ~~~~
+!!! error TS2665: Invalid module name in augmentation. Module 'js' resolves to an untyped module at '/node_modules/js/index.js', which cannot be augmented.
+        export const j: number;
+    }
+    export {};
+    
+==== /node_modules/js/index.js (0 errors) ====
+    This file is not processed.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation2.js b/tests/baselines/reference/untypedModuleImport_withAugmentation2.js
new file mode 100644
index 00000000000..f9fa7443224
--- /dev/null
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation2.js
@@ -0,0 +1,19 @@
+//// [tests/cases/compiler/untypedModuleImport_withAugmentation2.ts] ////
+
+//// [index.d.ts]
+// This tests that augmenting an untyped module is forbidden even in an ambient context. Contrast with `moduleAugmentationInDependency.ts`.
+
+declare module "js" {
+    export const j: number;
+}
+export {};
+
+//// [index.js]
+This file is not processed.
+
+//// [a.ts]
+import { } from "augmenter";
+
+
+//// [a.js]
+"use strict";
diff --git a/tests/baselines/reference/unusedLocalsAndObjectSpread.errors.txt b/tests/baselines/reference/unusedLocalsAndObjectSpread.errors.txt
new file mode 100644
index 00000000000..56f2ba927fb
--- /dev/null
+++ b/tests/baselines/reference/unusedLocalsAndObjectSpread.errors.txt
@@ -0,0 +1,40 @@
+tests/cases/compiler/unusedLocalsAndObjectSpread.ts(21,18): error TS6133: 'bar' is declared but never used.
+tests/cases/compiler/unusedLocalsAndObjectSpread.ts(28,21): error TS6133: 'bar' is declared but never used.
+
+
+==== tests/cases/compiler/unusedLocalsAndObjectSpread.ts (2 errors) ====
+    
+    declare var console: { log(a: any): void };
+    
+    function one() {
+        const foo = { a: 1, b: 2 };
+        // 'a' is declared but never used
+        const {a, ...bar} = foo;
+        console.log(bar);
+    }
+    
+    function two() {
+        const foo = { a: 1, b: 2 };
+        // '_' is declared but never used
+        const {a: _, ...bar} = foo;
+        console.log(bar);
+    }
+    
+    function three() {
+        const foo = { a: 1, b: 2 };
+        // 'a' is declared but never used
+        const {a, ...bar} = foo; // bar should be unused
+                     ~~~
+!!! error TS6133: 'bar' is declared but never used.
+        //console.log(bar);
+    }
+    
+    function four() {
+        const foo = { a: 1, b: 2 };
+        // '_' is declared but never used
+        const {a: _, ...bar} = foo; // bar should be unused
+                        ~~~
+!!! error TS6133: 'bar' is declared but never used.
+        //console.log(bar);
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/unusedLocalsAndObjectSpread.js b/tests/baselines/reference/unusedLocalsAndObjectSpread.js
new file mode 100644
index 00000000000..2878f1b5c5c
--- /dev/null
+++ b/tests/baselines/reference/unusedLocalsAndObjectSpread.js
@@ -0,0 +1,67 @@
+//// [unusedLocalsAndObjectSpread.ts]
+
+declare var console: { log(a: any): void };
+
+function one() {
+    const foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    const {a, ...bar} = foo;
+    console.log(bar);
+}
+
+function two() {
+    const foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    const {a: _, ...bar} = foo;
+    console.log(bar);
+}
+
+function three() {
+    const foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    const {a, ...bar} = foo; // bar should be unused
+    //console.log(bar);
+}
+
+function four() {
+    const foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    const {a: _, ...bar} = foo; // bar should be unused
+    //console.log(bar);
+}
+
+
+//// [unusedLocalsAndObjectSpread.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+function one() {
+    var foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    var a = foo.a, bar = __rest(foo, ["a"]);
+    console.log(bar);
+}
+function two() {
+    var foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    var _ = foo.a, bar = __rest(foo, ["a"]);
+    console.log(bar);
+}
+function three() {
+    var foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    var a = foo.a, bar = __rest(foo, ["a"]); // bar should be unused
+    //console.log(bar);
+}
+function four() {
+    var foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    var _ = foo.a, bar = __rest(foo, ["a"]); // bar should be unused
+    //console.log(bar);
+}
diff --git a/tests/baselines/reference/useObjectValuesAndEntries1.types b/tests/baselines/reference/useObjectValuesAndEntries1.types
index f04201450c0..d9ccc019f75 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries1.types
+++ b/tests/baselines/reference/useObjectValuesAndEntries1.types
@@ -22,38 +22,38 @@ for (var x of Object.values(o)) {
 }
 
 var entries = Object.entries(o);  // <-- entries: ['a' | 'b', number][]
->entries : ["a" | "b", number][]
->Object.entries(o) : ["a" | "b", number][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : [string, number][]
+>Object.entries(o) : [string, number][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >o : { a: number; b: number; }
 
 var entries1 = Object.entries(1); // <-- entries: [string, any][]
 >entries1 : [string, any][]
 >Object.entries(1) : [string, any][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >1 : 1
 
 var entries2 = Object.entries({a: true, b: 2}) // ['a' | 'b', number | boolean][]
->entries2 : ["a" | "b", number | boolean][]
->Object.entries({a: true, b: 2}) : ["a" | "b", number | boolean][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries2 : [string, number | boolean][]
+>Object.entries({a: true, b: 2}) : [string, number | boolean][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
->{a: true, b: 2} : { a: true; b: number; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
+>{a: true, b: 2} : { a: true; b: 2; }
 >a : boolean
 >true : true
 >b : number
 >2 : 2
 
 var entries3 = Object.entries({}) // [never, any][]
->entries3 : [never, any][]
->Object.entries({}) : [never, any][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries3 : [string, {}][]
+>Object.entries({}) : [string, {}][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >{} : {}
 
diff --git a/tests/baselines/reference/useObjectValuesAndEntries4.types b/tests/baselines/reference/useObjectValuesAndEntries4.types
index d68193993e2..05af55d42cb 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries4.types
+++ b/tests/baselines/reference/useObjectValuesAndEntries4.types
@@ -22,10 +22,10 @@ for (var x of Object.values(o)) {
 }
 
 var entries = Object.entries(o);
->entries : ["a" | "b", number][]
->Object.entries(o) : ["a" | "b", number][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : [string, number][]
+>Object.entries(o) : [string, number][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >o : { a: number; b: number; }
 
diff --git a/tests/baselines/reference/widenedTypes.errors.txt b/tests/baselines/reference/widenedTypes.errors.txt
index ea7c2b2f92a..5ea097acf2e 100644
--- a/tests/baselines/reference/widenedTypes.errors.txt
+++ b/tests/baselines/reference/widenedTypes.errors.txt
@@ -1,5 +1,4 @@
 tests/cases/compiler/widenedTypes.ts(2,1): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
-tests/cases/compiler/widenedTypes.ts(5,1): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/compiler/widenedTypes.ts(6,7): error TS2361: The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter
 tests/cases/compiler/widenedTypes.ts(8,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/compiler/widenedTypes.ts(10,14): error TS2695: Left side of comma operator is unused and has no side effects.
@@ -12,7 +11,7 @@ tests/cases/compiler/widenedTypes.ts(24,5): error TS2322: Type '{ x: number; y:
     Type 'number' is not assignable to type 'string'.
 
 
-==== tests/cases/compiler/widenedTypes.ts (9 errors) ====
+==== tests/cases/compiler/widenedTypes.ts (8 errors) ====
     
     null instanceof (() => { });
     ~~~~
@@ -20,8 +19,6 @@ tests/cases/compiler/widenedTypes.ts(24,5): error TS2322: Type '{ x: number; y:
     ({}) instanceof null; // Ok because null is a subtype of function
     
     null in {};
-    ~~~~
-!!! error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
     "" in null;
           ~~~~
 !!! error TS2361: The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter
diff --git a/tests/cases/compiler/circularReferenceInImport.ts b/tests/cases/compiler/circularReferenceInImport.ts
new file mode 100644
index 00000000000..869beeaa3a9
--- /dev/null
+++ b/tests/cases/compiler/circularReferenceInImport.ts
@@ -0,0 +1,15 @@
+// @declaration: true
+
+// @filename: db.d.ts
+declare namespace Db {
+    export import Types = Db;
+}
+
+export = Db;
+
+// @filename: app.ts
+import * as Db from "./db"
+
+export function foo() {
+    return new Object()
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmitIndexTypeNotFound.ts b/tests/cases/compiler/declarationEmitIndexTypeNotFound.ts
new file mode 100644
index 00000000000..de3316cd56f
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitIndexTypeNotFound.ts
@@ -0,0 +1,5 @@
+// @declaration: true
+
+export interface Test {
+    [index: TypeNotFound]: any;
+}
diff --git a/tests/cases/compiler/decoratorMetadataRestParameterWithImportedType.ts b/tests/cases/compiler/decoratorMetadataRestParameterWithImportedType.ts
new file mode 100644
index 00000000000..3bc22df8928
--- /dev/null
+++ b/tests/cases/compiler/decoratorMetadataRestParameterWithImportedType.ts
@@ -0,0 +1,42 @@
+// @experimentalDecorators: true
+// @emitDecoratorMetadata: true
+// @target: es5
+
+// @filename: aux.ts
+export class SomeClass {
+    field: string;
+}
+
+// @filename: aux1.ts
+export class SomeClass1 {
+    field: string;
+}
+
+// @filename: aux2.ts
+export class SomeClass2 {
+    field: string;
+}
+// @filename: main.ts
+import { SomeClass } from './aux';
+import { SomeClass1 } from './aux1';
+
+function annotation(): ClassDecorator {
+    return (target: any): void => { };
+}
+
+function annotation1(): MethodDecorator {
+    return (target: any): void => { };
+}
+
+@annotation()
+export class ClassA {
+    array: SomeClass[];
+
+    constructor(...init: SomeClass[]) {
+        this.array = init;
+    }
+
+    @annotation1()
+    foo(... args: SomeClass1[]) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/decoratorWithUnderscoreMethod.ts b/tests/cases/compiler/decoratorWithUnderscoreMethod.ts
new file mode 100644
index 00000000000..e6551c91284
--- /dev/null
+++ b/tests/cases/compiler/decoratorWithUnderscoreMethod.ts
@@ -0,0 +1,18 @@
+// @noemithelpers: true
+// @experimentaldecorators: true
+
+declare var console : { log(arg: string): void };
+function dec(): Function {
+    return function (target: any, propKey: string, descr: PropertyDescriptor): void {
+        console.log(target[propKey]);
+        //logs undefined
+        //propKey has three underscores as prefix, but the method has only two underscores
+    };
+}
+
+class A {
+    @dec()
+    private __foo(bar: string): void {
+        // do something with bar
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts b/tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts
new file mode 100644
index 00000000000..14183a5de59
--- /dev/null
+++ b/tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts
@@ -0,0 +1,18 @@
+// @strictNullChecks: true
+
+// Repro from #12529
+
+class A {
+    readonly kind = "A"; // (property) A.kind: "A"
+}
+
+class B {
+    readonly kind = "B"; // (property) B.kind: "B"
+}
+
+function f(value: A | B): number {
+    switch(value.kind) {
+        case "A": return 0;
+        case "B": return 1;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts b/tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts
new file mode 100644
index 00000000000..1c5ebac3d91
--- /dev/null
+++ b/tests/cases/compiler/explicitAnyAfterSpreadNoImplicitAnyError.ts
@@ -0,0 +1,3 @@
+// @noImplicitAny: true
+({ a: [], ...(null as any) });
+let x: any;
diff --git a/tests/cases/compiler/importHelpersDeclarations.ts b/tests/cases/compiler/importHelpersDeclarations.ts
new file mode 100644
index 00000000000..7b958cda789
--- /dev/null
+++ b/tests/cases/compiler/importHelpersDeclarations.ts
@@ -0,0 +1,9 @@
+// @importHelpers: true
+// @target: es5
+// @module: commonjs
+// @moduleResolution: classic
+// @filename: declaration.d.ts
+export declare class D {
+}
+export declare class E extends D {
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/intersectionTypeNormalization.ts b/tests/cases/compiler/intersectionTypeNormalization.ts
index f31c3d49014..3d07aeb1a23 100644
--- a/tests/cases/compiler/intersectionTypeNormalization.ts
+++ b/tests/cases/compiler/intersectionTypeNormalization.ts
@@ -57,4 +57,49 @@ function getValueAsString(value: IntersectionFail): string {
         return '' + value.num;
     }
     return value.str;
+}
+
+// Repro from #12535
+
+namespace enums {
+    export const enum A {
+        a1,
+        a2,
+        a3,
+       // ... elements omitted for the sake of clarity
+        a75,
+        a76,
+        a77,
+    }
+    export const enum B {
+        b1,
+        b2,
+       // ... elements omitted for the sake of clarity
+        b86,
+        b87,
+    }
+    export const enum C {
+        c1,
+        c2,
+       // ... elements omitted for the sake of clarity
+        c210,
+        c211,
+    }
+    export type Genre = A | B | C;
+}
+
+type Foo = {
+    genreId: enums.Genre;
+};
+
+type Bar = {
+    genreId: enums.Genre;
+};
+
+type FooBar = Foo & Bar;
+
+function foo(so: any) {
+    const val = so as FooBar;
+    const isGenre = val.genreId;
+    return isGenre;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts b/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts
new file mode 100644
index 00000000000..4138dee4261
--- /dev/null
+++ b/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts
@@ -0,0 +1,6 @@
+type A = & string;
+type B =
+  & { foo: string }
+  & { bar: number };
+
+type C = [& { foo: 1 } & { bar: 2 }, & { foo: 3 } & { bar: 4 }];
diff --git a/tests/cases/compiler/invalidUseOfTypeAsNamespace.ts b/tests/cases/compiler/invalidUseOfTypeAsNamespace.ts
new file mode 100644
index 00000000000..5391715cb3a
--- /dev/null
+++ b/tests/cases/compiler/invalidUseOfTypeAsNamespace.ts
@@ -0,0 +1,4 @@
+interface OhNo {
+}
+
+declare let y: OhNo.hello;
diff --git a/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts b/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
new file mode 100644
index 00000000000..86fd9935a1f
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
@@ -0,0 +1,17 @@
+//@module: commonjs
+//@target: es5
+//@jsx: react
+//@jsxFactory: skate.h
+//@noEmit: false
+
+// @filename: index.tsx
+import "./jsx";
+
+var skate: any;
+const React = { createElement: skate.h };
+
+class Component {
+    renderCallback() {
+        return <div>test</div>;
+    }
+};
\ No newline at end of file
diff --git a/tests/cases/compiler/keyofIsLiteralContexualType.ts b/tests/cases/compiler/keyofIsLiteralContexualType.ts
new file mode 100644
index 00000000000..dd14de92289
--- /dev/null
+++ b/tests/cases/compiler/keyofIsLiteralContexualType.ts
@@ -0,0 +1,13 @@
+// keyof T is a literal contextual type
+
+function foo<T extends { a: string, b: string }>() {
+    let a: (keyof T)[] = ["a", "b"];
+    let b: (keyof T)[] = ["a", "b", "c"];
+}
+
+// Repro from #12455
+
+declare function pick<T, K extends keyof T>(obj: T, propNames: K[]): Pick<T, K>;
+
+let x = pick({ a: 10, b: 20, c: 30 }, ["a", "c"]);
+let b = x.b;  // Error
\ No newline at end of file
diff --git a/tests/cases/compiler/mappedTypeInferenceCircularity.ts b/tests/cases/compiler/mappedTypeInferenceCircularity.ts
new file mode 100644
index 00000000000..56fe08c5fe2
--- /dev/null
+++ b/tests/cases/compiler/mappedTypeInferenceCircularity.ts
@@ -0,0 +1,7 @@
+// Repro from #12511
+
+type HTML = { [K in 'div']: Block<HTML> };
+type Block<P> = <T>(func: HTML) => {};
+
+declare var h: HTML;
+h.div(h);
\ No newline at end of file
diff --git a/tests/cases/compiler/nestedFreshLiteral.ts b/tests/cases/compiler/nestedFreshLiteral.ts
new file mode 100644
index 00000000000..bf3bf5df8d3
--- /dev/null
+++ b/tests/cases/compiler/nestedFreshLiteral.ts
@@ -0,0 +1,14 @@
+// @strictNullChecks: true
+interface CSSProps  {
+  color?: string
+}
+interface NestedCSSProps {
+  nested?: NestedSelector
+}
+interface NestedSelector  {
+  prop: CSSProps;
+}
+
+let stylen: NestedCSSProps = {
+  nested: { prop: { colour: 'red' } }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/newLexicalEnvironmentForConvertedLoop.ts b/tests/cases/compiler/newLexicalEnvironmentForConvertedLoop.ts
new file mode 100644
index 00000000000..25b351d62a1
--- /dev/null
+++ b/tests/cases/compiler/newLexicalEnvironmentForConvertedLoop.ts
@@ -0,0 +1,13 @@
+// @target: es5
+function baz(x: any) {
+  return [[x, x]];
+}
+
+function foo(set: any) {
+  for (const [value, i] of baz(set.values)) {
+    const bar: any = [];
+    (() => bar);
+
+    set.values.push(...[]);
+  }
+};
\ No newline at end of file
diff --git a/tests/cases/compiler/objectFreeze.ts b/tests/cases/compiler/objectFreeze.ts
new file mode 100644
index 00000000000..5e8539831b1
--- /dev/null
+++ b/tests/cases/compiler/objectFreeze.ts
@@ -0,0 +1,12 @@
+const f = Object.freeze(function foo(a: number, b: string) { return false; });
+f(1, "") === false;
+
+class C { constructor(a: number) { } }
+const c = Object.freeze(C);
+new c(1);
+
+const a = Object.freeze([1, 2, 3]);
+a[0] = a[2].toString();
+
+const o = Object.freeze({ a: 1, b: "string" });
+o.b = o.a.toString();
diff --git a/tests/cases/compiler/restIntersection.ts b/tests/cases/compiler/restIntersection.ts
new file mode 100644
index 00000000000..5fca2dafc36
--- /dev/null
+++ b/tests/cases/compiler/restIntersection.ts
@@ -0,0 +1,4 @@
+var intersection: { x: number, y: number } & { w: string, z: string };
+
+var rest1: { y: number, w: string, z: string };
+var {x, ...rest1 } = intersection;
diff --git a/tests/cases/compiler/restInvalidArgumentType.ts b/tests/cases/compiler/restInvalidArgumentType.ts
new file mode 100644
index 00000000000..488f546e231
--- /dev/null
+++ b/tests/cases/compiler/restInvalidArgumentType.ts
@@ -0,0 +1,59 @@
+enum E { v1, v2 };
+
+function f<T extends { b: string }>(p1: T, p2: T[]) {
+    var t: T;
+
+    var i: T["b"];
+    var k: keyof T;
+
+    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped: {[P in "b"]: T[P]};
+
+    var union_generic: T | { a: number };
+    var union_primitive: { a: number } | number;
+
+    var intersection_generic: T & { a: number };
+    var intersection_premitive: { a: number } | string;
+
+    var num: number;
+    var str: number;
+
+    var u: undefined;
+    var n: null;
+
+    var a: any;
+
+    var literal_string: "string";
+    var literal_number: 42;
+
+    var e: E;
+
+    var {...r1} = p1;   // Error, generic type paramterre
+    var {...r2} = p2;   // OK
+    var {...r3} = t;   // Error, generic type paramter
+
+    var {...r4} = i;   // Error, index access
+    var {...r5} = k;   // Error, index
+
+    var {...r6} = mapped_generic; // Error, generic mapped object type
+    var {...r7} = mapped;  // OK, non-generic mapped type
+
+    var {...r8} = union_generic;  // Error, union with generic type parameter
+    var {...r9} = union_primitive;  // Error, union with generic type parameter
+
+    var {...r10} = intersection_generic;  // Error, intersection with generic type parameter
+    var {...r11} = intersection_premitive;  // Error, intersection with generic type parameter
+
+    var {...r12} = num;  // Error
+    var {...r13} = str;  // Error
+
+    var {...r14} = u;  // OK
+    var {...r15} = n;  // OK
+
+    var {...r16} = a;  // OK
+
+    var {...r17} = literal_string;  // Error
+    var {...r18} = literal_number;  // Error
+
+    var {...r19} = e;  // Error, enum
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/restUnion.ts b/tests/cases/compiler/restUnion.ts
new file mode 100644
index 00000000000..c838b37340f
--- /dev/null
+++ b/tests/cases/compiler/restUnion.ts
@@ -0,0 +1,14 @@
+var union: { a: number, c: boolean } | { a: string, b: string };
+
+var rest1: { c: boolean } | { b: string };
+var {a, ...rest1 } = union;
+
+
+var undefinedUnion: { n: number } | undefined;
+var rest2: {};
+var {n, ...rest2 } = undefinedUnion;
+
+
+var nullUnion: { n: number } | null;
+var rest3: {};
+var {n, ...rest3 } = nullUnion;
diff --git a/tests/cases/compiler/restUnion2.ts b/tests/cases/compiler/restUnion2.ts
new file mode 100644
index 00000000000..83d94e03a73
--- /dev/null
+++ b/tests/cases/compiler/restUnion2.ts
@@ -0,0 +1,19 @@
+// @strictNullChecks: true
+
+declare const undefinedUnion: { n: number } | undefined;
+var rest2: { n: number };
+var {...rest2 } = undefinedUnion;
+
+
+declare const nullUnion: { n: number } | null;
+var rest3: { n: number };
+var {...rest3 } = nullUnion;
+
+
+declare const nullAndUndefinedUnion: null | undefined;
+var rest4: { };
+var {...rest4 } = nullAndUndefinedUnion;
+
+declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
+var rest5: { n: number, s: string };
+var {...rest5 } = unionWithIntersection;
\ No newline at end of file
diff --git a/tests/cases/compiler/selfReferencingSpreadInLoop.ts b/tests/cases/compiler/selfReferencingSpreadInLoop.ts
new file mode 100644
index 00000000000..0900e6cad63
--- /dev/null
+++ b/tests/cases/compiler/selfReferencingSpreadInLoop.ts
@@ -0,0 +1,5 @@
+// @noImplicitAny: true
+let additional = [];
+for (const subcomponent of [1, 2, 3]) {
+    additional = [...additional, subcomponent];
+}
diff --git a/tests/cases/compiler/spreadIntersection.ts b/tests/cases/compiler/spreadIntersection.ts
new file mode 100644
index 00000000000..3b397dc40cc
--- /dev/null
+++ b/tests/cases/compiler/spreadIntersection.ts
@@ -0,0 +1,7 @@
+var intersection: { a: number } & { b: string };
+
+var o1: { a: number, b: string };
+var o1 = { ...intersection };
+
+var o2: { a: number, b: string, c: boolean };
+var o2 = { ...intersection, c: false };
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadInvalidArgumentType.ts b/tests/cases/compiler/spreadInvalidArgumentType.ts
new file mode 100644
index 00000000000..2ac6aa921f4
--- /dev/null
+++ b/tests/cases/compiler/spreadInvalidArgumentType.ts
@@ -0,0 +1,59 @@
+enum E { v1, v2 };
+
+function f<T extends { b: string }>(p1: T, p2: T[]) {
+    var t: T;
+
+    var i: T["b"];
+    var k: keyof T;
+
+    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped: {[P in "b"]: T[P]};
+
+    var union_generic: T | { a: number };
+    var union_primitive: { a: number } | number;
+
+    var intersection_generic: T & { a: number };
+    var intersection_premitive: { a: number } | string;
+
+    var num: number;
+    var str: number;
+
+    var u: undefined;
+    var n: null;
+
+    var a: any;
+
+    var literal_string: "string";
+    var literal_number: 42;
+
+    var e: E;
+
+    var o1 = { ...p1 };   // Error, generic type paramterre
+    var o2 = { ...p2 };   // OK
+    var o3 = { ...t };   // Error, generic type paramter
+
+    var o4 = { ...i };   // Error, index access
+    var o5 = { ...k };   // Error, index
+
+    var o6 = { ...mapped_generic }; // Error, generic mapped object type
+    var o7 = { ...mapped };  // OK, non-generic mapped type
+
+    var o8 = { ...union_generic };  // Error, union with generic type parameter
+    var o9 = { ...union_primitive };  // Error, union with generic type parameter
+
+    var o10 = { ...intersection_generic };  // Error, intersection with generic type parameter
+    var o11 = { ...intersection_premitive };  // Error, intersection with generic type parameter
+
+    var o12 = { ...num };  // Error
+    var o13 = { ...str };  // Error
+
+    var o14 = { ...u };  // OK
+    var o15 = { ...n };  // OK
+
+    var o16 = { ...a };  // OK
+
+    var o17 = { ...literal_string };  // Error
+    var o18 = { ...literal_number };  // Error
+
+    var o19 = { ...e };  // Error, enum
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadUnion.ts b/tests/cases/compiler/spreadUnion.ts
new file mode 100644
index 00000000000..ef8440122ed
--- /dev/null
+++ b/tests/cases/compiler/spreadUnion.ts
@@ -0,0 +1,10 @@
+var union: { a: number } | { b: string };
+
+var o3: { a: number } | { b: string };
+var o3 =  { ...union };
+
+var o4: { a: boolean } | { b: string , a: boolean};
+var o4 =  { ...union, a: false };
+
+var o5: { a: number } | { b: string } | { a: number, b: string };
+var o5 =  { ...union, ...union };
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadUnion2.ts b/tests/cases/compiler/spreadUnion2.ts
new file mode 100644
index 00000000000..25dba81c0df
--- /dev/null
+++ b/tests/cases/compiler/spreadUnion2.ts
@@ -0,0 +1,25 @@
+// @strictNullChecks: true
+
+declare const undefinedUnion: { a: number } | undefined;
+declare const nullUnion: { b: number } | null;
+declare const nullAndUndefinedUnion: null | undefined;
+
+var o1: { a: number };
+var o1 = { ...undefinedUnion };
+
+var o2: { b: number };
+var o2 = { ...nullUnion };
+
+var o3: { a: number, b: number };
+var o3 = { ...undefinedUnion, ...nullUnion };
+var o3 = { ...nullUnion, ...undefinedUnion };
+
+var o4: { a: number };
+var o4 = { ...undefinedUnion, ...undefinedUnion };
+
+var o5: { b: number };
+var o5 = { ...nullUnion, ...nullUnion };
+
+var o6: { };
+var o6 = { ...nullAndUndefinedUnion, ...nullAndUndefinedUnion };
+var o6 = { ...nullAndUndefinedUnion };
\ No newline at end of file
diff --git a/tests/cases/compiler/subSubClassCanAccessProtectedConstructor.ts b/tests/cases/compiler/subSubClassCanAccessProtectedConstructor.ts
new file mode 100644
index 00000000000..fc5e9794500
--- /dev/null
+++ b/tests/cases/compiler/subSubClassCanAccessProtectedConstructor.ts
@@ -0,0 +1,15 @@
+class Base {
+    protected constructor() { }
+    public instance1 = new Base(); // allowed
+}
+
+class Subclass extends Base {
+    public instance1_1 = new Base(); // allowed
+    public instance1_2 = new Subclass(); // allowed
+}
+
+class SubclassOfSubclass extends Subclass {
+    public instance2_1 = new Base(); // allowed
+    public instance2_2 = new Subclass(); // allowed
+    public instance2_3 = new SubclassOfSubclass(); // allowed
+}
diff --git a/tests/cases/compiler/systemModuleTrailingComments.ts b/tests/cases/compiler/systemModuleTrailingComments.ts
new file mode 100644
index 00000000000..32c29617832
--- /dev/null
+++ b/tests/cases/compiler/systemModuleTrailingComments.ts
@@ -0,0 +1,4 @@
+// @module: system
+export const test = "TEST";
+
+//some comment
\ No newline at end of file
diff --git a/tests/cases/compiler/unionTypeWithLeadingOperator.ts b/tests/cases/compiler/unionTypeWithLeadingOperator.ts
new file mode 100644
index 00000000000..9f6d272ce7c
--- /dev/null
+++ b/tests/cases/compiler/unionTypeWithLeadingOperator.ts
@@ -0,0 +1,6 @@
+type A = | string;
+type B =
+  | { type: "INCREMENT" }
+  | { type: "DECREMENT" };
+
+type C = [| 0 | 1, | "foo" | "bar"];
diff --git a/tests/cases/compiler/untypedModuleImport_withAugmentation2.ts b/tests/cases/compiler/untypedModuleImport_withAugmentation2.ts
new file mode 100644
index 00000000000..8cbf75b662b
--- /dev/null
+++ b/tests/cases/compiler/untypedModuleImport_withAugmentation2.ts
@@ -0,0 +1,14 @@
+// @noImplicitReferences: true
+// This tests that augmenting an untyped module is forbidden even in an ambient context. Contrast with `moduleAugmentationInDependency.ts`.
+
+// @Filename: /node_modules/augmenter/index.d.ts
+declare module "js" {
+    export const j: number;
+}
+export {};
+
+// @Filename: /node_modules/js/index.js
+This file is not processed.
+
+// @Filename: /a.ts
+import { } from "augmenter";
diff --git a/tests/cases/compiler/unusedLocalsAndObjectSpread.ts b/tests/cases/compiler/unusedLocalsAndObjectSpread.ts
new file mode 100644
index 00000000000..b042b412c8e
--- /dev/null
+++ b/tests/cases/compiler/unusedLocalsAndObjectSpread.ts
@@ -0,0 +1,31 @@
+//@noUnusedLocals:true
+
+declare var console: { log(a: any): void };
+
+function one() {
+    const foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    const {a, ...bar} = foo;
+    console.log(bar);
+}
+
+function two() {
+    const foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    const {a: _, ...bar} = foo;
+    console.log(bar);
+}
+
+function three() {
+    const foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    const {a, ...bar} = foo; // bar should be unused
+    //console.log(bar);
+}
+
+function four() {
+    const foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    const {a: _, ...bar} = foo; // bar should be unused
+    //console.log(bar);
+}
diff --git a/tests/cases/conformance/async/es2017/awaitInheritedPromise_es2017.ts b/tests/cases/conformance/async/es2017/awaitInheritedPromise_es2017.ts
new file mode 100644
index 00000000000..c5cd486e0f0
--- /dev/null
+++ b/tests/cases/conformance/async/es2017/awaitInheritedPromise_es2017.ts
@@ -0,0 +1,7 @@
+// @target: es2017
+// @strictNullChecks: true
+interface A extends Promise<string> {}
+declare var a: A;
+async function f() {
+    await a;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
new file mode 100644
index 00000000000..2c59b6f93cc
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
@@ -0,0 +1,8 @@
+// @target: es5
+
+abstract class A {
+   abstract get a();
+   abstract get aa() { return 1; } // error
+   abstract set b(x: string);
+   abstract set bb(x: string) {} // error
+}
diff --git a/tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts b/tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts
new file mode 100644
index 00000000000..9d5d4c8c895
--- /dev/null
+++ b/tests/cases/conformance/classes/constructorDeclarations/superCalls/superPropertyInConstructorBeforeSuperCall.ts
@@ -0,0 +1,15 @@
+class B {
+    constructor(x?: string) {}
+    x(): string { return ""; }
+}
+class C1 extends B {
+    constructor() {
+        super.x();
+        super();
+    }
+}
+class C2 extends B {
+    constructor() {
+        super(super.x());
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts
new file mode 100644
index 00000000000..b20a5a85dfb
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts
@@ -0,0 +1,34 @@
+// @target:es5
+// @experimentaldecorators: true
+declare function dec1<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+declare function dec2<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class A {
+    @dec1 get x() { return 0; }
+    set x(value: number) { }
+}
+
+class B {
+    get x() { return 0; }
+    @dec2 set x(value: number) { }
+}
+
+class C {
+    @dec1 set x(value: number) { }
+    get x() { return 0; }
+}
+
+class D {
+    set x(value: number) { }
+    @dec2 get x() { return 0; }
+}
+
+class E {
+    @dec1 get x() { return 0; }
+    @dec2 set x(value: number) { }
+}
+
+class F {
+    @dec1 set x(value: number) { }
+    @dec2 get x() { return 0; }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor8.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor8.ts
new file mode 100644
index 00000000000..3caf4b406d2
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor8.ts
@@ -0,0 +1,32 @@
+// @target:es5
+// @experimentaldecorators: true
+// @emitdecoratormetadata: true
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class A {
+    @dec get x() { return 0; }
+    set x(value: number) { }
+}
+
+class B {
+    get x() { return 0; }
+    @dec set x(value: number) { }
+}
+
+class C {
+    @dec set x(value: number) { }
+    get x() { return 0; }
+}
+
+class D {
+    set x(value: number) { }
+    @dec get x() { return 0; }
+}
+
+class E {
+    @dec get x() { return 0; }
+}
+
+class F {
+    @dec set x(value: number) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor4.ts b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor4.ts
new file mode 100644
index 00000000000..55e3a1423fa
--- /dev/null
+++ b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor4.ts
@@ -0,0 +1,18 @@
+// @target: es5
+// @module: commonjs
+// @experimentaldecorators: true
+// @emitdecoratormetadata: true
+declare var dec: any;
+
+@dec
+class A {
+}
+
+@dec
+class B {
+    constructor(x: number) {}
+}
+
+@dec
+class C extends A {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/keyof/circularIndexedAccessErrors.ts b/tests/cases/conformance/types/keyof/circularIndexedAccessErrors.ts
new file mode 100644
index 00000000000..c01030c7fa9
--- /dev/null
+++ b/tests/cases/conformance/types/keyof/circularIndexedAccessErrors.ts
@@ -0,0 +1,31 @@
+// @declaration: true
+
+type T1 = {
+    x: T1["x"];  // Error
+};
+
+type T2<K extends "x" | "y"> = {
+    x: T2<K>[K];  // Error
+    y: number;
+}
+
+declare let x2: T2<"x">;
+let x2x = x2.x;
+
+interface T3<T extends T3<T>> {
+    x: T["x"];  // Error
+}
+
+interface T4<T extends T4<T>> {
+    x: T4<T>["x"];  // Error
+}
+
+class C1 {
+    x: C1["x"];  // Error
+}
+
+class C2 {
+    x: this["y"];  // Error
+    y: this["z"];  // Error
+    z: this["x"];  // Error
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/keyof/keyofAndForIn.ts b/tests/cases/conformance/types/keyof/keyofAndForIn.ts
new file mode 100644
index 00000000000..97b8587a243
--- /dev/null
+++ b/tests/cases/conformance/types/keyof/keyofAndForIn.ts
@@ -0,0 +1,36 @@
+// @declaration: true
+
+// Repro from #12513
+
+function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
+    const b = k in obj;
+    let k1: K;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
+    const b = k in obj;
+    let k1: keyof T;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
+    const b = k in obj;
+    let k1: K;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index b0451b8d55c..ea6a3c2358a 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -1,3 +1,4 @@
+// @strictNullChecks: true
 // @declaration: true
 
 class Shape {
@@ -21,11 +22,12 @@ class Options {
 }
 
 type Dictionary<T> = { [x: string]: T };
+type NumericallyIndexed<T> = { [x: number]: T };
 
 const enum E { A, B, C }
 
-type K00 = keyof any;  // string | number
-type K01 = keyof string;  // number | "toString" | "charAt" | ...
+type K00 = keyof any;  // string
+type K01 = keyof string;  // "toString" | "charAt" | ...
 type K02 = keyof number;  // "toString" | "toFixed" | "toExponential" | ...
 type K03 = keyof boolean;  // "valueOf"
 type K04 = keyof void;  // never
@@ -34,19 +36,20 @@ type K06 = keyof null;  // never
 type K07 = keyof never;  // never
 
 type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
-type K11 = keyof Shape[];  // number | "length" | "toString" | ...
-type K12 = keyof Dictionary<Shape>;  // string | number
+type K11 = keyof Shape[];  // "length" | "toString" | ...
+type K12 = keyof Dictionary<Shape>;  // string
 type K13 = keyof {};  // never
 type K14 = keyof Object;  // "constructor" | "toString" | ...
 type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
-type K16 = keyof [string, number];  // number | "0" | "1" | "length" | "toString" | ...
+type K16 = keyof [string, number];  // "0" | "1" | "length" | "toString" | ...
 type K17 = keyof (Shape | Item);  // "name"
 type K18 = keyof (Shape & Item);  // "name" | "width" | "height" | "visible" | "price"
+type K19 = keyof NumericallyIndexed<Shape> // never
 
 type KeyOf<T> = keyof T;
 
 type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
-type K21 = KeyOf<Dictionary<Shape>>;  // string | number
+type K21 = KeyOf<Dictionary<Shape>>;  // string
 
 type NAME = "name";
 type WIDTH_OR_HEIGHT = "width" | "height";
@@ -217,6 +220,83 @@ function f60<T>(source: T, target: T) {
     }
 }
 
+function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'a');
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'b');
+    func<{ a: any, b: any }, { a: any, c: any }>('a', 'c');
+}
+
+function f71(func: <T, U>(x: T, y: U) => Partial<T & U>) {
+    let x = func({ a: 1, b: "hello" }, { c: true });
+    x.a;  // number | undefined
+    x.b;  // string | undefined
+    x.c;  // boolean | undefined
+}
+
+function f72(func: <T, U, K extends keyof T | keyof U>(x: T, y: U, k: K) => (T & U)[K]) {
+    let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
+    let b = func({ a: 1, b: "hello" }, { c: true }, 'b');  // string
+    let c = func({ a: 1, b: "hello" }, { c: true }, 'c');  // boolean
+}
+
+function f73(func: <T, U, K extends keyof (T & U)>(x: T, y: U, k: K) => (T & U)[K]) {
+    let a = func({ a: 1, b: "hello" }, { c: true }, 'a');  // number
+    let b = func({ a: 1, b: "hello" }, { c: true }, 'b');  // string
+    let c = func({ a: 1, b: "hello" }, { c: true }, 'c');  // boolean
+}
+
+function f74(func: <T, U, K extends keyof (T | U)>(x: T, y: U, k: K) => (T | U)[K]) {
+    let a = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'a');  // number
+    let b = func({ a: 1, b: "hello" }, { a: 2, b: true }, 'b');  // string | boolean
+}
+
+function f80<T extends { a: { x: any } }>(obj: T) {
+    let a1 = obj.a;  // { x: any }
+    let a2 = obj['a'];  // { x: any }
+    let a3 = obj['a'] as T['a'];  // T["a"]
+    let x1 = obj.a.x;  // any
+    let x2 = obj['a']['x'];  // any
+    let x3 = obj['a']['x'] as T['a']['x'];  // T["a"]["x"]
+}
+
+function f81<T extends { a: { x: any } }>(obj: T) {
+    return obj['a']['x'] as T['a']['x'];
+}
+
+function f82() {
+    let x1 = f81({ a: { x: "hello" } });  // string
+    let x2 = f81({ a: { x: 42 } });  // number
+}
+
+function f83<T extends { [x: string]: { x: any } }, K extends keyof T>(obj: T, key: K) {
+    return obj[key]['x'] as T[K]['x'];
+}
+
+function f84() {
+    let x1 = f83({ foo: { x: "hello" } }, "foo");  // string
+    let x2 = f83({ bar: { x: 42 } }, "bar");  // number
+}
+
+class C1 {
+    x: number;
+    get<K extends keyof this>(key: K) {
+        return this[key];
+    }
+    set<K extends keyof this>(key: K, value: this[K]) {
+        this[key] = value;
+    }
+    foo() {
+        let x1 = this.x;  // number
+        let x2 = this["x"];  // number
+        let x3 = this.get("x");  // this["x"]
+        let x4 = getProperty(this, "x"); // this["x"]
+        this.x = 42;
+        this["x"] = 42;
+        this.set("x", 42);
+        setProperty(this, "x", 42);
+    }
+}
+
 // Repros from #12011
 
 class Base {
@@ -247,4 +327,107 @@ class OtherPerson {
     getParts() {
         return getProperty(this, "parts")
     }
-}
\ No newline at end of file
+}
+
+// Modified repro from #12544
+
+function path<T, K1 extends keyof T>(obj: T, key1: K1): T[K1];
+function path<T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2];
+function path<T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3];
+function path(obj: any, ...keys: (string | number)[]): any;
+function path(obj: any, ...keys: (string | number)[]): any {
+    let result = obj;
+    for (let k of keys) {
+        result = result[k];
+    }
+    return result;
+}
+
+type Thing = {
+    a: { x: number, y: string },
+    b: boolean
+};
+
+
+function f1(thing: Thing) {
+    let x1 = path(thing, 'a');  // { x: number, y: string }
+    let x2 = path(thing, 'a', 'y');  // string
+    let x3 = path(thing, 'b');  // boolean
+    let x4 = path(thing, ...['a', 'x']);  // any
+}
+
+// Repro from comment in #12114
+
+const assignTo2 = <T, K1 extends keyof T, K2 extends keyof T[K1]>(object: T, key1: K1, key2: K2) =>
+    (value: T[K1][K2]) => object[key1][key2] = value;
+
+// Modified repro from #12573
+
+declare function one<T>(handler: (t: T) => void): T
+var empty = one(() => {}) // inferred as {}, expected
+
+type Handlers<T> = { [K in keyof T]: (t: T[K]) => void }
+declare function on<T>(handlerHash: Handlers<T>): T
+var hashOfEmpty1 = on({ test: () => {} });  // {}
+var hashOfEmpty2 = on({ test: (x: boolean) => {} });  // { test: boolean }
+
+// Repro from #12624
+
+interface Options1<Data, Computed> {
+    data?: Data
+    computed?: Computed;
+}
+
+declare class Component1<Data, Computed> {
+    constructor(options: Options1<Data, Computed>);
+    get<K extends keyof (Data & Computed)>(key: K): (Data & Computed)[K];
+}
+
+let c1 = new Component1({
+    data: {
+        hello: ""
+    }
+});
+
+c1.get("hello");
+
+// Repro from #12625
+
+interface Options2<Data, Computed> {
+    data?: Data
+    computed?: Computed;
+}
+
+declare class Component2<Data, Computed> {
+    constructor(options: Options2<Data, Computed>);
+    get<K extends keyof Data | keyof Computed>(key: K): (Data & Computed)[K];
+}
+
+// Repro from #12641
+
+interface R {
+    p: number;
+}
+
+function f<K extends keyof R>(p: K) {
+    let a: any;
+    a[p].add;  // any
+}
+
+// Repro from #12651
+
+type MethodDescriptor = {
+	name: string;
+	args: any[];
+	returnValue: any;
+}
+
+declare function dispatchMethod<M extends MethodDescriptor>(name: M['name'], args: M['args']): M['returnValue'];
+
+type SomeMethodDescriptor = {
+	name: "someMethod";
+	args: [string, number];
+	returnValue: string[];
+}
+
+let result = dispatchMethod<SomeMethodDescriptor>("someMethod", ["hello", 35]);
\ No newline at end of file
diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts
index bc2ddc31a19..cbbc9a52200 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts
@@ -65,4 +65,15 @@ function f10(shape: Shape) {
     setProperty(shape, "name", "rectangle");
     setProperty(shape, "size", 10);  // Error
     setProperty(shape, cond ? "name" : "size", 10);  // Error
+}
+
+function f20<T, U>(k1: keyof (T | U), k2: keyof (T & U), o1: T | U, o2: T & U) {
+    o1[k1];
+    o1[k2];   // Error
+    o2[k1];
+    o2[k2];
+    o1 = o2;
+    o2 = o1;  // Error
+    k1 = k2;  // Error
+    k2 = k1;
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
new file mode 100644
index 00000000000..14bb765a840
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
@@ -0,0 +1,155 @@
+// @strictNullChecks: true
+// @noimplicitany: true
+// @declaration: true
+
+type Box<T> = {
+    value: T;
+}
+
+type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+}
+
+function box<T>(x: T): Box<T> {
+    return { value: x };
+}
+
+function unbox<T>(x: Box<T>): T {
+    return x.value;
+}
+
+function boxify<T>(obj: T): Boxified<T> {
+    let result = {} as Boxified<T>;
+    for (let k in obj) {
+        result[k] = box(obj[k]);
+    }
+    return result;
+}
+
+function unboxify<T>(obj: Boxified<T>): T {
+    let result = {} as T;
+    for (let k in obj) {
+        result[k] = unbox(obj[k]);
+    }
+    return result;
+}
+
+function assignBoxified<T>(obj: Boxified<T>, values: T) {
+    for (let k in values) {
+        obj[k].value = values[k];
+    }
+}
+
+function f1() {
+    let v = {
+        a: 42,
+        b: "hello",
+        c: true
+    };
+    let b = boxify(v);
+    let x: number = b.a.value;
+}
+
+function f2() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    let v = unboxify(b);
+    let x: number = v.a;
+}
+
+function f3() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    assignBoxified(b, { c: false });
+}
+
+function f4() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    b = boxify(unboxify(b));
+    b = unboxify(boxify(b));
+}
+
+function makeRecord<T, K extends string>(obj: { [P in K]: T }) {
+    return obj;
+}
+
+function f5(s: string) {
+    let b = makeRecord({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    let v = unboxify(b);
+    let x: string | number | boolean = v.a;
+}
+
+function makeDictionary<T>(obj: { [x: string]: T }) {
+    return obj;
+}
+
+function f6(s: string) {
+    let b = makeDictionary({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    let v = unboxify(b);
+    let x: string | number | boolean = v[s];
+}
+
+declare function validate<T>(obj: { [P in keyof T]?: T[P] }): T;
+declare function clone<T>(obj: { readonly [P in keyof T]: T[P] }): T;
+declare function validateAndClone<T>(obj: { readonly [P in keyof T]?: T[P] }): T;
+
+type Foo = {
+    a?: number;
+    readonly b: string;
+}
+
+function f10(foo: Foo) {
+    let x = validate(foo);  // { a: number, readonly b: string }
+    let y = clone(foo);  // { a?: number, b: string }
+    let z = validateAndClone(foo);  // { a: number, b: string }
+}
+
+// Repro from #12606
+
+type Func<T> = (...args: any[]) => T;
+type Spec<T> = {
+    [P in keyof T]: Func<T[P]> | Spec<T[P]> ;
+};
+
+/**
+ * Given a spec object recursively mapping properties to functions, creates a function
+ * producing an object of the same structure, by mapping each property to the result
+ * of calling its associated function with the supplied arguments.
+ */
+declare function applySpec<T>(obj: Spec<T>): (...args: any[]) => T;
+
+// Infers g1: (...args: any[]) => { sum: number, nested: { mul: string } }
+var g1 = applySpec({
+    sum: (a: any) => 3,
+    nested: {
+        mul: (b: any) => "n"
+    }
+});
+
+// Infers g2: (...args: any[]) => { foo: { bar: { baz: boolean } } }
+var g2 = applySpec({ foo: { bar: { baz: (x: any) => true } } });
+
+// Repro from #12633
+
+const foo = <T>(object: T, partial: Partial<T>) => object;
+let o = {a: 5, b: 7};
+foo(o, {b: 9});
+o = foo(o, {b: 9});
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
index b318cde3aab..4be6b6b098d 100644
--- a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
@@ -67,4 +67,61 @@ function f11<T>() {
 function f12<T>() {
     var x: { [P in keyof T]: T[P] };
     var x: { [P in keyof T]: T[P][] };  // Error
-}
\ No newline at end of file
+}
+
+// Check that inferences to mapped types are secondary
+
+declare function objAndReadonly<T>(primary: T, secondary: Readonly<T>): T;
+declare function objAndPartial<T>(primary: T, secondary: Partial<T>): T;
+
+function f20() {
+    let x1 = objAndReadonly({ x: 0, y: 0 }, { x: 1 });  // Error
+    let x2 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1 });
+    let x3 = objAndReadonly({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
+}
+
+function f21() {
+    let x1 = objAndPartial({ x: 0, y: 0 }, { x: 1 });
+    let x2 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1 });
+    let x3 = objAndPartial({ x: 0, y: 0 }, { x: 1, y: 1, z: 1 });  // Error
+}
+
+// Verify use of Pick<T, K> for setState functions (#12793)
+
+interface Foo {
+    a: string;
+    b?: number;
+}
+
+function setState<T, K extends keyof T>(obj: T, props: Pick<T, K>) {
+    for (let k in props) {
+        obj[k] = props[k];
+    }
+}
+
+let foo: Foo = { a: "hello", b: 42 };
+setState(foo, { a: "test", b: 43 })
+setState(foo, { a: "hi" });
+setState(foo, { b: undefined });
+setState(foo, { });
+setState(foo, foo);
+setState(foo, { a: undefined });  // Error
+setState(foo, { c: true });  // Error
+
+class C<T> {
+    state: T;
+    setState<K extends keyof T>(props: Pick<T, K>) {
+        for (let k in props) {
+            this.state[k] = props[k];
+        }
+    }
+}
+
+let c = new C<Foo>();
+c.setState({ a: "test", b: 43 });
+c.setState({ a: "hi" });
+c.setState({ b: undefined });
+c.setState({ });
+c.setState(foo);
+c.setState({ a: undefined });  // Error
+c.setState({ c: true });  // Error
diff --git a/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts b/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts
new file mode 100644
index 00000000000..1fe6872965c
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts
@@ -0,0 +1,77 @@
+// @strictNullChecks: true
+
+type T = { a: number, b: string };
+type TP = { a?: number, b?: string };
+type TR = { readonly a: number, readonly b: string };
+type TPR = { readonly a?: number, readonly b?: string };
+
+var v00: "a" | "b";
+var v00: keyof T;
+var v00: keyof TP;
+var v00: keyof TR;
+var v00: keyof TPR;
+
+var v01: T;
+var v01: { [P in keyof T]: T[P] };
+var v01: Pick<T, keyof T>;
+var v01: Pick<Pick<T, keyof T>, keyof T>;
+
+var v02: TP;
+var v02: { [P in keyof T]?: T[P] };
+var v02: Partial<T>;
+var v02: { [P in keyof TP]: TP[P] }
+var v02: Pick<TP, keyof TP>;
+
+var v03: TR;
+var v03: { readonly [P in keyof T]: T[P] };
+var v03: Readonly<T>;
+var v03: { [P in keyof TR]: TR[P] }
+var v03: Pick<TR, keyof TR>;
+
+var v04: TPR;
+var v04: { readonly [P in keyof T]?: T[P] };
+var v04: Partial<TR>;
+var v04: Readonly<TP>;
+var v04: Partial<Readonly<T>>;
+var v04: Readonly<Partial<T>>;
+var v04: { [P in keyof TPR]: TPR[P] }
+var v04: Pick<TPR, keyof T>;
+
+type Boxified<T> = { [P in keyof T]: { x: T[P] } };
+
+type B = { a: { x: number }, b: { x: string } };
+type BP = { a?: { x: number }, b?: { x: string } };
+type BR = { readonly a: { x: number }, readonly b: { x: string } };
+type BPR = { readonly a?: { x: number }, readonly b?: { x: string } };
+
+var b00: "a" | "b";
+var b00: keyof B;
+var b00: keyof BP;
+var b00: keyof BR;
+var b00: keyof BPR;
+
+var b01: B;
+var b01: { [P in keyof B]: B[P] };
+var b01: Pick<B, keyof B>;
+var b01: Pick<Pick<B, keyof B>, keyof B>;
+
+var b02: BP;
+var b02: { [P in keyof B]?: B[P] };
+var b02: Partial<B>;
+var b02: { [P in keyof BP]: BP[P] }
+var b02: Pick<BP, keyof BP>;
+
+var b03: BR;
+var b03: { readonly [P in keyof B]: B[P] };
+var b03: Readonly<B>;
+var b03: { [P in keyof BR]: BR[P] }
+var b03: Pick<BR, keyof BR>;
+
+var b04: BPR;
+var b04: { readonly [P in keyof B]?: B[P] };
+var b04: Partial<BR>;
+var b04: Readonly<BP>;
+var b04: Partial<Readonly<B>>;
+var b04: Readonly<Partial<B>>;
+var b04: { [P in keyof BPR]: BPR[P] }
+var b04: Pick<BPR, keyof BPR>;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypes1.ts b/tests/cases/conformance/types/mapped/mappedTypes1.ts
index d090b731518..b74872c2bfd 100644
--- a/tests/cases/conformance/types/mapped/mappedTypes1.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypes1.ts
@@ -34,7 +34,9 @@ type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
 declare function f1<T1>(): { [P in keyof T1]: void };
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
 declare function f3<T1 extends number>(): { [P in keyof T1]: void };
+declare function f4<T1 extends Number>(): { [P in keyof T1]: void };
 
 let x1 = f1();
 let x2 = f2();
-let x3 = f3();
\ No newline at end of file
+let x3 = f3();
+let x4 = f4();
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypes2.ts b/tests/cases/conformance/types/mapped/mappedTypes2.ts
index e72a0c0a892..60db4c1383b 100644
--- a/tests/cases/conformance/types/mapped/mappedTypes2.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypes2.ts
@@ -31,25 +31,30 @@ declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
 declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 declare function proxify<T>(obj: T): Proxify<T>;
 
+interface Point {
+    x: number;
+    y: number;
+}
+
 interface Shape {
     name: string;
     width: number;
     height: number;
-    visible: boolean;
+    location: Point;
 }
 
 interface PartialShape {
     name?: string;
     width?: number;
     height?: number;
-    visible?: boolean;
+    location?: Point;
 }
 
 interface ReadonlyShape {
     readonly name: string;
     readonly width: number;
     readonly height: number;
-    readonly visible: boolean;
+    readonly location: Point;
 }
 
 function f0(s1: Shape, s2: Shape) {
@@ -70,7 +75,7 @@ function f2(shape: Shape) {
 }
 
 function f3(shape: Shape) {
-    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
+    const x = pick(shape, "name", "location");  // { name: string, location: Point }
 }
 
 function f4() {
@@ -81,11 +86,11 @@ function f4() {
 function f5(shape: Shape) {
     const p = proxify(shape);
     let name = p.name.get();
-    p.visible.set(false);
+    p.width.set(42);
 }
 
 function f6(shape: DeepReadonly<Shape>) {
-    let name = shape.name;  // DeepReadonly<string>
-    let length = name.length;  // DeepReadonly<number>
-    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
+    let name = shape.name;  // string
+    let location = shape.location;  // DeepReadonly<Point>
+    let x = location.x;  // number
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypes4.ts b/tests/cases/conformance/types/mapped/mappedTypes4.ts
new file mode 100644
index 00000000000..74b3e395f32
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypes4.ts
@@ -0,0 +1,62 @@
+// @strictNullChecks: true
+// @declaration: true
+
+type Box<T> = {
+};
+
+type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+};
+
+function boxify<T>(obj: T): Boxified<T> {
+    if (typeof obj === "object") {
+        let result = {} as Boxified<T>;
+        for (let k in obj) {
+            result[k] = { value: obj[k] };
+        }
+        return result;
+    }
+    return <any>obj;
+}
+
+type A = { a: string };
+type B = { b: string };
+type C = { c: string };
+
+function f1(x: A | B | C | undefined) {
+    return boxify(x);
+}
+
+type T00 = Partial<A | B | C>;
+type T01 = Readonly<A | B | C | null | undefined>;
+type T02 = Boxified<A | B[] | C | string>
+type T03 = Readonly<string | number | boolean | null | undefined | void>;
+type T04 = Boxified<string | number | boolean | null | undefined | void>;
+type T05 = Partial<"hello" | "world" | 42>;
+
+type BoxifiedWithSentinel<T, U> = {
+    [P in keyof T]: Box<T[P]> | U;
+}
+
+type T10 = BoxifiedWithSentinel<A | B | C, null>;
+type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+type T12 = BoxifiedWithSentinel<string, undefined>;
+
+type DeepReadonly<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+
+type Foo = {
+    x: number;
+    y: { a: string, b: number };
+    z: boolean;
+};
+
+type DeepReadonlyFoo = {
+    readonly x: number;
+    readonly y: { readonly a: string, readonly b: number };
+    readonly z: boolean;
+};
+
+var x1: DeepReadonly<Foo>;
+var x1: DeepReadonlyFoo;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/rest/objectRest.ts b/tests/cases/conformance/types/rest/objectRest.ts
index 3f7be177c7b..2fba5d0b6dc 100644
--- a/tests/cases/conformance/types/rest/objectRest.ts
+++ b/tests/cases/conformance/types/rest/objectRest.ts
@@ -36,3 +36,5 @@ let computed = 'b';
 let computed2 = 'a';
 var { [computed]: stillNotGreat, [computed2]: soSo,  ...o } = o;
 ({ [computed]: stillNotGreat, [computed2]: soSo, ...o } = o);
+
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject['anythingGoes'];
diff --git a/tests/cases/conformance/types/rest/objectRestNegative.ts b/tests/cases/conformance/types/rest/objectRestNegative.ts
index c224c8cd30e..4f4667fe65a 100644
--- a/tests/cases/conformance/types/rest/objectRestNegative.ts
+++ b/tests/cases/conformance/types/rest/objectRestNegative.ts
@@ -1,3 +1,4 @@
+// @noImplicitAny: true
 let o = { a: 1, b: 'no' };
 var { ...mustBeLast, a } = o;
 
@@ -15,3 +16,5 @@ function generic<T extends { x, y }>(t: T) {
 
 let rest: { b: string }
 ({a, ...rest.b + rest.b} = o);
+
+var noContextualType = ({ aNumber = 12, ...notEmptyObject }) => aNumber + notEmptyObject.anythingGoes;
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegative.ts b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
index 3cd819d0613..6d1e0dde429 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNegative.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
@@ -29,9 +29,7 @@ spread = b; // error, missing 's'
 let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
 let duplicatedSpread = { ...o, ...o }
 
-// null, undefined and primitives are not allowed
-let spreadNull = { ...null };
-let spreadUndefind = { ...undefined };
+// primitives are not allowed
 let spreadNum = { ...12 };
 let spreadSum = { ...1 + 1 };
 spreadSum.toFixed(); // error, no methods from number
diff --git a/tests/cases/fourslash/basicClassMembers.ts b/tests/cases/fourslash/basicClassMembers.ts
index 1407bf89be3..9fad6731973 100644
--- a/tests/cases/fourslash/basicClassMembers.ts
+++ b/tests/cases/fourslash/basicClassMembers.ts
@@ -7,6 +7,6 @@
 
 goTo.eof();
 edit.insert('t.');
-verify.memberListContains('x');
-verify.memberListContains('y');
-verify.not.memberListContains('z');
+verify.completionListContains('x');
+verify.completionListContains('y');
+verify.not.completionListContains('z');
diff --git a/tests/cases/fourslash/commentBraceCompletionPosition.ts b/tests/cases/fourslash/commentBraceCompletionPosition.ts
index b92c49d3a14..3730a3466c9 100644
--- a/tests/cases/fourslash/commentBraceCompletionPosition.ts
+++ b/tests/cases/fourslash/commentBraceCompletionPosition.ts
@@ -14,10 +14,10 @@
 //// }
 
 goTo.marker('1');
-verify.not.isValidBraceCompletionAtPosition('(');
+verify.isValidBraceCompletionAtPosition('(');
 
 goTo.marker('2');
-verify.not.isValidBraceCompletionAtPosition('(');
+verify.isValidBraceCompletionAtPosition('(');
 
 goTo.marker('3');
-verify.not.isValidBraceCompletionAtPosition('(');
\ No newline at end of file
+verify.isValidBraceCompletionAtPosition('(');
\ No newline at end of file
diff --git a/tests/cases/fourslash/commentsClassMembers.ts b/tests/cases/fourslash/commentsClassMembers.ts
index 6edb684caa6..1c34584a262 100644
--- a/tests/cases/fourslash/commentsClassMembers.ts
+++ b/tests/cases/fourslash/commentsClassMembers.ts
@@ -139,18 +139,18 @@ verify.quickInfos({
 });
 
 goTo.marker('4');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 goTo.marker('5');
 verify.completionListContains("b", "(parameter) b: number", "number to add");
@@ -158,18 +158,18 @@ verify.completionListContains("b", "(parameter) b: number", "number to add");
 verify.quickInfoAt("6", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 
 goTo.marker('7');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 goTo.marker('8');
 verify.currentSignatureHelpDocCommentIs("sum with property");
@@ -177,48 +177,48 @@ verify.currentParameterHelpArgumentDocCommentIs("number to add");
 verify.quickInfoAt("8q", "(method) c1.p2(b: number): number", "sum with property");
 
 goTo.marker('9');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 verify.quickInfoAt("10", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 
 goTo.marker('11');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 goTo.marker('12');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 goTo.marker('13');
 verify.currentSignatureHelpDocCommentIs("sum with property");
@@ -232,18 +232,18 @@ verify.quickInfos({
 });
 
 goTo.marker('16');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 goTo.marker('17');
 verify.completionListContains("b", "(parameter) b: number", "number to add");
@@ -251,18 +251,18 @@ verify.completionListContains("b", "(parameter) b: number", "number to add");
 verify.quickInfoAt("18", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 
 goTo.marker('19');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 goTo.marker('20');
 verify.currentSignatureHelpDocCommentIs("sum with property");
@@ -270,48 +270,48 @@ verify.currentParameterHelpArgumentDocCommentIs("number to add");
 verify.quickInfoAt("20q", "(method) c1.pp2(b: number): number", "sum with property");
 
 goTo.marker('21');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 verify.quickInfoAt("22", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 
 goTo.marker('23');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 goTo.marker('24');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 goTo.marker('25');
 verify.currentSignatureHelpDocCommentIs("sum with property");
@@ -329,12 +329,12 @@ goTo.marker('29');
 verify.completionListContains("c1", "class c1", "This is comment for c1");
 
 goTo.marker('30');
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");
 
 goTo.marker('31');
 verify.completionListContains("b", "(parameter) b: number", "number to add");
@@ -345,12 +345,12 @@ goTo.marker('33');
 verify.completionListContains("c1", "class c1", "This is comment for c1");
 
 goTo.marker('34');
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");
 
 goTo.marker('35');
 verify.currentSignatureHelpDocCommentIs("static sum with property");
@@ -359,12 +359,12 @@ verify.completionListContains("c1", "class c1", "This is comment for c1");
 verify.quickInfoAt("35q", "(method) c1.s2(b: number): number", "static sum with property");
 
 goTo.marker('36');
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");
 
 verify.quickInfoAt("37", "(property) c1.s3: number", "static getter property\nsetter property 3");
 
@@ -372,23 +372,23 @@ goTo.marker('38');
 verify.completionListContains("c1", "class c1", "This is comment for c1");
 
 goTo.marker('39');
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");
 
 goTo.marker('40');
 verify.completionListContains("c1", "class c1", "This is comment for c1");
 
 goTo.marker('41');
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");
 
 goTo.marker('42');
 verify.currentSignatureHelpDocCommentIs("static sum with property");
@@ -477,12 +477,12 @@ verify.quickInfos({
 
 goTo.marker("67");
 verify.quickInfoIs("(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
 
 verify.quickInfos({
     68: "var i1_f: (b: number) => number",
@@ -526,12 +526,12 @@ verify.completionListContains("c1", "class c1", "This is comment for c1");
 
 goTo.marker('88');
 verify.quickInfoIs("(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");
 
 verify.quickInfos({
     89: "var i1_s_f: (b: number) => number",
@@ -593,10 +593,10 @@ verify.completionListContains("i1_c", "var i1_c: typeof c1", "");
 
 goTo.marker('110');
 verify.quickInfoIs("(property) cProperties.p2: number", "setter only property");
-verify.memberListContains("p1", "(property) cProperties.p1: number", "getter only property");
-verify.memberListContains("p2", "(property) cProperties.p2: number", "setter only property");
-verify.memberListContains("nc_p1", "(property) cProperties.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(property) cProperties.nc_p2: number", "");
+verify.completionListContains("p1", "(property) cProperties.p1: number", "getter only property");
+verify.completionListContains("p2", "(property) cProperties.p2: number", "setter only property");
+verify.completionListContains("nc_p1", "(property) cProperties.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(property) cProperties.nc_p2: number", "");
 
 verify.quickInfos({
     111: ["(property) cProperties.p1: number", "getter only property"],
@@ -605,7 +605,7 @@ verify.quickInfos({
 });
 
 goTo.marker('114');
-verify.memberListContains("a", "(property) cWithConstructorProperty.a: number", "this is first parameter a\nmore info about a");
+verify.completionListContains("a", "(property) cWithConstructorProperty.a: number", "this is first parameter a\nmore info about a");
 verify.quickInfoIs("(property) cWithConstructorProperty.a: number", "this is first parameter a\nmore info about a");
 
 goTo.marker('115');
diff --git a/tests/cases/fourslash/commentsEnums.ts b/tests/cases/fourslash/commentsEnums.ts
index 048c99c6e0c..bf0bc087372 100644
--- a/tests/cases/fourslash/commentsEnums.ts
+++ b/tests/cases/fourslash/commentsEnums.ts
@@ -22,11 +22,11 @@ verify.completionListContains("Colors", "enum Colors", "Enum of colors");
 verify.quickInfoIs("enum Colors", "Enum of colors");
 
 goTo.marker('6');
-verify.memberListContains("Cornflower", "(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
-verify.memberListContains("FancyPink", "(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
+verify.completionListContains("Cornflower", "(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
+verify.completionListContains("FancyPink", "(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
 verify.quickInfoIs("(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
 
 goTo.marker('7');
-verify.memberListContains("Cornflower", "(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
-verify.memberListContains("FancyPink", "(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
+verify.completionListContains("Cornflower", "(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
+verify.completionListContains("FancyPink", "(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
 verify.quickInfoIs("(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
\ No newline at end of file
diff --git a/tests/cases/fourslash/commentsExternalModules.ts b/tests/cases/fourslash/commentsExternalModules.ts
index d9773716369..4f1a82bc0ce 100644
--- a/tests/cases/fourslash/commentsExternalModules.ts
+++ b/tests/cases/fourslash/commentsExternalModules.ts
@@ -46,9 +46,9 @@ goTo.marker('4');
 verify.completionListContains("m1", "namespace m1", "Namespace comment");
 
 goTo.marker('5');
-verify.memberListContains("b", "var m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "function m1.fooExport(): number", "exported function");
-verify.memberListContains("m2", "namespace m1.m2");
+verify.completionListContains("b", "var m1.b: number", "b's comment");
+verify.completionListContains("fooExport", "function m1.fooExport(): number", "exported function");
+verify.completionListContains("m2", "namespace m1.m2");
 
 goTo.marker('6');
 verify.currentSignatureHelpDocCommentIs("exported function");
@@ -57,8 +57,8 @@ verify.quickInfoAt("6q", "function m1.fooExport(): number", "exported function")
 verify.quickInfoAt("7", "var myvar: m1.m2.c");
 
 goTo.marker('8');
-verify.memberListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
-verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
+verify.completionListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
+verify.completionListContains("i", "var m1.m2.i: m1.m2.c", "i");
 
 goTo.file("commentsExternalModules_file1.ts");
 verify.quickInfoAt("9", 'import extMod = require("./commentsExternalModules_file0")', "This is on import declaration");
@@ -67,12 +67,12 @@ goTo.marker('10');
 verify.completionListContains("extMod", 'import extMod = require("./commentsExternalModules_file0")', "This is on import declaration");
 
 goTo.marker('11');
-verify.memberListContains("m1", "namespace extMod.m1");
+verify.completionListContains("m1", "namespace extMod.m1");
 
 goTo.marker('12');
-verify.memberListContains("b", "var extMod.m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
-verify.memberListContains("m2", "namespace extMod.m1.m2");
+verify.completionListContains("b", "var extMod.m1.b: number", "b's comment");
+verify.completionListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
+verify.completionListContains("m2", "namespace extMod.m1.m2");
 
 goTo.marker('13');
 verify.currentSignatureHelpDocCommentIs("exported function");
@@ -81,5 +81,5 @@ verify.quickInfoAt("13q", "function extMod.m1.fooExport(): number", "exported fu
 verify.quickInfoAt("14", "var newVar: extMod.m1.m2.c");
 
 goTo.marker('15');
-verify.memberListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
-verify.memberListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");
+verify.completionListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
+verify.completionListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");
diff --git a/tests/cases/fourslash/commentsImportDeclaration.ts b/tests/cases/fourslash/commentsImportDeclaration.ts
index 76f2c64a51d..cda983a9e5a 100644
--- a/tests/cases/fourslash/commentsImportDeclaration.ts
+++ b/tests/cases/fourslash/commentsImportDeclaration.ts
@@ -30,12 +30,12 @@ verify.quickInfos({
 });
 
 goTo.marker('6');
-verify.memberListContains("m1", "namespace extMod.m1");
+verify.completionListContains("m1", "namespace extMod.m1");
 
 goTo.marker('7');
-verify.memberListContains("b", "var extMod.m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
-verify.memberListContains("m2", "namespace extMod.m1.m2");
+verify.completionListContains("b", "var extMod.m1.b: number", "b's comment");
+verify.completionListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
+verify.completionListContains("m2", "namespace extMod.m1.m2");
 
 goTo.marker('8');
 verify.currentSignatureHelpDocCommentIs("exported function");
@@ -45,5 +45,5 @@ verify.quickInfos({
 });
 
 goTo.marker('10');
-verify.memberListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
-verify.memberListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");
+verify.completionListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
+verify.completionListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");
diff --git a/tests/cases/fourslash/commentsInheritance.ts b/tests/cases/fourslash/commentsInheritance.ts
index fd7aa12e805..6e3e92cfcff 100644
--- a/tests/cases/fourslash/commentsInheritance.ts
+++ b/tests/cases/fourslash/commentsInheritance.ts
@@ -221,18 +221,18 @@
 ////}
 
 goTo.marker('1');
-verify.memberListContains("i1_p1", "(property) i1.i1_p1: number", "i1_p1");
-verify.memberListContains("i1_f1", "(method) i1.i1_f1(): void", "i1_f1");
-verify.memberListContains("i1_l1", "(property) i1.i1_l1: () => void", "");
-verify.memberListContains("i1_nc_p1", "(property) i1.i1_nc_p1: number", "");
-verify.memberListContains("i1_nc_f1", "(method) i1.i1_nc_f1(): void", "");
-verify.memberListContains("i1_nc_l1", "(property) i1.i1_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) i1.p1: number", "");
-verify.memberListContains("f1", "(method) i1.f1(): void", "");
-verify.memberListContains("l1", "(property) i1.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) i1.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) i1.nc_f1(): void", "");
-verify.memberListContains("nc_l1", "(property) i1.nc_l1: () => void", "");
+verify.completionListContains("i1_p1", "(property) i1.i1_p1: number", "i1_p1");
+verify.completionListContains("i1_f1", "(method) i1.i1_f1(): void", "i1_f1");
+verify.completionListContains("i1_l1", "(property) i1.i1_l1: () => void", "");
+verify.completionListContains("i1_nc_p1", "(property) i1.i1_nc_p1: number", "");
+verify.completionListContains("i1_nc_f1", "(method) i1.i1_nc_f1(): void", "");
+verify.completionListContains("i1_nc_l1", "(property) i1.i1_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) i1.p1: number", "");
+verify.completionListContains("f1", "(method) i1.f1(): void", "");
+verify.completionListContains("l1", "(property) i1.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) i1.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) i1.nc_f1(): void", "");
+verify.completionListContains("nc_l1", "(property) i1.nc_l1: () => void", "");
 goTo.marker('2');
 verify.currentSignatureHelpDocCommentIs("i1_f1");
 goTo.marker('3');
@@ -263,18 +263,18 @@ verify.quickInfos({
 });
 
 goTo.marker('6');
-verify.memberListContains("i1_p1", "(property) c1.i1_p1: number", "");
-verify.memberListContains("i1_f1", "(method) c1.i1_f1(): void", "");
-verify.memberListContains("i1_l1", "(property) c1.i1_l1: () => void", "");
-verify.memberListContains("i1_nc_p1", "(property) c1.i1_nc_p1: number", "");
-verify.memberListContains("i1_nc_f1", "(method) c1.i1_nc_f1(): void", "");
-verify.memberListContains("i1_nc_l1", "(property) c1.i1_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) c1.p1: number", "c1_p1");
-verify.memberListContains("f1", "(method) c1.f1(): void", "c1_f1");
-verify.memberListContains("l1", "(property) c1.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "c1_nc_p1");
-verify.memberListContains("nc_f1", "(method) c1.nc_f1(): void", "c1_nc_f1");
-verify.memberListContains("nc_l1", "(property) c1.nc_l1: () => void", "");
+verify.completionListContains("i1_p1", "(property) c1.i1_p1: number", "");
+verify.completionListContains("i1_f1", "(method) c1.i1_f1(): void", "");
+verify.completionListContains("i1_l1", "(property) c1.i1_l1: () => void", "");
+verify.completionListContains("i1_nc_p1", "(property) c1.i1_nc_p1: number", "");
+verify.completionListContains("i1_nc_f1", "(method) c1.i1_nc_f1(): void", "");
+verify.completionListContains("i1_nc_l1", "(property) c1.i1_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "c1_p1");
+verify.completionListContains("f1", "(method) c1.f1(): void", "c1_f1");
+verify.completionListContains("l1", "(property) c1.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "c1_nc_p1");
+verify.completionListContains("nc_f1", "(method) c1.nc_f1(): void", "c1_nc_f1");
+verify.completionListContains("nc_l1", "(property) c1.nc_l1: () => void", "");
 goTo.marker('7');
 verify.currentSignatureHelpDocCommentIs("");
 goTo.marker('8');
@@ -305,18 +305,18 @@ verify.quickInfos({
 });
 
 goTo.marker('11');
-verify.memberListContains("i1_p1", "(property) i1.i1_p1: number", "i1_p1");
-verify.memberListContains("i1_f1", "(method) i1.i1_f1(): void", "i1_f1");
-verify.memberListContains("i1_l1", "(property) i1.i1_l1: () => void", "");
-verify.memberListContains("i1_nc_p1", "(property) i1.i1_nc_p1: number", "");
-verify.memberListContains("i1_nc_f1", "(method) i1.i1_nc_f1(): void", "");
-verify.memberListContains("i1_nc_l1", "(property) i1.i1_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) i1.p1: number", "");
-verify.memberListContains("f1", "(method) i1.f1(): void", "");
-verify.memberListContains("l1", "(property) i1.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) i1.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) i1.nc_f1(): void", "");
-verify.memberListContains("nc_l1", "(property) i1.nc_l1: () => void", "");
+verify.completionListContains("i1_p1", "(property) i1.i1_p1: number", "i1_p1");
+verify.completionListContains("i1_f1", "(method) i1.i1_f1(): void", "i1_f1");
+verify.completionListContains("i1_l1", "(property) i1.i1_l1: () => void", "");
+verify.completionListContains("i1_nc_p1", "(property) i1.i1_nc_p1: number", "");
+verify.completionListContains("i1_nc_f1", "(method) i1.i1_nc_f1(): void", "");
+verify.completionListContains("i1_nc_l1", "(property) i1.i1_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) i1.p1: number", "");
+verify.completionListContains("f1", "(method) i1.f1(): void", "");
+verify.completionListContains("l1", "(property) i1.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) i1.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) i1.nc_f1(): void", "");
+verify.completionListContains("nc_l1", "(property) i1.nc_l1: () => void", "");
 goTo.marker('12');
 verify.currentSignatureHelpDocCommentIs("i1_f1");
 goTo.marker('13');
@@ -376,18 +376,18 @@ verify.quickInfos({
 });
 
 goTo.marker('19');
-verify.memberListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
-verify.memberListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
-verify.memberListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
-verify.memberListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
-verify.memberListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
-verify.memberListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number", "");
-verify.memberListContains("p1", "(property) c2.p1: number", "c2 p1");
-verify.memberListContains("f1", "(method) c2.f1(): void", "c2 f1");
-verify.memberListContains("prop", "(property) c2.prop: number", "c2 prop");
-verify.memberListContains("nc_p1", "(property) c2.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) c2.nc_f1(): void", "");
-verify.memberListContains("nc_prop", "(property) c2.nc_prop: number", "");
+verify.completionListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
+verify.completionListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
+verify.completionListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
+verify.completionListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
+verify.completionListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
+verify.completionListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number", "");
+verify.completionListContains("p1", "(property) c2.p1: number", "c2 p1");
+verify.completionListContains("f1", "(method) c2.f1(): void", "c2 f1");
+verify.completionListContains("prop", "(property) c2.prop: number", "c2 prop");
+verify.completionListContains("nc_p1", "(property) c2.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) c2.nc_f1(): void", "");
+verify.completionListContains("nc_prop", "(property) c2.nc_prop: number", "");
 goTo.marker('20');
 verify.currentSignatureHelpDocCommentIs("c2 c2_f1");
 goTo.marker('21');
@@ -405,18 +405,18 @@ verify.quickInfos({
 });
 
 goTo.marker('24');
-verify.memberListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
-verify.memberListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
-verify.memberListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
-verify.memberListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
-verify.memberListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
-verify.memberListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number", "");
-verify.memberListContains("p1", "(property) c3.p1: number", "c3 p1");
-verify.memberListContains("f1", "(method) c3.f1(): void", "c3 f1");
-verify.memberListContains("prop", "(property) c3.prop: number", "c3 prop");
-verify.memberListContains("nc_p1", "(property) c3.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) c3.nc_f1(): void", "");
-verify.memberListContains("nc_prop", "(property) c3.nc_prop: number", "");
+verify.completionListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
+verify.completionListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
+verify.completionListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
+verify.completionListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
+verify.completionListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
+verify.completionListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number", "");
+verify.completionListContains("p1", "(property) c3.p1: number", "c3 p1");
+verify.completionListContains("f1", "(method) c3.f1(): void", "c3 f1");
+verify.completionListContains("prop", "(property) c3.prop: number", "c3 prop");
+verify.completionListContains("nc_p1", "(property) c3.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) c3.nc_f1(): void", "");
+verify.completionListContains("nc_prop", "(property) c3.nc_prop: number", "");
 goTo.marker('25');
 verify.currentSignatureHelpDocCommentIs("c2 c2_f1");
 goTo.marker('26');
@@ -434,18 +434,18 @@ verify.quickInfos({
 });
 
 goTo.marker('29');
-verify.memberListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
-verify.memberListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
-verify.memberListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
-verify.memberListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
-verify.memberListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
-verify.memberListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number");
-verify.memberListContains("p1", "(property) c2.p1: number", "c2 p1");
-verify.memberListContains("f1", "(method) c2.f1(): void", "c2 f1");
-verify.memberListContains("prop", "(property) c2.prop: number", "c2 prop");
-verify.memberListContains("nc_p1", "(property) c2.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) c2.nc_f1(): void", "");
-verify.memberListContains("nc_prop", "(property) c2.nc_prop: number", "");
+verify.completionListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
+verify.completionListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
+verify.completionListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
+verify.completionListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
+verify.completionListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
+verify.completionListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number");
+verify.completionListContains("p1", "(property) c2.p1: number", "c2 p1");
+verify.completionListContains("f1", "(method) c2.f1(): void", "c2 f1");
+verify.completionListContains("prop", "(property) c2.prop: number", "c2 prop");
+verify.completionListContains("nc_p1", "(property) c2.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) c2.nc_f1(): void", "");
+verify.completionListContains("nc_prop", "(property) c2.nc_prop: number", "");
 goTo.marker('30');
 verify.currentSignatureHelpDocCommentIs("c2 c2_f1");
 goTo.marker('31');
@@ -478,18 +478,18 @@ verify.completionListContains("c4", "class c4", "");
 verify.completionListContains("c4_i", "var c4_i: c4", "");
 
 goTo.marker('36');
-verify.memberListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
-verify.memberListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
-verify.memberListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
-verify.memberListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
-verify.memberListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
-verify.memberListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) i2.p1: number", "i2 p1");
-verify.memberListContains("f1", "(method) i2.f1(): void", "i2 f1");
-verify.memberListContains("l1", "(property) i2.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) i2.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) i2.nc_f1(): void", "");
-verify.memberListContains("nc_l1", "(property) i2.nc_l1: () => void", "");
+verify.completionListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
+verify.completionListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
+verify.completionListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
+verify.completionListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
+verify.completionListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
+verify.completionListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) i2.p1: number", "i2 p1");
+verify.completionListContains("f1", "(method) i2.f1(): void", "i2 f1");
+verify.completionListContains("l1", "(property) i2.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) i2.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) i2.nc_f1(): void", "");
+verify.completionListContains("nc_l1", "(property) i2.nc_l1: () => void", "");
 goTo.marker('37');
 verify.currentSignatureHelpDocCommentIs("i2_f1");
 goTo.marker('38');
@@ -521,18 +521,18 @@ verify.quickInfos({
 });
 
 goTo.marker('41');
-verify.memberListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
-verify.memberListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
-verify.memberListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
-verify.memberListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
-verify.memberListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
-verify.memberListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) i3.p1: number", "i3 p1");
-verify.memberListContains("f1", "(method) i3.f1(): void", "i3 f1");
-verify.memberListContains("l1", "(property) i3.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) i3.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) i3.nc_f1(): void", "");
-verify.memberListContains("nc_l1", "(property) i3.nc_l1: () => void", "");
+verify.completionListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
+verify.completionListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
+verify.completionListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
+verify.completionListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
+verify.completionListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
+verify.completionListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) i3.p1: number", "i3 p1");
+verify.completionListContains("f1", "(method) i3.f1(): void", "i3 f1");
+verify.completionListContains("l1", "(property) i3.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) i3.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) i3.nc_f1(): void", "");
+verify.completionListContains("nc_l1", "(property) i3.nc_l1: () => void", "");
 goTo.marker('42');
 verify.currentSignatureHelpDocCommentIs("i2_f1");
 goTo.marker('43');
@@ -562,18 +562,18 @@ verify.quickInfos({
 });
 
 goTo.marker('46');
-verify.memberListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
-verify.memberListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
-verify.memberListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
-verify.memberListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
-verify.memberListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
-verify.memberListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) i2.p1: number", "i2 p1");
-verify.memberListContains("f1", "(method) i2.f1(): void", "i2 f1");
-verify.memberListContains("l1", "(property) i2.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) i2.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) i2.nc_f1(): void", "");
-verify.memberListContains("nc_l1", "(property) i2.nc_l1: () => void", "");
+verify.completionListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
+verify.completionListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
+verify.completionListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
+verify.completionListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
+verify.completionListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
+verify.completionListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) i2.p1: number", "i2 p1");
+verify.completionListContains("f1", "(method) i2.f1(): void", "i2 f1");
+verify.completionListContains("l1", "(property) i2.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) i2.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) i2.nc_f1(): void", "");
+verify.completionListContains("nc_l1", "(property) i2.nc_l1: () => void", "");
 goTo.marker('47');
 verify.currentSignatureHelpDocCommentIs("i2_f1");
 goTo.marker('48');
diff --git a/tests/cases/fourslash/commentsInterface.ts b/tests/cases/fourslash/commentsInterface.ts
index 49928f0d086..472798fa8e1 100644
--- a/tests/cases/fourslash/commentsInterface.ts
+++ b/tests/cases/fourslash/commentsInterface.ts
@@ -80,12 +80,12 @@ verify.quickInfos({
 
 goTo.marker('8');
 verify.quickInfoIs("(property) i2.x: number", "this is x");
-verify.memberListContains("x", "(property) i2.x: number", "this is x");
-verify.memberListContains("foo", "(property) i2.foo: (b: number) => string", "this is foo");
-verify.memberListContains("nc_x", "(property) i2.nc_x: number", "");
-verify.memberListContains("nc_foo", "(property) i2.nc_foo: (b: number) => string", "");
-verify.memberListContains("fnfoo", "(method) i2.fnfoo(b: number): string", "this is fnfoo");
-verify.memberListContains("nc_fnfoo", "(method) i2.nc_fnfoo(b: number): string", "");
+verify.completionListContains("x", "(property) i2.x: number", "this is x");
+verify.completionListContains("foo", "(property) i2.foo: (b: number) => string", "this is foo");
+verify.completionListContains("nc_x", "(property) i2.nc_x: number", "");
+verify.completionListContains("nc_foo", "(property) i2.nc_foo: (b: number) => string", "");
+verify.completionListContains("fnfoo", "(method) i2.fnfoo(b: number): string", "this is fnfoo");
+verify.completionListContains("nc_fnfoo", "(method) i2.nc_fnfoo(b: number): string", "");
 
 verify.quickInfos({
     9: "var i2_i_foo: (b: number) => string",
@@ -199,12 +199,12 @@ verify.completionListContains("i3_i", "var i3_i: i3", "");
 
 goTo.marker('41');
 verify.quickInfoIs("(method) i3.f(a: number): string", "Function i3 f");
-verify.memberListContains("f", "(method) i3.f(a: number): string", "Function i3 f");
-verify.memberListContains("l", "(property) i3.l: (b: number) => string", "");
-verify.memberListContains("x", "(property) i3.x: number", "Comment i3 x");
-verify.memberListContains("nc_f", "(method) i3.nc_f(a: number): string", "");
-verify.memberListContains("nc_l", "(property) i3.nc_l: (b: number) => string", "");
-verify.memberListContains("nc_x", "(property) i3.nc_x: number", "");
+verify.completionListContains("f", "(method) i3.f(a: number): string", "Function i3 f");
+verify.completionListContains("l", "(property) i3.l: (b: number) => string", "");
+verify.completionListContains("x", "(property) i3.x: number", "Comment i3 x");
+verify.completionListContains("nc_f", "(method) i3.nc_f(a: number): string", "");
+verify.completionListContains("nc_l", "(property) i3.nc_l: (b: number) => string", "");
+verify.completionListContains("nc_x", "(property) i3.nc_x: number", "");
 
 goTo.marker('42');
 verify.currentSignatureHelpDocCommentIs("Function i3 f");
diff --git a/tests/cases/fourslash/commentsLinePreservation.ts b/tests/cases/fourslash/commentsLinePreservation.ts
index 6d085f71f80..3f60bdbf43b 100644
--- a/tests/cases/fourslash/commentsLinePreservation.ts
+++ b/tests/cases/fourslash/commentsLinePreservation.ts
@@ -105,6 +105,14 @@
 ////  * second time information about the param again
 ////  */
 ////function /*l*/l(param1: string) { /*9*/param1 = "hello"; }
+////     /** 
+////       * This is firstLine
+//// This is second Line
+//// [1]: third * line
+//// @param param1 first Line text
+//// second line text
+//// */
+////function /*m*/m(param1: string) { /*10*/param1 = "hello"; }
 
 verify.quickInfos({
     a: ["var a: string", "This is firstLine\nThis is second Line\n\nThis is fourth Line"],
@@ -136,5 +144,8 @@ verify.quickInfos({
     8: ["(parameter) param1: string", "hello   "],
 
     l: ["function l(param1: string): void", "This is firstLine\nThis is second Line"],
-    9: ["(parameter) param1: string", "first Line text\nblank line that shouldnt be shown when starting this \nsecond time information about the param again"]
+    9: ["(parameter) param1: string", "first Line text\nblank line that shouldnt be shown when starting this \nsecond time information about the param again"],
+
+    m: ["function m(param1: string): void", "This is firstLine\nThis is second Line\n[1]: third * line"],
+    10: ["(parameter) param1: string", "first Line text\nsecond line text"]
 });
diff --git a/tests/cases/fourslash/commentsModules.ts b/tests/cases/fourslash/commentsModules.ts
index 5f9457d81f4..c0b8ccc5731 100644
--- a/tests/cases/fourslash/commentsModules.ts
+++ b/tests/cases/fourslash/commentsModules.ts
@@ -110,9 +110,9 @@ goTo.marker('4');
 verify.completionListContains("m1", "namespace m1", "Namespace comment");
 
 goTo.marker('5');
-verify.memberListContains("b", "var m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "function m1.fooExport(): number", "exported function");
-verify.memberListContains("m2", "namespace m1.m2");
+verify.completionListContains("b", "var m1.b: number", "b's comment");
+verify.completionListContains("fooExport", "function m1.fooExport(): number", "exported function");
+verify.completionListContains("m2", "namespace m1.m2");
 verify.quickInfoIs("function m1.fooExport(): number", "exported function");
 
 goTo.marker('6');
@@ -122,55 +122,55 @@ verify.quickInfoAt("7", "var myvar: m1.m2.c");
 
 goTo.marker('8');
 verify.quickInfoIs("constructor m1.m2.c(): m1.m2.c");
-verify.memberListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
-verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
+verify.completionListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
+verify.completionListContains("i", "var m1.m2.i: m1.m2.c", "i");
 
 goTo.marker('9');
 verify.completionListContains("m2", "namespace m2", "namespace comment of m2.m3");
 verify.quickInfoIs("namespace m2", "namespace comment of m2.m3");
 
 goTo.marker('10');
-verify.memberListContains("m3", "namespace m2.m3");
+verify.completionListContains("m3", "namespace m2.m3");
 verify.quickInfoIs("namespace m2.m3", "namespace comment of m2.m3");
 
 goTo.marker('11');
 verify.quickInfoIs("constructor m2.m3.c(): m2.m3.c");
-verify.memberListContains("c", "constructor m2.m3.c(): m2.m3.c", "");
+verify.completionListContains("c", "constructor m2.m3.c(): m2.m3.c", "");
 
 goTo.marker('12');
 verify.completionListContains("m3", "namespace m3", "namespace comment of m3.m4.m5");
 verify.quickInfoIs("namespace m3", "namespace comment of m3.m4.m5");
 
 goTo.marker('13');
-verify.memberListContains("m4", "namespace m3.m4", "namespace comment of m3.m4.m5");
+verify.completionListContains("m4", "namespace m3.m4", "namespace comment of m3.m4.m5");
 verify.quickInfoIs("namespace m3.m4", "namespace comment of m3.m4.m5");
 
 goTo.marker('14');
-verify.memberListContains("m5", "namespace m3.m4.m5");
+verify.completionListContains("m5", "namespace m3.m4.m5");
 verify.quickInfoIs("namespace m3.m4.m5", "namespace comment of m3.m4.m5");
 
 goTo.marker('15');
 verify.quickInfoIs("constructor m3.m4.m5.c(): m3.m4.m5.c");
-verify.memberListContains("c", "constructor m3.m4.m5.c(): m3.m4.m5.c", "");
+verify.completionListContains("c", "constructor m3.m4.m5.c(): m3.m4.m5.c", "");
 
 goTo.marker('16');
 verify.completionListContains("m4", "namespace m4", "namespace comment of m4.m5.m6");
 verify.quickInfoIs("namespace m4", "namespace comment of m4.m5.m6");
 
 goTo.marker('17');
-verify.memberListContains("m5", "namespace m4.m5", "namespace comment of m4.m5.m6");
+verify.completionListContains("m5", "namespace m4.m5", "namespace comment of m4.m5.m6");
 verify.quickInfoIs("namespace m4.m5", "namespace comment of m4.m5.m6");
 
 goTo.marker('18');
-verify.memberListContains("m6", "namespace m4.m5.m6");
+verify.completionListContains("m6", "namespace m4.m5.m6");
 verify.quickInfoIs("namespace m4.m5.m6", "namespace comment of m4.m5.m6");
 
 goTo.marker('19');
-verify.memberListContains("m7", "namespace m4.m5.m6.m7");
+verify.completionListContains("m7", "namespace m4.m5.m6.m7");
 verify.quickInfoIs("namespace m4.m5.m6.m7");
 
 goTo.marker('20');
-verify.memberListContains("c", "constructor m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
+verify.completionListContains("c", "constructor m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
 verify.quickInfoIs("constructor m4.m5.m6.m7.c(): m4.m5.m6.m7.c");
 
 goTo.marker('21');
@@ -178,19 +178,19 @@ verify.completionListContains("m5", "namespace m5");
 verify.quickInfoIs("namespace m5", "namespace comment of m5.m6.m7");
 
 goTo.marker('22');
-verify.memberListContains("m6", "namespace m5.m6");
+verify.completionListContains("m6", "namespace m5.m6");
 verify.quickInfoIs("namespace m5.m6", "namespace comment of m5.m6.m7");
 
 goTo.marker('23');
-verify.memberListContains("m7", "namespace m5.m6.m7");
+verify.completionListContains("m7", "namespace m5.m6.m7");
 verify.quickInfoIs("namespace m5.m6.m7", "namespace comment of m5.m6.m7");
 
 goTo.marker('24');
-verify.memberListContains("m8", "namespace m5.m6.m7.m8");
+verify.completionListContains("m8", "namespace m5.m6.m7.m8");
 verify.quickInfoIs("namespace m5.m6.m7.m8", "namespace m8 comment");
 
 goTo.marker('25');
-verify.memberListContains("c", "constructor m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
+verify.completionListContains("c", "constructor m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
 verify.quickInfoIs("constructor m5.m6.m7.m8.c(): m5.m6.m7.m8.c");
 
 goTo.marker('26');
@@ -198,15 +198,15 @@ verify.completionListContains("m6", "namespace m6");
 verify.quickInfoIs("namespace m6");
 
 goTo.marker('27');
-verify.memberListContains("m7", "namespace m6.m7");
+verify.completionListContains("m7", "namespace m6.m7");
 verify.quickInfoIs("namespace m6.m7");
 
 goTo.marker('28');
-verify.memberListContains("m8", "namespace m6.m7.m8");
+verify.completionListContains("m8", "namespace m6.m7.m8");
 verify.quickInfoIs("namespace m6.m7.m8");
 
 goTo.marker('29');
-verify.memberListContains("c", "constructor m6.m7.m8.c(): m6.m7.m8.c", "");
+verify.completionListContains("c", "constructor m6.m7.m8.c(): m6.m7.m8.c", "");
 verify.quickInfoIs("constructor m6.m7.m8.c(): m6.m7.m8.c");
 
 goTo.marker('30');
@@ -214,15 +214,15 @@ verify.completionListContains("m7", "namespace m7");
 verify.quickInfoIs("namespace m7");
 
 goTo.marker('31');
-verify.memberListContains("m8", "namespace m7.m8");
+verify.completionListContains("m8", "namespace m7.m8");
 verify.quickInfoIs("namespace m7.m8");
 
 goTo.marker('32');
-verify.memberListContains("m9", "namespace m7.m8.m9");
+verify.completionListContains("m9", "namespace m7.m8.m9");
 verify.quickInfoIs("namespace m7.m8.m9", "namespace m9 comment");
 
 goTo.marker('33');
-verify.memberListContains("c", "constructor m7.m8.m9.c(): m7.m8.m9.c", "");
+verify.completionListContains("c", "constructor m7.m8.m9.c(): m7.m8.m9.c", "");
 verify.quickInfoIs("constructor m7.m8.m9.c(): m7.m8.m9.c");
 
 goTo.marker('34');
diff --git a/tests/cases/fourslash/commentsOverloads.ts b/tests/cases/fourslash/commentsOverloads.ts
index 5cc03aa842a..ec4a63349f9 100644
--- a/tests/cases/fourslash/commentsOverloads.ts
+++ b/tests/cases/fourslash/commentsOverloads.ts
@@ -326,10 +326,10 @@ goTo.marker('22q');
 verify.quickInfoAt("22q", "var i1_i: i1(b: string) => number (+1 overload)", "this is signature 2");
 
 goTo.marker('23');
-verify.memberListContains('foo', '(method) i1.foo(a: number): number (+1 overload)', 'foo 1');
-verify.memberListContains('foo2', '(method) i1.foo2(a: number): number (+1 overload)', '');
-verify.memberListContains('foo3', '(method) i1.foo3(a: number): number (+1 overload)', '');
-verify.memberListContains('foo4', '(method) i1.foo4(a: number): number (+1 overload)', 'foo4 1');
+verify.completionListContains('foo', '(method) i1.foo(a: number): number (+1 overload)', 'foo 1');
+verify.completionListContains('foo2', '(method) i1.foo2(a: number): number (+1 overload)', '');
+verify.completionListContains('foo3', '(method) i1.foo3(a: number): number (+1 overload)', '');
+verify.completionListContains('foo4', '(method) i1.foo4(a: number): number (+1 overload)', 'foo4 1');
 
 goTo.marker('24');
 verify.currentSignatureHelpDocCommentIs("foo 1");
@@ -432,11 +432,11 @@ verify.currentParameterHelpArgumentDocCommentIs("");
 verify.quickInfoAt("43q", "var i4_i: i4(b: string) => number (+1 overload)");
 
 goTo.marker('44');
-verify.memberListContains('prop1', '(method) c.prop1(a: number): number (+1 overload)', '');
-verify.memberListContains('prop2', '(method) c.prop2(a: number): number (+1 overload)', 'prop2 1');
-verify.memberListContains('prop3', '(method) c.prop3(a: number): number (+1 overload)', '');
-verify.memberListContains('prop4', '(method) c.prop4(a: number): number (+1 overload)', 'prop4 1');
-verify.memberListContains('prop5', '(method) c.prop5(a: number): number (+1 overload)', 'prop5 1');
+verify.completionListContains('prop1', '(method) c.prop1(a: number): number (+1 overload)', '');
+verify.completionListContains('prop2', '(method) c.prop2(a: number): number (+1 overload)', 'prop2 1');
+verify.completionListContains('prop3', '(method) c.prop3(a: number): number (+1 overload)', '');
+verify.completionListContains('prop4', '(method) c.prop4(a: number): number (+1 overload)', 'prop4 1');
+verify.completionListContains('prop5', '(method) c.prop5(a: number): number (+1 overload)', 'prop5 1');
 
 goTo.marker('45');
 verify.currentSignatureHelpDocCommentIs("");
diff --git a/tests/cases/fourslash/completionEntryForUnionProperty.ts b/tests/cases/fourslash/completionEntryForUnionProperty.ts
index bc0f9405a1b..0ffc184693c 100644
--- a/tests/cases/fourslash/completionEntryForUnionProperty.ts
+++ b/tests/cases/fourslash/completionEntryForUnionProperty.ts
@@ -15,6 +15,6 @@
 ////x./**/
 
 goTo.marker();
-verify.memberListContains("commonProperty", "(property) commonProperty: string | number");
-verify.memberListContains("commonFunction", "(method) commonFunction(): number");
-verify.memberListCount(2);
\ No newline at end of file
+verify.completionListContains("commonProperty", "(property) commonProperty: string | number");
+verify.completionListContains("commonFunction", "(method) commonFunction(): number");
+verify.completionListCount(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionEntryForUnionProperty2.ts b/tests/cases/fourslash/completionEntryForUnionProperty2.ts
index c2d7bc406a5..604052ff1b5 100644
--- a/tests/cases/fourslash/completionEntryForUnionProperty2.ts
+++ b/tests/cases/fourslash/completionEntryForUnionProperty2.ts
@@ -15,6 +15,6 @@
 ////x.commonProperty./**/
 
 goTo.marker();
-verify.memberListContains("toString", "(method) toString(): string");
-verify.memberListContains("valueOf", "(method) valueOf(): string | number");
-verify.memberListCount(2);
\ No newline at end of file
+verify.completionListContains("toString", "(method) toString(): string");
+verify.completionListContains("valueOf", "(method) valueOf(): string | number");
+verify.completionListCount(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment1.ts b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment1.ts
index 7faebc1474b..15f5901113b 100644
--- a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment1.ts
+++ b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment1.ts
@@ -16,9 +16,9 @@
 goTo.marker('0');
 verify.completionListContains("jspm");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(1);
+verify.completionListCount(1);
 
 goTo.marker('1');
 verify.completionListContains("jspm:dev");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(4);
+verify.completionListCount(4);
diff --git a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment2.ts b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment2.ts
index 4ba88e7dd2a..1d20b57e2a1 100644
--- a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment2.ts
+++ b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment2.ts
@@ -22,9 +22,9 @@
 goTo.marker('0');
 verify.completionListContains("jspm");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(1);
+verify.completionListCount(1);
 
 goTo.marker('1');
 verify.completionListContains("jspm:dev");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(4);
+verify.completionListCount(4);
diff --git a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment3.ts b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment3.ts
index 238606520e3..764011d90c1 100644
--- a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment3.ts
+++ b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment3.ts
@@ -18,9 +18,9 @@
 goTo.marker('0');
 verify.completionListContains("jspm");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(1);
+verify.completionListCount(1);
 
 goTo.marker('1');
 verify.completionListContains("jspm:browser");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(2);
+verify.completionListCount(2);
diff --git a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment4.ts b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment4.ts
index 9855bb8c502..e785a1a7657 100644
--- a/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment4.ts
+++ b/tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment4.ts
@@ -16,9 +16,9 @@
 goTo.marker('0');
 verify.completionListContains("jspm");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(1);
+verify.completionListCount(1);
 
 goTo.marker('1');
 verify.completionListContains("jspm:dev");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(4);
+verify.completionListCount(4);
diff --git a/tests/cases/fourslash/completionForStringLiteral.ts b/tests/cases/fourslash/completionForStringLiteral.ts
index cdbe1589f73..7a14f6b6519 100644
--- a/tests/cases/fourslash/completionForStringLiteral.ts
+++ b/tests/cases/fourslash/completionForStringLiteral.ts
@@ -8,8 +8,8 @@
 
 goTo.marker('1');
 verify.completionListContains("Option 1");
-verify.memberListCount(3);
+verify.completionListCount(3);
 
 goTo.marker('2');
 verify.completionListContains("Option 2");
-verify.memberListCount(3);
+verify.completionListCount(3);
diff --git a/tests/cases/fourslash/completionForStringLiteral2.ts b/tests/cases/fourslash/completionForStringLiteral2.ts
index 6f0768d6c6b..9b00208c729 100644
--- a/tests/cases/fourslash/completionForStringLiteral2.ts
+++ b/tests/cases/fourslash/completionForStringLiteral2.ts
@@ -12,9 +12,9 @@
 goTo.marker('1');
 verify.completionListContains("foo");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(3);
+verify.completionListCount(3);
 
 goTo.marker('2');
 verify.completionListContains("some other name");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(3);
+verify.completionListCount(3);
diff --git a/tests/cases/fourslash/completionForStringLiteral3.ts b/tests/cases/fourslash/completionForStringLiteral3.ts
index 8c1a7cab2ed..238ba74b4d8 100644
--- a/tests/cases/fourslash/completionForStringLiteral3.ts
+++ b/tests/cases/fourslash/completionForStringLiteral3.ts
@@ -12,9 +12,9 @@
 goTo.marker('1');
 verify.completionListContains("A");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(3);
+verify.completionListCount(3);
 
 goTo.marker('2');
 verify.completionListContains("A");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(3);
+verify.completionListCount(3);
diff --git a/tests/cases/fourslash/completionForStringLiteral4.ts b/tests/cases/fourslash/completionForStringLiteral4.ts
index 11ae699eab8..5629926bd18 100644
--- a/tests/cases/fourslash/completionForStringLiteral4.ts
+++ b/tests/cases/fourslash/completionForStringLiteral4.ts
@@ -20,4 +20,4 @@ verify.quickInfoIs('function f(p1: "literal", p2: "literal", p3: "other1" | "oth
 goTo.marker('2');
 verify.completionListContains("other1");
 verify.completionListContains("other2");
-verify.memberListCount(2);
+verify.completionListCount(2);
diff --git a/tests/cases/fourslash/completionInJsDoc.ts b/tests/cases/fourslash/completionInJsDoc.ts
index e5cc7a3d2b6..8ab9dbd0131 100644
--- a/tests/cases/fourslash/completionInJsDoc.ts
+++ b/tests/cases/fourslash/completionInJsDoc.ts
@@ -30,6 +30,7 @@ goTo.marker('1');
 verify.completionListContains("constructor");
 verify.completionListContains("param");
 verify.completionListContains("type");
+verify.completionListContains("method");
 
 goTo.marker('2');
 verify.completionListContains("constructor");
diff --git a/tests/cases/fourslash/completionListAfterAnyType.ts b/tests/cases/fourslash/completionListAfterAnyType.ts
index 7ab945e14cc..f7222675a0f 100644
--- a/tests/cases/fourslash/completionListAfterAnyType.ts
+++ b/tests/cases/fourslash/completionListAfterAnyType.ts
@@ -9,5 +9,5 @@
 //// }
 
 goTo.marker();
-verify.memberListContains("charAt");
-verify.memberListCount(1);
+verify.completionListContains("charAt");
+verify.completionListCount(1);
diff --git a/tests/cases/fourslash/completionListAfterInvalidCharacter.ts b/tests/cases/fourslash/completionListAfterInvalidCharacter.ts
index d5512e60bf7..ece28e5e3a0 100644
--- a/tests/cases/fourslash/completionListAfterInvalidCharacter.ts
+++ b/tests/cases/fourslash/completionListAfterInvalidCharacter.ts
@@ -8,4 +8,4 @@
 ////testModule./**/
 
 goTo.marker();
-verify.memberListContains("foo");
+verify.completionListContains("foo");
diff --git a/tests/cases/fourslash/completionListAfterObjectLiteral1.ts b/tests/cases/fourslash/completionListAfterObjectLiteral1.ts
index f761aad2495..7296ce057b4 100644
--- a/tests/cases/fourslash/completionListAfterObjectLiteral1.ts
+++ b/tests/cases/fourslash/completionListAfterObjectLiteral1.ts
@@ -3,5 +3,5 @@
 ////var v = { x: 4, y: 3 }./**/
 
 goTo.marker();
-verify.not.memberListContains('a');
-verify.memberListContains('x');
\ No newline at end of file
+verify.not.completionListContains('a');
+verify.completionListContains('x');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListAfterRegularExpressionLiteral01.ts b/tests/cases/fourslash/completionListAfterRegularExpressionLiteral01.ts
index ac8568d13f5..759a3f9c2a4 100644
--- a/tests/cases/fourslash/completionListAfterRegularExpressionLiteral01.ts
+++ b/tests/cases/fourslash/completionListAfterRegularExpressionLiteral01.ts
@@ -4,5 +4,5 @@
 /////a/./**/
 
 goTo.marker();
-verify.not.memberListContains('v');
-verify.memberListContains('compile');
\ No newline at end of file
+verify.not.completionListContains('v');
+verify.completionListContains('compile');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListAfterRegularExpressionLiteral1.ts b/tests/cases/fourslash/completionListAfterRegularExpressionLiteral1.ts
index 558b4d1e791..465c676c714 100644
--- a/tests/cases/fourslash/completionListAfterRegularExpressionLiteral1.ts
+++ b/tests/cases/fourslash/completionListAfterRegularExpressionLiteral1.ts
@@ -3,5 +3,5 @@
 /////a/./**/
 
 goTo.marker();
-verify.not.memberListContains('alert');
-verify.memberListContains('compile');
\ No newline at end of file
+verify.not.completionListContains('alert');
+verify.completionListContains('compile');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListAfterStringLiteral1.ts b/tests/cases/fourslash/completionListAfterStringLiteral1.ts
index 1391b3ae80d..533b428cdf5 100644
--- a/tests/cases/fourslash/completionListAfterStringLiteral1.ts
+++ b/tests/cases/fourslash/completionListAfterStringLiteral1.ts
@@ -3,5 +3,5 @@
 ////"a"./**/
 
 goTo.marker();
-verify.not.memberListContains('alert');
-verify.memberListContains('charAt');
\ No newline at end of file
+verify.not.completionListContains('alert');
+verify.completionListContains('charAt');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListAndMemberListOnCommentedDot.ts b/tests/cases/fourslash/completionListAndMemberListOnCommentedDot.ts
index c3ee033bf54..d0517d87279 100644
--- a/tests/cases/fourslash/completionListAndMemberListOnCommentedDot.ts
+++ b/tests/cases/fourslash/completionListAndMemberListOnCommentedDot.ts
@@ -15,4 +15,4 @@
 
 goTo.marker();
 verify.completionListIsEmpty();
-verify.memberListIsEmpty();
\ No newline at end of file
+verify.completionListIsEmpty();
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListAndMemberListOnCommentedWhiteSpace.ts b/tests/cases/fourslash/completionListAndMemberListOnCommentedWhiteSpace.ts
index f0287a0baea..a40c68e8b15 100644
--- a/tests/cases/fourslash/completionListAndMemberListOnCommentedWhiteSpace.ts
+++ b/tests/cases/fourslash/completionListAndMemberListOnCommentedWhiteSpace.ts
@@ -15,4 +15,4 @@
 
 goTo.marker();
 verify.completionListIsEmpty();
-verify.memberListIsEmpty();
\ No newline at end of file
+verify.completionListIsEmpty();
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListAtEOF1.ts b/tests/cases/fourslash/completionListAtEOF1.ts
index 1e903119462..3a7cfe95316 100644
--- a/tests/cases/fourslash/completionListAtEOF1.ts
+++ b/tests/cases/fourslash/completionListAtEOF1.ts
@@ -3,4 +3,4 @@
 //// if(0 === ''.
 
 goTo.eof();
-verify.memberListContains("charAt");
+verify.completionListContains("charAt");
diff --git a/tests/cases/fourslash/completionListAtEOF2.ts b/tests/cases/fourslash/completionListAtEOF2.ts
index d83d29ab599..8ba6a9d8e65 100644
--- a/tests/cases/fourslash/completionListAtEOF2.ts
+++ b/tests/cases/fourslash/completionListAtEOF2.ts
@@ -8,4 +8,4 @@
 ////var p = <Shapes.
 
 goTo.eof();
-verify.memberListContains("Point");
+verify.completionListContains("Point");
diff --git a/tests/cases/fourslash/completionListAtNodeBoundry.ts b/tests/cases/fourslash/completionListAtNodeBoundry.ts
index 1fc23eb159c..40c151e0ef4 100644
--- a/tests/cases/fourslash/completionListAtNodeBoundry.ts
+++ b/tests/cases/fourslash/completionListAtNodeBoundry.ts
@@ -19,4 +19,4 @@
 
 
 goTo.marker();
-verify.memberListContains("charAt");
+verify.completionListContains("charAt");
diff --git a/tests/cases/fourslash/completionListBeforeKeyword.ts b/tests/cases/fourslash/completionListBeforeKeyword.ts
index 3d98ebc1c3f..01efe29764a 100644
--- a/tests/cases/fourslash/completionListBeforeKeyword.ts
+++ b/tests/cases/fourslash/completionListBeforeKeyword.ts
@@ -18,9 +18,9 @@
 
 
 goTo.marker("TypeReference");
-verify.memberListContains("C1");
-verify.memberListContains("C2");
+verify.completionListContains("C1");
+verify.completionListContains("C2");
 
 goTo.marker("ValueReference");
-verify.memberListContains("C1");
-verify.memberListContains("C2");
\ No newline at end of file
+verify.completionListContains("C1");
+verify.completionListContains("C2");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListCladule.ts b/tests/cases/fourslash/completionListCladule.ts
index d1819e6d187..4225e6be263 100644
--- a/tests/cases/fourslash/completionListCladule.ts
+++ b/tests/cases/fourslash/completionListCladule.ts
@@ -14,17 +14,17 @@
 
 goTo.marker("c1");
 edit.insert(".");
-verify.memberListContains("x");
-verify.memberListContains("prototype");
-verify.memberListContains("staticMethod");
+verify.completionListContains("x");
+verify.completionListContains("prototype");
+verify.completionListContains("staticMethod");
 
 goTo.marker("c2");
 edit.insert(".");
-verify.memberListContains("x");
-verify.memberListContains("staticMethod");
-verify.memberListContains("prototype");
+verify.completionListContains("x");
+verify.completionListContains("staticMethod");
+verify.completionListContains("prototype");
 
 goTo.marker("c3");
 edit.insert(".");
-verify.memberListContains("doStuff");
-verify.memberListCount(1);
+verify.completionListContains("doStuff");
+verify.completionListCount(1);
diff --git a/tests/cases/fourslash/completionListClassMembers.ts b/tests/cases/fourslash/completionListClassMembers.ts
index 99945a0f496..2bf65cc7c0c 100644
--- a/tests/cases/fourslash/completionListClassMembers.ts
+++ b/tests/cases/fourslash/completionListClassMembers.ts
@@ -25,46 +25,46 @@
 
 
 goTo.marker("staticsInsideClassScope");
-verify.memberListContains("privateStaticProperty");
-verify.memberListContains("privateStaticMethod");
-verify.memberListContains("publicStaticProperty");
-verify.memberListContains("publicStaticMethod");
+verify.completionListContains("privateStaticProperty");
+verify.completionListContains("privateStaticMethod");
+verify.completionListContains("publicStaticProperty");
+verify.completionListContains("publicStaticMethod");
 // No instance properties
-verify.not.memberListContains("privateProperty");
-verify.not.memberListContains("privateInstanceMethod");
+verify.not.completionListContains("privateProperty");
+verify.not.completionListContains("privateInstanceMethod");
 // constructors should have a 'prototype' member
-verify.memberListContains("prototype");
+verify.completionListContains("prototype");
 
 goTo.marker("instanceMembersInsideClassScope");
-verify.memberListContains("privateProperty");
-verify.memberListContains("privateInstanceMethod");
-verify.memberListContains("publicProperty");
-verify.memberListContains("publicInstanceMethod");
+verify.completionListContains("privateProperty");
+verify.completionListContains("privateInstanceMethod");
+verify.completionListContains("publicProperty");
+verify.completionListContains("publicInstanceMethod");
 // No statics
-verify.not.memberListContains("privateStaticProperty");
-verify.not.memberListContains("privateStaticMethod");
+verify.not.completionListContains("privateStaticProperty");
+verify.not.completionListContains("privateStaticMethod");
 
 
 goTo.marker("staticsOutsideClassScope");
 // No privates
-verify.not.memberListContains("privateStaticProperty");
-verify.not.memberListContains("privateStaticMethod");
+verify.not.completionListContains("privateStaticProperty");
+verify.not.completionListContains("privateStaticMethod");
 // Only publics
-verify.memberListContains("publicStaticProperty");
-verify.memberListContains("publicStaticMethod");
+verify.completionListContains("publicStaticProperty");
+verify.completionListContains("publicStaticMethod");
 // No instance properties
-verify.not.memberListContains("publicProperty");
-verify.not.memberListContains("publicInstanceMethod");
+verify.not.completionListContains("publicProperty");
+verify.not.completionListContains("publicInstanceMethod");
 // constructors should have a 'prototype' member
-verify.memberListContains("prototype");
+verify.completionListContains("prototype");
 
 goTo.marker("instanceMembersOutsideClassScope");
 // No privates
-verify.not.memberListContains("privateProperty");
-verify.not.memberListContains("privateInstanceMethod");
+verify.not.completionListContains("privateProperty");
+verify.not.completionListContains("privateInstanceMethod");
 // Only publics
-verify.memberListContains("publicProperty");
-verify.memberListContains("publicInstanceMethod");
+verify.completionListContains("publicProperty");
+verify.completionListContains("publicInstanceMethod");
 // No statics
-verify.not.memberListContains("publicStaticProperty");
-verify.not.memberListContains("publicStaticMethod");
\ No newline at end of file
+verify.not.completionListContains("publicStaticProperty");
+verify.not.completionListContains("publicStaticMethod");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListEnumMembers.ts b/tests/cases/fourslash/completionListEnumMembers.ts
index 48bda280f3f..134fdd304f1 100644
--- a/tests/cases/fourslash/completionListEnumMembers.ts
+++ b/tests/cases/fourslash/completionListEnumMembers.ts
@@ -10,15 +10,15 @@
 ////Foo.bar./*enumValueReference*/;
 
 goTo.marker('valueReference');
-verify.memberListContains("bar");
-verify.memberListContains("baz");
-verify.memberListCount(2);
+verify.completionListContains("bar");
+verify.completionListContains("baz");
+verify.completionListCount(2);
 
 
 goTo.marker('typeReference');
-verify.memberListCount(2);
+verify.completionListCount(2);
 
 goTo.marker('enumValueReference');
-verify.memberListContains("toString");
-verify.memberListContains("toFixed");
-verify.memberListCount(6);
+verify.completionListContains("toString");
+verify.completionListContains("toFixed");
+verify.completionListCount(6);
diff --git a/tests/cases/fourslash/completionListEnumValues.ts b/tests/cases/fourslash/completionListEnumValues.ts
index e2d01c8da9d..0b0bf0f9676 100644
--- a/tests/cases/fourslash/completionListEnumValues.ts
+++ b/tests/cases/fourslash/completionListEnumValues.ts
@@ -15,18 +15,18 @@
 
 goTo.marker("enumVariable");
 // Should only have the enum's own members, and nothing else
-verify.memberListContains("Red");
-verify.memberListContains("Green");
-verify.memberListCount(2);
+verify.completionListContains("Red");
+verify.completionListContains("Green");
+verify.completionListCount(2);
 
 
 goTo.marker("variableOfEnumType");
 // Should have number members, and not enum members
-verify.memberListContains("toString");
-verify.not.memberListContains("Red");
+verify.completionListContains("toString");
+verify.not.completionListContains("Red");
 
 
 goTo.marker("callOfEnumReturnType");
 // Should have number members, and not enum members
-verify.memberListContains("toString");
-verify.not.memberListContains("Red");
+verify.completionListContains("toString");
+verify.not.completionListContains("Red");
diff --git a/tests/cases/fourslash/completionListErrorRecovery.ts b/tests/cases/fourslash/completionListErrorRecovery.ts
index 3e90ff4f22a..d5917d43aeb 100644
--- a/tests/cases/fourslash/completionListErrorRecovery.ts
+++ b/tests/cases/fourslash/completionListErrorRecovery.ts
@@ -6,5 +6,5 @@
 /////*1*/var bar;
 
 goTo.marker();
-verify.memberListContains("fun");
+verify.completionListContains("fun");
 verify.not.errorExistsAfterMarker("1");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListForNonExportedMemberInAmbientModuleWithExportAssignment1.ts b/tests/cases/fourslash/completionListForNonExportedMemberInAmbientModuleWithExportAssignment1.ts
index fc3b8755255..6bc2eaf886a 100644
--- a/tests/cases/fourslash/completionListForNonExportedMemberInAmbientModuleWithExportAssignment1.ts
+++ b/tests/cases/fourslash/completionListForNonExportedMemberInAmbientModuleWithExportAssignment1.ts
@@ -10,4 +10,4 @@
 //// test./**/
 
 goTo.marker();
-verify.not.memberListContains("x");
\ No newline at end of file
+verify.not.completionListContains("x");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListForObjectSpread.ts b/tests/cases/fourslash/completionListForObjectSpread.ts
index ca96797195c..1fc9a7795e6 100644
--- a/tests/cases/fourslash/completionListForObjectSpread.ts
+++ b/tests/cases/fourslash/completionListForObjectSpread.ts
@@ -19,17 +19,17 @@
 ////spreadNull./*3*/a;
 ////spreadUndefined./*4*/a;
 goTo.marker('1');
-verify.memberListContains('a', '(property) a: number');
-verify.memberListContains('b', '(property) b: string');
-verify.memberListCount(2);
+verify.completionListContains('a', '(property) a: number');
+verify.completionListContains('b', '(property) b: string');
+verify.completionListCount(2);
 goTo.marker('2');
-verify.memberListContains('a', '(property) a: number');
-verify.memberListContains('b', '(property) b: boolean');
-verify.memberListContains('c', '(property) c: number');
-verify.memberListCount(3);
+verify.completionListContains('a', '(property) a: number');
+verify.completionListContains('b', '(property) b: boolean');
+verify.completionListContains('c', '(property) c: number');
+verify.completionListCount(3);
 goTo.marker('3');
-verify.memberListContains('a', '(property) a: number');
-verify.memberListCount(1);
+verify.completionListContains('a', '(property) a: number');
+verify.completionListCount(1);
 goTo.marker('4');
-verify.memberListContains('a', '(property) a: number');
-verify.memberListCount(1);
+verify.completionListContains('a', '(property) a: number');
+verify.completionListCount(1);
diff --git a/tests/cases/fourslash/completionListForRest.ts b/tests/cases/fourslash/completionListForRest.ts
index b880a90b3df..8ea1b7a2a9d 100644
--- a/tests/cases/fourslash/completionListForRest.ts
+++ b/tests/cases/fourslash/completionListForRest.ts
@@ -8,6 +8,6 @@
 ////var { x, ...rest } = t;
 ////rest./*1*/x;
 goTo.marker('1');
-verify.memberListContains('parent', '(property) Gen.parent: Gen');
-verify.memberListContains('millenial', '(property) Gen.millenial: string');
-verify.memberListCount(2);
+verify.completionListContains('parent', '(property) Gen.parent: Gen');
+verify.completionListContains('millenial', '(property) Gen.millenial: string');
+verify.completionListCount(2);
diff --git a/tests/cases/fourslash/completionListForShorthandPropertyAssignment.ts b/tests/cases/fourslash/completionListForShorthandPropertyAssignment.ts
index d8262d71047..2b10757bbef 100644
--- a/tests/cases/fourslash/completionListForShorthandPropertyAssignment.ts
+++ b/tests/cases/fourslash/completionListForShorthandPropertyAssignment.ts
@@ -3,5 +3,5 @@
 //// var person: {name:string; id: number} = { n/**/
 
 goTo.marker();
-verify.memberListContains('name');
-verify.memberListContains('id');
\ No newline at end of file
+verify.completionListContains('name');
+verify.completionListContains('id');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListForShorthandPropertyAssignment2.ts b/tests/cases/fourslash/completionListForShorthandPropertyAssignment2.ts
index d8262d71047..2b10757bbef 100644
--- a/tests/cases/fourslash/completionListForShorthandPropertyAssignment2.ts
+++ b/tests/cases/fourslash/completionListForShorthandPropertyAssignment2.ts
@@ -3,5 +3,5 @@
 //// var person: {name:string; id: number} = { n/**/
 
 goTo.marker();
-verify.memberListContains('name');
-verify.memberListContains('id');
\ No newline at end of file
+verify.completionListContains('name');
+verify.completionListContains('id');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListFunctionMembers.ts b/tests/cases/fourslash/completionListFunctionMembers.ts
index c24dff1bee2..1a10fea1d8d 100644
--- a/tests/cases/fourslash/completionListFunctionMembers.ts
+++ b/tests/cases/fourslash/completionListFunctionMembers.ts
@@ -8,4 +8,4 @@
 ////fnc1./**/
 
 goTo.marker();
-verify.memberListContains('arguments', '(property) Function.arguments: any');
\ No newline at end of file
+verify.completionListContains('arguments', '(property) Function.arguments: any');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListGenericConstraints.ts b/tests/cases/fourslash/completionListGenericConstraints.ts
index a6131e027f0..10058ccbafa 100644
--- a/tests/cases/fourslash/completionListGenericConstraints.ts
+++ b/tests/cases/fourslash/completionListGenericConstraints.ts
@@ -52,26 +52,26 @@
 ////}
 
 goTo.marker("objectMembers");
-verify.memberListContains("hasOwnProperty");
-verify.memberListContains("isPrototypeOf");
-verify.memberListContains("toString");
+verify.completionListContains("hasOwnProperty");
+verify.completionListContains("isPrototypeOf");
+verify.completionListContains("toString");
 
 goTo.marker("interfaceMembers");
-verify.memberListContains("bar11");
-verify.memberListContains("bar12");
-verify.memberListContains("bar21");
-verify.memberListContains("bar22");
+verify.completionListContains("bar11");
+verify.completionListContains("bar12");
+verify.completionListContains("bar21");
+verify.completionListContains("bar22");
 
 goTo.marker("callableMembers");
-verify.memberListContains("name");
-verify.memberListContains("apply");
-verify.memberListContains("call");
-verify.memberListContains("bind");
+verify.completionListContains("name");
+verify.completionListContains("apply");
+verify.completionListContains("call");
+verify.completionListContains("bind");
 
 goTo.marker("publicOnlyMemebers");
-verify.memberListContains("publicProperty");
-verify.memberListContains("publicMethod");
-verify.not.memberListContains("privateProperty");
-verify.not.memberListContains("privateMethod");
-verify.not.memberListContains("publicStaticMethod");
-verify.not.memberListContains("privateStaticMethod");
\ No newline at end of file
+verify.completionListContains("publicProperty");
+verify.completionListContains("publicMethod");
+verify.not.completionListContains("privateProperty");
+verify.not.completionListContains("privateMethod");
+verify.not.completionListContains("publicStaticMethod");
+verify.not.completionListContains("privateStaticMethod");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInClosedFunction01.ts b/tests/cases/fourslash/completionListInClosedFunction01.ts
index 7c9c2a20139..608d0c761cf 100644
--- a/tests/cases/fourslash/completionListInClosedFunction01.ts
+++ b/tests/cases/fourslash/completionListInClosedFunction01.ts
@@ -6,7 +6,7 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
\ No newline at end of file
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInClosedFunction02.ts b/tests/cases/fourslash/completionListInClosedFunction02.ts
index a2ae8a9da83..89428df12f8 100644
--- a/tests/cases/fourslash/completionListInClosedFunction02.ts
+++ b/tests/cases/fourslash/completionListInClosedFunction02.ts
@@ -7,12 +7,12 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
\ No newline at end of file
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInClosedFunction03.ts b/tests/cases/fourslash/completionListInClosedFunction03.ts
index b1a10a4a4b2..ce43ec33b0d 100644
--- a/tests/cases/fourslash/completionListInClosedFunction03.ts
+++ b/tests/cases/fourslash/completionListInClosedFunction03.ts
@@ -8,12 +8,12 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
\ No newline at end of file
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInClosedFunction04.ts b/tests/cases/fourslash/completionListInClosedFunction04.ts
index fcc7d070eb7..47ae9da2c9e 100644
--- a/tests/cases/fourslash/completionListInClosedFunction04.ts
+++ b/tests/cases/fourslash/completionListInClosedFunction04.ts
@@ -8,12 +8,12 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // definitely questionable
\ No newline at end of file
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // definitely questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInClosedFunction05.ts b/tests/cases/fourslash/completionListInClosedFunction05.ts
index 7ec3985caf0..3252904ee19 100644
--- a/tests/cases/fourslash/completionListInClosedFunction05.ts
+++ b/tests/cases/fourslash/completionListInClosedFunction05.ts
@@ -8,14 +8,14 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");
 
-verify.memberListContains("v"); // questionable
\ No newline at end of file
+verify.completionListContains("v"); // questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInClosedFunction06.ts b/tests/cases/fourslash/completionListInClosedFunction06.ts
index f1aed3ad1a4..76c58f87174 100644
--- a/tests/cases/fourslash/completionListInClosedFunction06.ts
+++ b/tests/cases/fourslash/completionListInClosedFunction06.ts
@@ -11,4 +11,4 @@
 
 goTo.marker("1");
 
-verify.memberListContains("MyType");
\ No newline at end of file
+verify.completionListContains("MyType");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInClosedFunction07.ts b/tests/cases/fourslash/completionListInClosedFunction07.ts
index 13b9f5787de..8c0b5e68872 100644
--- a/tests/cases/fourslash/completionListInClosedFunction07.ts
+++ b/tests/cases/fourslash/completionListInClosedFunction07.ts
@@ -11,15 +11,15 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");
 
-verify.memberListContains("v");
-verify.memberListContains("p");
\ No newline at end of file
+verify.completionListContains("v");
+verify.completionListContains("p");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature01.ts b/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature01.ts
index 690fb583f67..08f3b0e16b2 100644
--- a/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature01.ts
+++ b/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature01.ts
@@ -9,10 +9,10 @@
 
 goTo.marker("1");
 
-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber");
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber");
 
 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
\ No newline at end of file
+verify.completionListContains("foo");
+verify.completionListContains("obj");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature02.ts b/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature02.ts
index 57af3592d44..36e9dc759e7 100644
--- a/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature02.ts
+++ b/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature02.ts
@@ -9,10 +9,10 @@
 
 goTo.marker("1");
 
-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber");  // REVIEW: Is this intended behavior?
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber");  // REVIEW: Is this intended behavior?
 
 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
\ No newline at end of file
+verify.completionListContains("foo");
+verify.completionListContains("obj");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature03.ts b/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature03.ts
index 1e5e6256d6e..388385f4c39 100644
--- a/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature03.ts
+++ b/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature03.ts
@@ -9,10 +9,10 @@
 
 goTo.marker("1");
 
-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber");  // REVIEW: Is this intended behavior?
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber");  // REVIEW: Is this intended behavior?
 
 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
\ No newline at end of file
+verify.completionListContains("foo");
+verify.completionListContains("obj");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature04.ts b/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature04.ts
index a45d98ad4df..14ae0e155d8 100644
--- a/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature04.ts
+++ b/tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature04.ts
@@ -9,8 +9,8 @@
 
 goTo.marker("1");
 
-verify.not.memberListContains("I");
-verify.not.memberListContains("TString");
-verify.not.memberListContains("TNumber");
-verify.not.memberListContains("foo");
-verify.not.memberListContains("obj");
+verify.not.completionListContains("I");
+verify.not.completionListContains("TString");
+verify.not.completionListContains("TNumber");
+verify.not.completionListContains("foo");
+verify.not.completionListContains("obj");
diff --git a/tests/cases/fourslash/completionListInEmptyFile.ts b/tests/cases/fourslash/completionListInEmptyFile.ts
index d81be49f618..fc176061358 100644
--- a/tests/cases/fourslash/completionListInEmptyFile.ts
+++ b/tests/cases/fourslash/completionListInEmptyFile.ts
@@ -4,4 +4,4 @@
 /////**/
 
 goTo.marker();
-verify.memberListContains("a");
+verify.completionListContains("a");
diff --git a/tests/cases/fourslash/completionListInExtendsClauseAtEOF.ts b/tests/cases/fourslash/completionListInExtendsClauseAtEOF.ts
index 8bb0d3e271e..7a065fd364d 100644
--- a/tests/cases/fourslash/completionListInExtendsClauseAtEOF.ts
+++ b/tests/cases/fourslash/completionListInExtendsClauseAtEOF.ts
@@ -6,5 +6,5 @@
 ////class Bar extends mod./**/
 
 goTo.marker();
-verify.memberListContains("Foo");
-verify.memberListCount(1);
\ No newline at end of file
+verify.completionListContains("Foo");
+verify.completionListCount(1);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInFunctionExpression.ts b/tests/cases/fourslash/completionListInFunctionExpression.ts
index 0efd1ad22f0..bba9eb09c3a 100644
--- a/tests/cases/fourslash/completionListInFunctionExpression.ts
+++ b/tests/cases/fourslash/completionListInFunctionExpression.ts
@@ -7,10 +7,10 @@
 ////}/*editDeclaration*/
 
 goTo.marker("requestCompletion");
-verify.memberListContains("foo");
+verify.completionListContains("foo");
 
 goTo.marker("memberCompletion");
-verify.memberListContains("toExponential");
+verify.completionListContains("toExponential");
 
 // Now change the decl by adding a semicolon
 goTo.marker("editDeclaration");
@@ -18,7 +18,7 @@ edit.insert(";");
 
 // foo should still be there
 goTo.marker("requestCompletion");
-verify.memberListContains("foo");
+verify.completionListContains("foo");
 
 goTo.marker("memberCompletion");
-verify.memberListContains("toExponential");
+verify.completionListContains("toExponential");
diff --git a/tests/cases/fourslash/completionListInNamedFunctionExpression.ts b/tests/cases/fourslash/completionListInNamedFunctionExpression.ts
index 3898b464b43..d136ea45e9e 100644
--- a/tests/cases/fourslash/completionListInNamedFunctionExpression.ts
+++ b/tests/cases/fourslash/completionListInNamedFunctionExpression.ts
@@ -15,13 +15,13 @@
 ////fo/*referenceInGlobalScope*/o;
 
 goTo.marker("globalScope");
-verify.memberListContains("foo");
+verify.completionListContains("foo");
 
 goTo.marker("insideFunctionDeclaration");
-verify.memberListContains("foo");
+verify.completionListContains("foo");
 
 goTo.marker("insideFunctionExpression");
-verify.memberListContains("foo");
+verify.completionListContains("foo");
 
 verify.quickInfos({
     referenceInsideFunctionExpression: "(local function) foo(): number",
diff --git a/tests/cases/fourslash/completionListInObjectLiteral.ts b/tests/cases/fourslash/completionListInObjectLiteral.ts
index 2024767ad83..4d0aca29f8d 100644
--- a/tests/cases/fourslash/completionListInObjectLiteral.ts
+++ b/tests/cases/fourslash/completionListInObjectLiteral.ts
@@ -12,5 +12,5 @@
 ////t.pos = { x: 4, y: 3 + t./**/ };
 
 goTo.marker();
-verify.not.memberListContains('x');
-verify.memberListContains('name');
\ No newline at end of file
+verify.not.completionListContains('x');
+verify.completionListContains('name');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInObjectLiteralThatIsParameterOfFunctionCall.ts b/tests/cases/fourslash/completionListInObjectLiteralThatIsParameterOfFunctionCall.ts
index 9dcf7456226..94a1ba5c707 100644
--- a/tests/cases/fourslash/completionListInObjectLiteralThatIsParameterOfFunctionCall.ts
+++ b/tests/cases/fourslash/completionListInObjectLiteralThatIsParameterOfFunctionCall.ts
@@ -6,6 +6,6 @@
 ////    /**/
 
 goTo.marker()
-verify.memberListContains('xa');
-verify.memberListContains('xb');
-verify.memberListCount(2);
\ No newline at end of file
+verify.completionListContains('xa');
+verify.completionListContains('xb');
+verify.completionListCount(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInScope.ts b/tests/cases/fourslash/completionListInScope.ts
index 8232682ead9..7488db8dd42 100644
--- a/tests/cases/fourslash/completionListInScope.ts
+++ b/tests/cases/fourslash/completionListInScope.ts
@@ -61,44 +61,44 @@
 
 
 goTo.marker("valueReference");
-verify.memberListContains("localVariable");
-verify.memberListContains("exportedVaribale");
+verify.completionListContains("localVariable");
+verify.completionListContains("exportedVaribale");
 
-verify.memberListContains("localFunction");
-verify.memberListContains("exportedFunction");
+verify.completionListContains("localFunction");
+verify.completionListContains("exportedFunction");
 
-verify.memberListContains("localClass");
-verify.memberListContains("exportedClass");
+verify.completionListContains("localClass");
+verify.completionListContains("exportedClass");
 
-verify.memberListContains("localModule");
-verify.memberListContains("exportedModule");
+verify.completionListContains("localModule");
+verify.completionListContains("exportedModule");
 
-verify.memberListContains("exportedVaribale2");
-verify.memberListContains("exportedFunction2");
-verify.memberListContains("exportedClass2");
-verify.memberListContains("exportedModule2");
+verify.completionListContains("exportedVaribale2");
+verify.completionListContains("exportedFunction2");
+verify.completionListContains("exportedClass2");
+verify.completionListContains("exportedModule2");
 
 goTo.marker("typeReference");
-verify.memberListContains("localInterface");
-verify.memberListContains("exportedInterface");
+verify.completionListContains("localInterface");
+verify.completionListContains("exportedInterface");
 
-verify.memberListContains("localClass");
-verify.memberListContains("exportedClass");
+verify.completionListContains("localClass");
+verify.completionListContains("exportedClass");
 
-verify.memberListContains("localModule");
-verify.memberListContains("exportedModule");
+verify.completionListContains("localModule");
+verify.completionListContains("exportedModule");
 
-verify.memberListContains("exportedClass2");
-verify.memberListContains("exportedModule2");
+verify.completionListContains("exportedClass2");
+verify.completionListContains("exportedModule2");
 
 goTo.marker("insideMethod");
-verify.not.memberListContains("property");
-verify.not.memberListContains("testMethod");
-verify.not.memberListContains("staticMethod");
+verify.not.completionListContains("property");
+verify.not.completionListContains("testMethod");
+verify.not.completionListContains("staticMethod");
 
-verify.memberListContains("globalVar");
-verify.memberListContains("globalFunction");
+verify.completionListContains("globalVar");
+verify.completionListContains("globalFunction");
 
-verify.memberListContains("param");
-verify.memberListContains("localVar");
-verify.memberListContains("localFunction");
+verify.completionListContains("param");
+verify.completionListContains("localVar");
+verify.completionListContains("localFunction");
diff --git a/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias3.ts b/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias3.ts
index 59cceda2aad..e3831742257 100644
--- a/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias3.ts
+++ b/tests/cases/fourslash/completionListInTypeParameterOfTypeAlias3.ts
@@ -3,11 +3,11 @@
 //// type constructorType<T1, T2> = new <T/*1*/, /*2*/
 
 goTo.marker("1");
-verify.memberListContains("T");
-verify.memberListContains("T1");
-verify.memberListContains("T2");
+verify.completionListContains("T");
+verify.completionListContains("T1");
+verify.completionListContains("T2");
 
 goTo.marker("2");
-verify.memberListContains("T");
-verify.memberListContains("T1");
-verify.memberListContains("T2");
\ No newline at end of file
+verify.completionListContains("T");
+verify.completionListContains("T1");
+verify.completionListContains("T2");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInTypedObjectLiterals2.ts b/tests/cases/fourslash/completionListInTypedObjectLiterals2.ts
index 960b4345ed8..d14e69ae15f 100644
--- a/tests/cases/fourslash/completionListInTypedObjectLiterals2.ts
+++ b/tests/cases/fourslash/completionListInTypedObjectLiterals2.ts
@@ -7,6 +7,6 @@
 ////aaa = { /*9*/
 
 goTo.marker("9");
-verify.memberListContains("x");
-verify.memberListCount(1);
+verify.completionListContains("x");
+verify.completionListCount(1);
 
diff --git a/tests/cases/fourslash/completionListInTypedObjectLiterals3.ts b/tests/cases/fourslash/completionListInTypedObjectLiterals3.ts
index a010fd2e28e..3d64412527d 100644
--- a/tests/cases/fourslash/completionListInTypedObjectLiterals3.ts
+++ b/tests/cases/fourslash/completionListInTypedObjectLiterals3.ts
@@ -7,7 +7,7 @@
 ////aaa.x = { /*10*/
 
 goTo.marker("10");
-verify.memberListContains("a");
-verify.memberListCount(1);
+verify.completionListContains("a");
+verify.completionListCount(1);
 
 
diff --git a/tests/cases/fourslash/completionListInTypedObjectLiterals4.ts b/tests/cases/fourslash/completionListInTypedObjectLiterals4.ts
index 3e1038805a0..40b04e1e2b7 100644
--- a/tests/cases/fourslash/completionListInTypedObjectLiterals4.ts
+++ b/tests/cases/fourslash/completionListInTypedObjectLiterals4.ts
@@ -10,7 +10,7 @@
 ////};
 
 goTo.marker("15");
-verify.not.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(1);
+verify.not.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(1);
 
diff --git a/tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames.ts b/tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames.ts
index 7acf79ffc53..85012c2efbf 100644
--- a/tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames.ts
+++ b/tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames.ts
@@ -9,24 +9,24 @@
 ////};
 
 goTo.marker();
-verify.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(2);
+verify.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(2);
 
 //      x|
 edit.insert("x");
-verify.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(2);
+verify.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(2);
 
 //      x1|
 edit.insert("1");
-verify.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(2);
+verify.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(2);
 
 //      x1: null,|
 edit.insert(": null,");
-verify.not.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(1);
+verify.not.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(1);
diff --git a/tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames2.ts b/tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames2.ts
index 61269a984d8..2bb6e2fc511 100644
--- a/tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames2.ts
+++ b/tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames2.ts
@@ -9,6 +9,6 @@
 ////};
 
 goTo.marker();
-verify.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(2);
+verify.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(2);
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction01.ts b/tests/cases/fourslash/completionListInUnclosedFunction01.ts
index 4d33d1220f7..d87be2247ea 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction01.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction01.ts
@@ -6,7 +6,7 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
\ No newline at end of file
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction02.ts b/tests/cases/fourslash/completionListInUnclosedFunction02.ts
index c0c79e94433..329c96090b7 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction02.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction02.ts
@@ -5,12 +5,12 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
\ No newline at end of file
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction03.ts b/tests/cases/fourslash/completionListInUnclosedFunction03.ts
index d8b3a0a132f..2d990a3a8d2 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction03.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction03.ts
@@ -6,12 +6,12 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
\ No newline at end of file
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction04.ts b/tests/cases/fourslash/completionListInUnclosedFunction04.ts
index e56978732c2..f1839e07b43 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction04.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction04.ts
@@ -5,12 +5,12 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
\ No newline at end of file
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction05.ts b/tests/cases/fourslash/completionListInUnclosedFunction05.ts
index 748a334f860..388c76cbe3c 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction05.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction05.ts
@@ -6,12 +6,12 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
\ No newline at end of file
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction06.ts b/tests/cases/fourslash/completionListInUnclosedFunction06.ts
index 3ceaff78039..a82ac3d6805 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction06.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction06.ts
@@ -6,12 +6,12 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // definitely questionable
\ No newline at end of file
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // definitely questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction07.ts b/tests/cases/fourslash/completionListInUnclosedFunction07.ts
index 6968a878a77..5583bdbd4e2 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction07.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction07.ts
@@ -6,12 +6,12 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // definitely questionable
\ No newline at end of file
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // definitely questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction08.ts b/tests/cases/fourslash/completionListInUnclosedFunction08.ts
index 5e8b15941c1..2fe88347ace 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction08.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction08.ts
@@ -6,14 +6,14 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");
 
-verify.memberListContains("v"); // questionable
\ No newline at end of file
+verify.completionListContains("v"); // questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction09.ts b/tests/cases/fourslash/completionListInUnclosedFunction09.ts
index 0171ef96342..6193e1e9694 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction09.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction09.ts
@@ -7,14 +7,14 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");
 
-verify.memberListContains("v"); // questionable
\ No newline at end of file
+verify.completionListContains("v"); // questionable
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction10.ts b/tests/cases/fourslash/completionListInUnclosedFunction10.ts
index 1d0162b600b..2bef433312b 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction10.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction10.ts
@@ -9,4 +9,4 @@
 
 goTo.marker("1");
 
-verify.memberListContains("MyType");
\ No newline at end of file
+verify.completionListContains("MyType");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction11.ts b/tests/cases/fourslash/completionListInUnclosedFunction11.ts
index 1d0162b600b..2bef433312b 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction11.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction11.ts
@@ -9,4 +9,4 @@
 
 goTo.marker("1");
 
-verify.memberListContains("MyType");
\ No newline at end of file
+verify.completionListContains("MyType");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction12.ts b/tests/cases/fourslash/completionListInUnclosedFunction12.ts
index b0e36b2fb8a..5d5f002b8b3 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction12.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction12.ts
@@ -10,4 +10,4 @@
 
 goTo.marker("1");
 
-verify.memberListContains("MyType");
\ No newline at end of file
+verify.completionListContains("MyType");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction13.ts b/tests/cases/fourslash/completionListInUnclosedFunction13.ts
index 8e1334941ad..cb5c07fd0fb 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction13.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction13.ts
@@ -11,4 +11,4 @@
 
 goTo.marker("1");
 
-verify.memberListContains("MyType");
\ No newline at end of file
+verify.completionListContains("MyType");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction14.ts b/tests/cases/fourslash/completionListInUnclosedFunction14.ts
index 412fcd86670..1a4c9072457 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction14.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction14.ts
@@ -11,15 +11,15 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");
 
-verify.memberListContains("v");
-verify.memberListContains("p");
\ No newline at end of file
+verify.completionListContains("v");
+verify.completionListContains("p");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction15.ts b/tests/cases/fourslash/completionListInUnclosedFunction15.ts
index 73a59795396..5f349c8e2a3 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction15.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction15.ts
@@ -10,15 +10,15 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");
 
-verify.memberListContains("v");
-verify.memberListContains("p");
\ No newline at end of file
+verify.completionListContains("v");
+verify.completionListContains("p");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction16.ts b/tests/cases/fourslash/completionListInUnclosedFunction16.ts
index 4ec5f41df53..bb8c42cf6ac 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction16.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction16.ts
@@ -9,15 +9,15 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");
 
-verify.memberListContains("v");
-verify.memberListContains("p");
\ No newline at end of file
+verify.completionListContains("v");
+verify.completionListContains("p");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction17.ts b/tests/cases/fourslash/completionListInUnclosedFunction17.ts
index 8cded845673..5a639e30318 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction17.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction17.ts
@@ -9,15 +9,15 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");
 
-verify.memberListContains("v");
-verify.memberListContains("p");
\ No newline at end of file
+verify.completionListContains("v");
+verify.completionListContains("p");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction18.ts b/tests/cases/fourslash/completionListInUnclosedFunction18.ts
index 182694d73d2..70ff5caf67a 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction18.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction18.ts
@@ -10,15 +10,15 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");
 
-verify.memberListContains("v");
-verify.memberListContains("p");
\ No newline at end of file
+verify.completionListContains("v");
+verify.completionListContains("p");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedFunction19.ts b/tests/cases/fourslash/completionListInUnclosedFunction19.ts
index 6f49f270250..8c6030b44db 100644
--- a/tests/cases/fourslash/completionListInUnclosedFunction19.ts
+++ b/tests/cases/fourslash/completionListInUnclosedFunction19.ts
@@ -9,15 +9,15 @@
 
 goTo.marker("1");
 
-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
 
-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");
 
-verify.memberListContains("v");
-verify.memberListContains("p");
\ No newline at end of file
+verify.completionListContains("v");
+verify.completionListContains("p");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature01.ts b/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature01.ts
index a931bed6a4b..d2864749a82 100644
--- a/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature01.ts
+++ b/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature01.ts
@@ -9,10 +9,10 @@
 
 goTo.marker("1");
 
-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber");
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber");
 
 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
+verify.completionListContains("foo");
+verify.completionListContains("obj");
diff --git a/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature02.ts b/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature02.ts
index 32a9504ebc3..602793982e0 100644
--- a/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature02.ts
+++ b/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature02.ts
@@ -9,10 +9,10 @@
 
 goTo.marker("1");
 
-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber"); // REVIEW: Is this intended behavior?
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber"); // REVIEW: Is this intended behavior?
 
 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
+verify.completionListContains("foo");
+verify.completionListContains("obj");
diff --git a/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature03.ts b/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature03.ts
index 455f122888c..d55c584fb9e 100644
--- a/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature03.ts
+++ b/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature03.ts
@@ -9,10 +9,10 @@
 
 goTo.marker("1");
 
-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber"); // REVIEW: Is this intended behavior?
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber"); // REVIEW: Is this intended behavior?
 
 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
+verify.completionListContains("foo");
+verify.completionListContains("obj");
diff --git a/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature04.ts b/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature04.ts
index c7f53e0e0df..2c435890ebd 100644
--- a/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature04.ts
+++ b/tests/cases/fourslash/completionListInUnclosedObjectTypeLiteralInSignature04.ts
@@ -9,8 +9,8 @@
 
 goTo.marker("1");
 
-verify.not.memberListContains("I");
-verify.not.memberListContains("TString");
-verify.not.memberListContains("TNumber");
-verify.not.memberListContains("foo");
-verify.not.memberListContains("obj");
+verify.not.completionListContains("I");
+verify.not.completionListContains("TString");
+verify.not.completionListContains("TNumber");
+verify.not.completionListContains("foo");
+verify.not.completionListContains("obj");
diff --git a/tests/cases/fourslash/completionListInstanceProtectedMembers.ts b/tests/cases/fourslash/completionListInstanceProtectedMembers.ts
index 767dd1dff27..87207db733a 100644
--- a/tests/cases/fourslash/completionListInstanceProtectedMembers.ts
+++ b/tests/cases/fourslash/completionListInstanceProtectedMembers.ts
@@ -32,32 +32,32 @@
 
 // Same class, everything is visible
 goTo.marker("1");
-verify.memberListContains('privateMethod');
-verify.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.completionListContains('privateMethod');
+verify.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
 
 goTo.marker("2");
-verify.memberListContains('privateMethod');
-verify.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.completionListContains('privateMethod');
+verify.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
 
 // Can not access protected properties overridden in subclass
 goTo.marker("3");
-verify.memberListContains('privateMethod');
-verify.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.not.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
+verify.completionListContains('privateMethod');
+verify.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.not.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');
diff --git a/tests/cases/fourslash/completionListInstanceProtectedMembers2.ts b/tests/cases/fourslash/completionListInstanceProtectedMembers2.ts
index c074bc06314..0733cb4d7da 100644
--- a/tests/cases/fourslash/completionListInstanceProtectedMembers2.ts
+++ b/tests/cases/fourslash/completionListInstanceProtectedMembers2.ts
@@ -33,44 +33,44 @@
 
 // Same class, everything is visible
 goTo.marker("1");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
 
 // Can not access properties on super
 goTo.marker("2");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.not.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.not.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');
 
 // Can not access protected properties through base class
 goTo.marker("3");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.not.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.not.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.not.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.not.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');
 
 // Same class, everything is visible
 goTo.marker("4");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
diff --git a/tests/cases/fourslash/completionListInstanceProtectedMembers3.ts b/tests/cases/fourslash/completionListInstanceProtectedMembers3.ts
index c2956da8a40..5454fa10ef0 100644
--- a/tests/cases/fourslash/completionListInstanceProtectedMembers3.ts
+++ b/tests/cases/fourslash/completionListInstanceProtectedMembers3.ts
@@ -26,21 +26,21 @@
 
 // Only public properties are visible outside the class
 goTo.marker("1");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.not.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.not.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.not.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.not.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');
 
 goTo.marker("2");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.not.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.not.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.not.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.not.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');
diff --git a/tests/cases/fourslash/completionListInstanceProtectedMembers4.ts b/tests/cases/fourslash/completionListInstanceProtectedMembers4.ts
index 82593391fa1..b4f282d19fe 100644
--- a/tests/cases/fourslash/completionListInstanceProtectedMembers4.ts
+++ b/tests/cases/fourslash/completionListInstanceProtectedMembers4.ts
@@ -24,11 +24,11 @@
 
 
 goTo.marker("1");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.not.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.not.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
diff --git a/tests/cases/fourslash/completionListInvalidMemberNames.ts b/tests/cases/fourslash/completionListInvalidMemberNames.ts
index 0928f8b9d8c..95abe70415c 100644
--- a/tests/cases/fourslash/completionListInvalidMemberNames.ts
+++ b/tests/cases/fourslash/completionListInvalidMemberNames.ts
@@ -21,4 +21,4 @@ verify.completionListContains("any");
 verify.completionListContains("$");
 
 // Nothing else should show up
-verify.memberListCount(4);
+verify.completionListCount(4);
diff --git a/tests/cases/fourslash/completionListInvalidMemberNames2.ts b/tests/cases/fourslash/completionListInvalidMemberNames2.ts
index b261f718480..6b25cf1f5d9 100644
--- a/tests/cases/fourslash/completionListInvalidMemberNames2.ts
+++ b/tests/cases/fourslash/completionListInvalidMemberNames2.ts
@@ -6,6 +6,6 @@
 ////var x = Foo./**/
 
 goTo.marker();
-verify.memberListContains("X");
-verify.memberListContains("Y");
-verify.memberListCount(2);
\ No newline at end of file
+verify.completionListContains("X");
+verify.completionListContains("Y");
+verify.completionListCount(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListKeywords.ts b/tests/cases/fourslash/completionListKeywords.ts
index a01da4569bd..edfc54bcc7d 100644
--- a/tests/cases/fourslash/completionListKeywords.ts
+++ b/tests/cases/fourslash/completionListKeywords.ts
@@ -3,46 +3,46 @@
 /////**/
 
 goTo.marker();
-verify.memberListContains("break");
-verify.memberListContains("case");
-verify.memberListContains("catch");
-verify.memberListContains("class");
-verify.memberListContains("constructor");
-verify.memberListContains("continue");
-verify.memberListContains("debugger");
-verify.memberListContains("declare");
-verify.memberListContains("default");
-verify.memberListContains("delete");
-verify.memberListContains("do");
-verify.memberListContains("else");
-verify.memberListContains("enum");
-verify.memberListContains("export");
-verify.memberListContains("extends");
-verify.memberListContains("false");
-verify.memberListContains("finally");
-verify.memberListContains("for");
-verify.memberListContains("function");
-verify.memberListContains("get");
-verify.memberListContains("if");
-verify.memberListContains("implements");
-verify.memberListContains("import");
-verify.memberListContains("in");
-verify.memberListContains("instanceof");
-verify.memberListContains("interface");
-verify.memberListContains("module");
-verify.memberListContains("new");
-verify.memberListContains("private");
-verify.memberListContains("public");
-verify.memberListContains("return");
-verify.memberListContains("set");
-verify.memberListContains("static");
-verify.memberListContains("super");
-verify.memberListContains("switch");
-verify.memberListContains("this");
-verify.memberListContains("throw");
-verify.memberListContains("true");
-verify.memberListContains("try");
-verify.memberListContains("typeof");
-verify.memberListContains("var");
-verify.memberListContains("while");
-verify.memberListContains("with");
+verify.completionListContains("break");
+verify.completionListContains("case");
+verify.completionListContains("catch");
+verify.completionListContains("class");
+verify.completionListContains("constructor");
+verify.completionListContains("continue");
+verify.completionListContains("debugger");
+verify.completionListContains("declare");
+verify.completionListContains("default");
+verify.completionListContains("delete");
+verify.completionListContains("do");
+verify.completionListContains("else");
+verify.completionListContains("enum");
+verify.completionListContains("export");
+verify.completionListContains("extends");
+verify.completionListContains("false");
+verify.completionListContains("finally");
+verify.completionListContains("for");
+verify.completionListContains("function");
+verify.completionListContains("get");
+verify.completionListContains("if");
+verify.completionListContains("implements");
+verify.completionListContains("import");
+verify.completionListContains("in");
+verify.completionListContains("instanceof");
+verify.completionListContains("interface");
+verify.completionListContains("module");
+verify.completionListContains("new");
+verify.completionListContains("private");
+verify.completionListContains("public");
+verify.completionListContains("return");
+verify.completionListContains("set");
+verify.completionListContains("static");
+verify.completionListContains("super");
+verify.completionListContains("switch");
+verify.completionListContains("this");
+verify.completionListContains("throw");
+verify.completionListContains("true");
+verify.completionListContains("try");
+verify.completionListContains("typeof");
+verify.completionListContains("var");
+verify.completionListContains("while");
+verify.completionListContains("with");
diff --git a/tests/cases/fourslash/completionListModuleMembers.ts b/tests/cases/fourslash/completionListModuleMembers.ts
index b93399b799e..462025ad99c 100644
--- a/tests/cases/fourslash/completionListModuleMembers.ts
+++ b/tests/cases/fourslash/completionListModuleMembers.ts
@@ -22,35 +22,35 @@
 ////interface TestInterface implements Module./*TypeReferenceInImplementsList*/ { }
 
 goTo.marker("ValueReference");
-verify.memberListContains("exportedVariable");
-verify.memberListContains("exportedFunction");
-verify.memberListContains("exportedClass");
-verify.memberListContains("exportedModule");
+verify.completionListContains("exportedVariable");
+verify.completionListContains("exportedFunction");
+verify.completionListContains("exportedClass");
+verify.completionListContains("exportedModule");
 // No inner declarations
-verify.not.memberListContains("innerVariable");
-verify.not.memberListContains("innerClass");
+verify.not.completionListContains("innerVariable");
+verify.not.completionListContains("innerClass");
 // Include type declarations
-verify.memberListContains("exportedInterface");
+verify.completionListContains("exportedInterface");
 
 goTo.marker("TypeReference");
-verify.memberListContains("exportedClass");
-verify.memberListContains("exportedModule");
-verify.memberListContains("exportedInterface");
+verify.completionListContains("exportedClass");
+verify.completionListContains("exportedModule");
+verify.completionListContains("exportedInterface");
 // Include value completions
-verify.memberListContains("exportedVariable");
+verify.completionListContains("exportedVariable");
 
 goTo.marker("TypeReferenceInExtendsList");
-verify.memberListContains("exportedClass");
-verify.memberListContains("exportedModule");
-verify.memberListContains("exportedInterface");
+verify.completionListContains("exportedClass");
+verify.completionListContains("exportedModule");
+verify.completionListContains("exportedInterface");
 // Include value completions
-verify.memberListContains("exportedVariable");
+verify.completionListContains("exportedVariable");
 
 
 goTo.marker("TypeReferenceInImplementsList");
-verify.memberListContains("exportedClass");
-verify.memberListContains("exportedModule");
-verify.memberListContains("exportedInterface");
+verify.completionListContains("exportedClass");
+verify.completionListContains("exportedModule");
+verify.completionListContains("exportedInterface");
 // Include value completions
-verify.memberListContains("exportedVariable");
+verify.completionListContains("exportedVariable");
 
diff --git a/tests/cases/fourslash/completionListObjectMembers.ts b/tests/cases/fourslash/completionListObjectMembers.ts
index 5d66b31fa5d..ae773c1c3b4 100644
--- a/tests/cases/fourslash/completionListObjectMembers.ts
+++ b/tests/cases/fourslash/completionListObjectMembers.ts
@@ -10,5 +10,5 @@
 ////object./**/
 
 goTo.marker();
-verify.memberListContains("bar", '(property) bar: any');
-verify.memberListContains("foo", '(method) foo(bar: any): any');
+verify.completionListContains("bar", '(property) bar: any');
+verify.completionListContains("foo", '(method) foo(bar: any): any');
diff --git a/tests/cases/fourslash/completionListOfGnericSymbol.ts b/tests/cases/fourslash/completionListOfGnericSymbol.ts
index 936eeeff714..9251892db23 100644
--- a/tests/cases/fourslash/completionListOfGnericSymbol.ts
+++ b/tests/cases/fourslash/completionListOfGnericSymbol.ts
@@ -6,6 +6,6 @@
 ////a./**/
 
 goTo.marker();
-verify.memberListContains('length', "(property) Array<number>.length: number", /*docComments*/ undefined, /*kind*/ "property");
-verify.memberListContains('toString', "(method) Array<number>.toString(): string", /*docComments*/ undefined, /*kind*/ "method");
+verify.completionListContains('length', "(property) Array<number>.length: number", /*docComments*/ undefined, /*kind*/ "property");
+verify.completionListContains('toString', "(method) Array<number>.toString(): string", /*docComments*/ undefined, /*kind*/ "method");
 
diff --git a/tests/cases/fourslash/completionListOfSplitInterface.ts b/tests/cases/fourslash/completionListOfSplitInterface.ts
index 61eae0da072..9bc635d8f8b 100644
--- a/tests/cases/fourslash/completionListOfSplitInterface.ts
+++ b/tests/cases/fourslash/completionListOfSplitInterface.ts
@@ -33,18 +33,18 @@
 ////ci1./*2*/b;
 
 goTo.marker('1');
-verify.memberListCount(6);
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
-verify.memberListContains("i1");
-verify.memberListContains("i2");
-verify.memberListContains("i3");
+verify.completionListCount(6);
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");
+verify.completionListContains("i1");
+verify.completionListContains("i2");
+verify.completionListContains("i3");
 
 goTo.marker('2');
-verify.memberListCount(5);
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("b1");
-verify.memberListContains("i11");
-verify.memberListContains("i12");
+verify.completionListCount(5);
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("b1");
+verify.completionListContains("i11");
+verify.completionListContains("i12");
diff --git a/tests/cases/fourslash/completionListOnAliases.ts b/tests/cases/fourslash/completionListOnAliases.ts
index 3d9026c3036..c15e5284c06 100644
--- a/tests/cases/fourslash/completionListOnAliases.ts
+++ b/tests/cases/fourslash/completionListOnAliases.ts
@@ -9,7 +9,7 @@
 ////}
 
 goTo.marker("1");
-verify.memberListContains("x", "import x = M", undefined);
+verify.completionListContains("x", "import x = M", undefined);
 
 goTo.marker("2");
-verify.memberListContains("value");
+verify.completionListContains("value");
diff --git a/tests/cases/fourslash/completionListOnAliases2.ts b/tests/cases/fourslash/completionListOnAliases2.ts
index 6a74f3a525b..7ff50a1a2b5 100644
--- a/tests/cases/fourslash/completionListOnAliases2.ts
+++ b/tests/cases/fourslash/completionListOnAliases2.ts
@@ -35,40 +35,40 @@
 
 // Module m
 goTo.marker("1");
-verify.memberListContains("I");
-verify.memberListContains("C");
-verify.memberListContains("E");
-verify.memberListContains("N");
-verify.memberListContains("V");
-verify.memberListContains("F");
-verify.memberListContains("A");
+verify.completionListContains("I");
+verify.completionListContains("C");
+verify.completionListContains("E");
+verify.completionListContains("N");
+verify.completionListContains("V");
+verify.completionListContains("F");
+verify.completionListContains("A");
 
 // Class C
 goTo.marker("2");
-verify.memberListContains("property");
+verify.completionListContains("property");
 
 // Enum E
 goTo.marker("3");
-verify.memberListContains("value");
+verify.completionListContains("value");
 
 // Module N
 goTo.marker("4");
-verify.memberListContains("v");
+verify.completionListContains("v");
 
 // var V
 goTo.marker("5");
-verify.memberListContains("toFixed");
+verify.completionListContains("toFixed");
 
 // function F
 goTo.marker("6");
-verify.memberListContains("call");
+verify.completionListContains("call");
 
 // alias a
 goTo.marker("7");
-verify.memberListContains("I");
-verify.memberListContains("C");
-verify.memberListContains("E");
-verify.memberListContains("N");
-verify.memberListContains("V");
-verify.memberListContains("F");
-verify.memberListContains("A");
+verify.completionListContains("I");
+verify.completionListContains("C");
+verify.completionListContains("E");
+verify.completionListContains("N");
+verify.completionListContains("V");
+verify.completionListContains("F");
+verify.completionListContains("A");
diff --git a/tests/cases/fourslash/completionListOnAliases3.ts b/tests/cases/fourslash/completionListOnAliases3.ts
index 8c5194af968..3eab00e2ed9 100644
--- a/tests/cases/fourslash/completionListOnAliases3.ts
+++ b/tests/cases/fourslash/completionListOnAliases3.ts
@@ -10,4 +10,4 @@
 
 // Q does not show up in member list of x
 goTo.marker("1");
-verify.memberListContains("Q");
+verify.completionListContains("Q");
diff --git a/tests/cases/fourslash/completionListOnFunctionCallWithOptionalArgument.ts b/tests/cases/fourslash/completionListOnFunctionCallWithOptionalArgument.ts
index 9cab9589406..cec7bf87aec 100644
--- a/tests/cases/fourslash/completionListOnFunctionCallWithOptionalArgument.ts
+++ b/tests/cases/fourslash/completionListOnFunctionCallWithOptionalArgument.ts
@@ -4,4 +4,4 @@
 //// Foo(function () { } )./**/;
 
 goTo.marker();
-verify.memberListContains('q');
+verify.completionListContains('q');
diff --git a/tests/cases/fourslash/completionListOnParam.ts b/tests/cases/fourslash/completionListOnParam.ts
index 8b686535927..ad2bbcde1b8 100644
--- a/tests/cases/fourslash/completionListOnParam.ts
+++ b/tests/cases/fourslash/completionListOnParam.ts
@@ -9,4 +9,4 @@
 ////}
 
 goTo.marker();
-verify.memberListContains('Blah');
\ No newline at end of file
+verify.completionListContains('Blah');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListOnParamOfGenericType1.ts b/tests/cases/fourslash/completionListOnParamOfGenericType1.ts
index 1b0fdba8ff8..c55b48bf7e9 100644
--- a/tests/cases/fourslash/completionListOnParamOfGenericType1.ts
+++ b/tests/cases/fourslash/completionListOnParamOfGenericType1.ts
@@ -9,14 +9,14 @@
 ////}
 
 goTo.marker('1');
-verify.memberListContains('next');
-verify.memberListContains('prev');
-verify.memberListContains('pushEntry');
+verify.completionListContains('next');
+verify.completionListContains('prev');
+verify.completionListContains('pushEntry');
 edit.insert('next.');
-verify.memberListContains('next');
-verify.memberListContains('prev');
-verify.memberListContains('pushEntry');
+verify.completionListContains('next');
+verify.completionListContains('prev');
+verify.completionListContains('pushEntry');
 edit.insert('prev.');
-verify.memberListContains('next');
-verify.memberListContains('prev');
-verify.memberListContains('pushEntry');
+verify.completionListContains('next');
+verify.completionListContains('prev');
+verify.completionListContains('pushEntry');
diff --git a/tests/cases/fourslash/completionListOnSuper.ts b/tests/cases/fourslash/completionListOnSuper.ts
index 3ca997cf1bb..2b3c0ef75fa 100644
--- a/tests/cases/fourslash/completionListOnSuper.ts
+++ b/tests/cases/fourslash/completionListOnSuper.ts
@@ -17,6 +17,6 @@
 ////}
 
 goTo.marker();
-verify.memberListContains('foo');
-verify.memberListContains('bar');
-verify.memberListCount(2);
+verify.completionListContains('foo');
+verify.completionListContains('bar');
+verify.completionListCount(2);
diff --git a/tests/cases/fourslash/completionListOnVarBetweenModules.ts b/tests/cases/fourslash/completionListOnVarBetweenModules.ts
index 6f907e5f75b..b0205e3428c 100644
--- a/tests/cases/fourslash/completionListOnVarBetweenModules.ts
+++ b/tests/cases/fourslash/completionListOnVarBetweenModules.ts
@@ -13,5 +13,5 @@
 ////}
 
 goTo.marker();
-verify.memberListContains("C1");
-verify.memberListContains("C2");
+verify.completionListContains("C1");
+verify.completionListContains("C2");
diff --git a/tests/cases/fourslash/completionListPrimitives.ts b/tests/cases/fourslash/completionListPrimitives.ts
index fd1d0670f2e..21a34659c4e 100644
--- a/tests/cases/fourslash/completionListPrimitives.ts
+++ b/tests/cases/fourslash/completionListPrimitives.ts
@@ -3,10 +3,10 @@
 /////**/
 
 goTo.marker();
-verify.memberListContains("any");
-verify.memberListContains("boolean");
-verify.memberListContains("null");
-verify.memberListContains("number");
-verify.memberListContains("string");
-verify.memberListContains("undefined");
-verify.memberListContains("void");
\ No newline at end of file
+verify.completionListContains("any");
+verify.completionListContains("boolean");
+verify.completionListContains("null");
+verify.completionListContains("number");
+verify.completionListContains("string");
+verify.completionListContains("undefined");
+verify.completionListContains("void");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListPrivateMembers.ts b/tests/cases/fourslash/completionListPrivateMembers.ts
index 772491a391e..e5e494d521d 100644
--- a/tests/cases/fourslash/completionListPrivateMembers.ts
+++ b/tests/cases/fourslash/completionListPrivateMembers.ts
@@ -13,5 +13,5 @@
 
 
 goTo.marker();
-verify.memberListContains("y");
-verify.not.memberListContains("x");
+verify.completionListContains("y");
+verify.not.completionListContains("x");
diff --git a/tests/cases/fourslash/completionListPrivateMembers2.ts b/tests/cases/fourslash/completionListPrivateMembers2.ts
index 1b19d042cbe..1a04df1d823 100644
--- a/tests/cases/fourslash/completionListPrivateMembers2.ts
+++ b/tests/cases/fourslash/completionListPrivateMembers2.ts
@@ -9,9 +9,9 @@
 ////f./*2*/
 
 goTo.marker("1");
-verify.memberListContains("y");
-verify.memberListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("x");
 
 goTo.marker("2");
-verify.not.memberListContains("x");
-verify.not.memberListContains("y");
\ No newline at end of file
+verify.not.completionListContains("x");
+verify.not.completionListContains("y");
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListPrivateMembers3.ts b/tests/cases/fourslash/completionListPrivateMembers3.ts
index 69f7456d7b5..999ab8fa5e6 100644
--- a/tests/cases/fourslash/completionListPrivateMembers3.ts
+++ b/tests/cases/fourslash/completionListPrivateMembers3.ts
@@ -19,13 +19,13 @@
 ////}
 
 goTo.marker("1");
-verify.memberListContains("p");
-verify.memberListCount(1);
+verify.completionListContains("p");
+verify.completionListCount(1);
 
 goTo.marker("2");
-verify.memberListContains("p");
-verify.memberListCount(1);
+verify.completionListContains("p");
+verify.completionListCount(1);
 
 goTo.marker("2");
-verify.memberListContains("p");
-verify.memberListCount(1);
+verify.completionListContains("p");
+verify.completionListCount(1);
diff --git a/tests/cases/fourslash/completionListProtectedMembers.ts b/tests/cases/fourslash/completionListProtectedMembers.ts
index 4715a9fb714..20cb990405d 100644
--- a/tests/cases/fourslash/completionListProtectedMembers.ts
+++ b/tests/cases/fourslash/completionListProtectedMembers.ts
@@ -19,26 +19,26 @@
 ////f./*5*/
 
 goTo.marker("1");
-verify.memberListContains("y");
-verify.memberListContains("x");
-verify.not.memberListContains("z");
+verify.completionListContains("y");
+verify.completionListContains("x");
+verify.not.completionListContains("z");
 
 goTo.marker("2");
-verify.memberListContains("y");
-verify.memberListContains("x");
-verify.memberListContains("z");
+verify.completionListContains("y");
+verify.completionListContains("x");
+verify.completionListContains("z");
 
 goTo.marker("3");
-verify.memberListContains("y");
-verify.memberListContains("x");
-verify.not.memberListContains("z");
+verify.completionListContains("y");
+verify.completionListContains("x");
+verify.not.completionListContains("z");
 
 goTo.marker("4");
-verify.memberListContains("y");
-verify.memberListContains("x");
-verify.memberListContains("z");
+verify.completionListContains("y");
+verify.completionListContains("x");
+verify.completionListContains("z");
 
 goTo.marker("5");
-verify.not.memberListContains("x");
-verify.not.memberListContains("y");
-verify.not.memberListContains("z");
+verify.not.completionListContains("x");
+verify.not.completionListContains("y");
+verify.not.completionListContains("z");
diff --git a/tests/cases/fourslash/completionListStaticProtectedMembers.ts b/tests/cases/fourslash/completionListStaticProtectedMembers.ts
index d72859570aa..ae79387fbe7 100644
--- a/tests/cases/fourslash/completionListStaticProtectedMembers.ts
+++ b/tests/cases/fourslash/completionListStaticProtectedMembers.ts
@@ -28,32 +28,32 @@
 
 // Same class, everything is visible
 goTo.marker("1");
-verify.memberListContains('privateMethod');
-verify.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.completionListContains('privateMethod');
+verify.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
 
 goTo.marker("2");
-verify.memberListContains('privateMethod');
-verify.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.completionListContains('privateMethod');
+verify.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
 
 // Can not access protected properties overridden in subclass
 goTo.marker("3");
-verify.memberListContains('privateMethod');
-verify.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.not.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
\ No newline at end of file
+verify.completionListContains('privateMethod');
+verify.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.not.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListStaticProtectedMembers2.ts b/tests/cases/fourslash/completionListStaticProtectedMembers2.ts
index 44cf9f73fd5..c6c64c5c6eb 100644
--- a/tests/cases/fourslash/completionListStaticProtectedMembers2.ts
+++ b/tests/cases/fourslash/completionListStaticProtectedMembers2.ts
@@ -29,42 +29,42 @@
 
 // Same class, everything is visible
 goTo.marker("1");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
 
 goTo.marker("2");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
 
 goTo.marker("3");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
 
 // only public and protected methods of the base class are accessible through super
 goTo.marker("4");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.not.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
\ No newline at end of file
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.not.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListStaticProtectedMembers3.ts b/tests/cases/fourslash/completionListStaticProtectedMembers3.ts
index c955f23fa32..0cb916c181f 100644
--- a/tests/cases/fourslash/completionListStaticProtectedMembers3.ts
+++ b/tests/cases/fourslash/completionListStaticProtectedMembers3.ts
@@ -25,21 +25,21 @@
 
 // Only public properties are visible outside the class
 goTo.marker("1");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.not.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.not.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.not.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.not.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');
 
 goTo.marker("2");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.not.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.not.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
\ No newline at end of file
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.not.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.not.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionListStaticProtectedMembers4.ts b/tests/cases/fourslash/completionListStaticProtectedMembers4.ts
index 817d2c4829c..14c460d6873 100644
--- a/tests/cases/fourslash/completionListStaticProtectedMembers4.ts
+++ b/tests/cases/fourslash/completionListStaticProtectedMembers4.ts
@@ -28,22 +28,22 @@
 
 // Sub class, everything but private is visible
 goTo.marker("1");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
 
 // Can see protected methods elevated to public
 goTo.marker("2");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.not.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.not.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
diff --git a/tests/cases/fourslash/completionListSuperMembers.ts b/tests/cases/fourslash/completionListSuperMembers.ts
index 6c7ddd5c7b3..ae6195601a3 100644
--- a/tests/cases/fourslash/completionListSuperMembers.ts
+++ b/tests/cases/fourslash/completionListSuperMembers.ts
@@ -25,11 +25,11 @@
 
 
 goTo.marker();
-verify.not.memberListContains("publicProperty");
-verify.memberListContains("publicInstanceMethod");
+verify.not.completionListContains("publicProperty");
+verify.completionListContains("publicInstanceMethod");
 // No statics
-verify.not.memberListContains("publicStaticProperty");
-verify.not.memberListContains("publicStaticMethod");
+verify.not.completionListContains("publicStaticProperty");
+verify.not.completionListContains("publicStaticMethod");
 // No privates
-verify.not.memberListContains("privateProperty");
-verify.not.memberListContains("privateInstanceMethod");
\ No newline at end of file
+verify.not.completionListContains("privateProperty");
+verify.not.completionListContains("privateInstanceMethod");
\ No newline at end of file
diff --git a/tests/cases/fourslash/exportEqualTypes.ts b/tests/cases/fourslash/exportEqualTypes.ts
index 1b8593893dd..b03e21b5f99 100644
--- a/tests/cases/fourslash/exportEqualTypes.ts
+++ b/tests/cases/fourslash/exportEqualTypes.ts
@@ -20,5 +20,5 @@ verify.quickInfos({
     3: "var r2: string"
 });
 goTo.marker('4');
-verify.memberListContains('foo');
+verify.completionListContains('foo');
 verify.numberOfErrorsInCurrentFile(0);
diff --git a/tests/cases/fourslash/extendArrayInterface.ts b/tests/cases/fourslash/extendArrayInterface.ts
index 4402dc39b88..d2322b37df0 100644
--- a/tests/cases/fourslash/extendArrayInterface.ts
+++ b/tests/cases/fourslash/extendArrayInterface.ts
@@ -8,7 +8,7 @@
 
 
 goTo.marker("1");
-verify.memberListContains("concat");
+verify.completionListContains("concat");
 
 // foo doesn't exist, so both references should be in error
 verify.errorExistsBetweenMarkers("2", "3");
diff --git a/tests/cases/fourslash/externalModuleIntellisense.ts b/tests/cases/fourslash/externalModuleIntellisense.ts
index 93c7143a9c6..8577e0686bf 100644
--- a/tests/cases/fourslash/externalModuleIntellisense.ts
+++ b/tests/cases/fourslash/externalModuleIntellisense.ts
@@ -23,4 +23,4 @@ goTo.eof();
 edit.insert("x.");
 verify.completionListContains('enable');
 verify.completionListContains('post');
-verify.memberListCount(2);
+verify.completionListCount(2);
diff --git a/tests/cases/fourslash/externalModuleRefernceResolutionOrderInImportDeclaration.ts b/tests/cases/fourslash/externalModuleRefernceResolutionOrderInImportDeclaration.ts
index 257c6cf3455..a1d503a657a 100644
--- a/tests/cases/fourslash/externalModuleRefernceResolutionOrderInImportDeclaration.ts
+++ b/tests/cases/fourslash/externalModuleRefernceResolutionOrderInImportDeclaration.ts
@@ -16,5 +16,5 @@
 
 goTo.marker('1');
 edit.insert("file1.");
-verify.memberListContains("bar");
-verify.not.memberListContains("foo");
\ No newline at end of file
+verify.completionListContains("bar");
+verify.not.completionListContains("foo");
\ No newline at end of file
diff --git a/tests/cases/fourslash/forwardReference.ts b/tests/cases/fourslash/forwardReference.ts
index 3c2e2c6393c..355eda9113c 100644
--- a/tests/cases/fourslash/forwardReference.ts
+++ b/tests/cases/fourslash/forwardReference.ts
@@ -9,4 +9,4 @@
 ////}
 
 goTo.marker();
-verify.memberListContains('n');
+verify.completionListContains('n');
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
index 35c68b49fd8..745a746db11 100644
--- a/tests/cases/fourslash/fourslash.ts
+++ b/tests/cases/fourslash/fourslash.ts
@@ -121,13 +121,11 @@ declare namespace FourSlashInterface {
         private negative;
         not: verifyNegatable;
         constructor(negative?: boolean);
-        memberListContains(symbol: string, text?: string, documenation?: string, kind?: string): void;
-        memberListCount(expectedCount: number): void;
+        completionListCount(expectedCount: number): void;
         completionListContains(symbol: string, text?: string, documentation?: string, kind?: string, spanIndex?: number): void;
         completionListItemsCountIsGreaterThan(count: number): void;
         completionListIsEmpty(): void;
         completionListAllowsNewIdentifier(): void;
-        memberListIsEmpty(): void;
         signatureHelpPresent(): void;
         errorExistsBetweenMarkers(startMarker: string, endMarker: string): void;
         errorExistsAfterMarker(markerName?: string): void;
@@ -279,7 +277,6 @@ declare namespace FourSlashInterface {
         printCurrentFileStateWithoutCaret(): void;
         printCurrentQuickInfo(): void;
         printCurrentSignatureHelp(): void;
-        printMemberListMembers(): void;
         printCompletionListMembers(): void;
         printBreakpointLocation(pos: number): void;
         printBreakpointAtCurrentLocation(): void;
diff --git a/tests/cases/fourslash/functionTypes.ts b/tests/cases/fourslash/functionTypes.ts
index 0baccba286e..813dfa8cdcb 100644
--- a/tests/cases/fourslash/functionTypes.ts
+++ b/tests/cases/fourslash/functionTypes.ts
@@ -23,7 +23,7 @@
 verify.numberOfErrorsInCurrentFile(0);
 for (var i = 1; i <= 7; i++) {
     goTo.marker('' + i);
-    verify.memberListCount(8);
+    verify.completionListCount(8);
     verify.completionListContains('apply');
     verify.completionListContains('arguments');
     verify.completionListContains('bind');
diff --git a/tests/cases/fourslash/getJavaScriptCompletions20.ts b/tests/cases/fourslash/getJavaScriptCompletions20.ts
index d254705bb91..3ca27fa288a 100644
--- a/tests/cases/fourslash/getJavaScriptCompletions20.ts
+++ b/tests/cases/fourslash/getJavaScriptCompletions20.ts
@@ -18,4 +18,4 @@
 //// Person.getNa/**/ = 10;
 
 goTo.marker();
-verify.not.memberListContains('getNa');
+verify.not.completionListContains('getNa');
diff --git a/tests/cases/fourslash/getJavaScriptQuickInfo8.ts b/tests/cases/fourslash/getJavaScriptQuickInfo8.ts
index 09ac27ce595..958dec3765d 100644
--- a/tests/cases/fourslash/getJavaScriptQuickInfo8.ts
+++ b/tests/cases/fourslash/getJavaScriptQuickInfo8.ts
@@ -21,9 +21,9 @@
 
 goTo.marker('1');
 edit.insert('.');
-verify.memberListContains('toFixed', undefined, undefined, 'method');
+verify.completionListContains('toFixed', undefined, undefined, 'method');
 edit.backspace();
 
 goTo.marker('2');
 edit.insert('.');
-verify.memberListContains('substr', undefined, undefined, 'method');
+verify.completionListContains('substr', undefined, undefined, 'method');
diff --git a/tests/cases/fourslash/javaScriptModules13.ts b/tests/cases/fourslash/javaScriptModules13.ts
index bcf263a4b8c..5e3eead3b6c 100644
--- a/tests/cases/fourslash/javaScriptModules13.ts
+++ b/tests/cases/fourslash/javaScriptModules13.ts
@@ -23,6 +23,6 @@ verify.completionListContains('y');
 verify.not.completionListContains('invisible');
 
 edit.insert('x.');
-verify.memberListContains('a', undefined, undefined, 'property');
+verify.completionListContains('a', undefined, undefined, 'property');
 edit.insert('a.');
-verify.memberListContains('toFixed', undefined, undefined, 'method');
+verify.completionListContains('toFixed', undefined, undefined, 'method');
diff --git a/tests/cases/fourslash/javaScriptModules19.ts b/tests/cases/fourslash/javaScriptModules19.ts
index 564cbea722f..56ee5a2a2e5 100644
--- a/tests/cases/fourslash/javaScriptModules19.ts
+++ b/tests/cases/fourslash/javaScriptModules19.ts
@@ -21,6 +21,6 @@ verify.completionListContains('y');
 verify.not.completionListContains('invisible');
 
 edit.insert('x.');
-verify.memberListContains('a', undefined, undefined, 'property');
+verify.completionListContains('a', undefined, undefined, 'property');
 edit.insert('a.');
-verify.memberListContains('toFixed', undefined, undefined, 'method');
+verify.completionListContains('toFixed', undefined, undefined, 'method');
diff --git a/tests/cases/fourslash/javaScriptPrototype1.ts b/tests/cases/fourslash/javaScriptPrototype1.ts
index c9c454cfb2c..8b2d6f3fb84 100644
--- a/tests/cases/fourslash/javaScriptPrototype1.ts
+++ b/tests/cases/fourslash/javaScriptPrototype1.ts
@@ -22,25 +22,25 @@
 // Members of the class instance
 goTo.marker('1');
 edit.insert('.');
-verify.memberListContains('foo', undefined, undefined, 'property');
-verify.memberListContains('bar', undefined, undefined, 'property');
+verify.completionListContains('foo', undefined, undefined, 'property');
+verify.completionListContains('bar', undefined, undefined, 'property');
 edit.backspace();
 
 // Members of a class method (1)
 goTo.marker('2');
 edit.insert('.');
-verify.memberListContains('length', undefined, undefined, 'property');
+verify.completionListContains('length', undefined, undefined, 'property');
 edit.backspace();
 
 // Members of the invocation of a class method (1)
 goTo.marker('3');
 edit.insert('.');
-verify.memberListContains('toFixed', undefined, undefined, 'method');
-verify.not.memberListContains('substr', undefined, undefined, 'method');
+verify.completionListContains('toFixed', undefined, undefined, 'method');
+verify.not.completionListContains('substr', undefined, undefined, 'method');
 edit.backspace();
 
 // Members of the invocation of a class method (2)
 goTo.marker('4');
 edit.insert('.');
-verify.memberListContains('substr', undefined, undefined, 'method');
-verify.not.memberListContains('toFixed', undefined, undefined, 'method');
+verify.completionListContains('substr', undefined, undefined, 'method');
+verify.not.completionListContains('toFixed', undefined, undefined, 'method');
diff --git a/tests/cases/fourslash/jsDocFunctionSignatures3.ts b/tests/cases/fourslash/jsDocFunctionSignatures3.ts
index 3679035d31d..87efaec3308 100644
--- a/tests/cases/fourslash/jsDocFunctionSignatures3.ts
+++ b/tests/cases/fourslash/jsDocFunctionSignatures3.ts
@@ -23,10 +23,10 @@
 
 goTo.marker('1');
 edit.insert('.');
-verify.memberListContains('substr', undefined, undefined, 'method');
+verify.completionListContains('substr', undefined, undefined, 'method');
 edit.backspace();
 
 goTo.marker('2');
 edit.insert('.');
-verify.memberListContains('toFixed', undefined, undefined, 'method');
+verify.completionListContains('toFixed', undefined, undefined, 'method');
 edit.backspace();
diff --git a/tests/cases/fourslash/jsDocGenerics1.ts b/tests/cases/fourslash/jsDocGenerics1.ts
index 61358e3f490..e5570937ba4 100644
--- a/tests/cases/fourslash/jsDocGenerics1.ts
+++ b/tests/cases/fourslash/jsDocGenerics1.ts
@@ -25,10 +25,10 @@
 
 
 goTo.marker('1');
-verify.memberListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
+verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
 
 goTo.marker('2');
-verify.memberListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
+verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
 
 goTo.marker('3');
-verify.memberListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
+verify.completionListContains("toFixed", /*displayText:*/ undefined, /*documentation*/ undefined, "method");
diff --git a/tests/cases/fourslash/jsdocNullableUnion.ts b/tests/cases/fourslash/jsdocNullableUnion.ts
index 19dc9818d69..50b929b1912 100644
--- a/tests/cases/fourslash/jsdocNullableUnion.ts
+++ b/tests/cases/fourslash/jsdocNullableUnion.ts
@@ -14,10 +14,10 @@
 ////}
 
 goTo.marker('1');
-verify.memberListContains("x");
+verify.completionListContains("x");
 
 goTo.marker('2');
-verify.memberListContains("y");
+verify.completionListContains("y");
 
 goTo.marker('3');
-verify.memberListContains("z");
+verify.completionListContains("z");
diff --git a/tests/cases/fourslash/lambdaThisMembers.ts b/tests/cases/fourslash/lambdaThisMembers.ts
index 1e80a5a47df..1a5aa112a6c 100644
--- a/tests/cases/fourslash/lambdaThisMembers.ts
+++ b/tests/cases/fourslash/lambdaThisMembers.ts
@@ -12,5 +12,5 @@
 goTo.marker();
 verify.completionListContains("a");
 verify.completionListContains("b");
-verify.memberListCount(2);
+verify.completionListCount(2);
 
diff --git a/tests/cases/fourslash/memberCompletionFromFunctionCall.ts b/tests/cases/fourslash/memberCompletionFromFunctionCall.ts
index 56629a3b510..9bd59e1dc9f 100644
--- a/tests/cases/fourslash/memberCompletionFromFunctionCall.ts
+++ b/tests/cases/fourslash/memberCompletionFromFunctionCall.ts
@@ -8,5 +8,5 @@
 
 goTo.marker();
 edit.insert(".");
-verify.not.memberListIsEmpty();
-verify.memberListContains("text");
\ No newline at end of file
+verify.not.completionListIsEmpty();
+verify.completionListContains("text");
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberCompletionInForEach1.ts b/tests/cases/fourslash/memberCompletionInForEach1.ts
index 2af0393283f..b90da43c119 100644
--- a/tests/cases/fourslash/memberCompletionInForEach1.ts
+++ b/tests/cases/fourslash/memberCompletionInForEach1.ts
@@ -6,11 +6,11 @@
 
 goTo.marker('1');
 edit.insert('.');
-verify.memberListContains('trim');
-verify.memberListCount(21);
+verify.completionListContains('trim');
+verify.completionListCount(21);
 edit.insert('});'); // need the following lines to not have parse errors in order for completion list to appear
 
 goTo.marker('2');
 edit.insert('.');
-verify.memberListContains('trim');
-verify.memberListCount(21);
+verify.completionListContains('trim');
+verify.completionListCount(21);
diff --git a/tests/cases/fourslash/memberCompletionOnTypeParameters.ts b/tests/cases/fourslash/memberCompletionOnTypeParameters.ts
index 6092e1e280a..cc3fc92a31a 100644
--- a/tests/cases/fourslash/memberCompletionOnTypeParameters.ts
+++ b/tests/cases/fourslash/memberCompletionOnTypeParameters.ts
@@ -14,21 +14,21 @@
 ////}
 
 goTo.marker("S");
-verify.memberListIsEmpty();
+verify.completionListIsEmpty();
 
 goTo.marker("T");
-verify.memberListContains("x", "(property) IFoo.x: number");
-verify.memberListContains("y", "(property) IFoo.y: string");
-verify.memberListCount(2);
+verify.completionListContains("x", "(property) IFoo.x: number");
+verify.completionListContains("y", "(property) IFoo.y: string");
+verify.completionListCount(2);
 
 goTo.marker("U");
-verify.memberListContains("toString", "(method) Object.toString(): string");
-verify.memberListCount(7); // constructor, toString, toLocaleString, valueOf, hasOwnProperty, isPrototypeOf, propertyIsEnumerable
+verify.completionListContains("toString", "(method) Object.toString(): string");
+verify.completionListCount(7); // constructor, toString, toLocaleString, valueOf, hasOwnProperty, isPrototypeOf, propertyIsEnumerable
 
 goTo.marker("V");
-verify.memberListContains("x", "(property) IFoo.x: number");
-verify.memberListContains("y", "(property) IFoo.y: string");
-verify.memberListCount(2);
+verify.completionListContains("x", "(property) IFoo.x: number");
+verify.completionListContains("y", "(property) IFoo.y: string");
+verify.completionListCount(2);
 
 
 
diff --git a/tests/cases/fourslash/memberCompletionOnTypeParameters2.ts b/tests/cases/fourslash/memberCompletionOnTypeParameters2.ts
index e7f6c5c6519..f77a8b0c612 100644
--- a/tests/cases/fourslash/memberCompletionOnTypeParameters2.ts
+++ b/tests/cases/fourslash/memberCompletionOnTypeParameters2.ts
@@ -17,5 +17,5 @@
 
 
 goTo.marker();
-verify.memberListContains("foo");
-verify.memberListCount(1);
+verify.completionListContains("foo");
+verify.completionListCount(1);
diff --git a/tests/cases/fourslash/memberListAfterDoubleDot.ts b/tests/cases/fourslash/memberListAfterDoubleDot.ts
index 21a1ad913ea..489e7c3b105 100644
--- a/tests/cases/fourslash/memberListAfterDoubleDot.ts
+++ b/tests/cases/fourslash/memberListAfterDoubleDot.ts
@@ -3,4 +3,4 @@
 ////../**/
 
 goTo.marker();
-verify.memberListIsEmpty();
\ No newline at end of file
+verify.completionListIsEmpty();
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListAfterSingleDot.ts b/tests/cases/fourslash/memberListAfterSingleDot.ts
index 62edf3b8c9e..ba0cdb1a1eb 100644
--- a/tests/cases/fourslash/memberListAfterSingleDot.ts
+++ b/tests/cases/fourslash/memberListAfterSingleDot.ts
@@ -3,4 +3,4 @@
 ////./**/
 
 goTo.marker();
-verify.memberListIsEmpty();
\ No newline at end of file
+verify.completionListIsEmpty();
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListErrorRecovery.ts b/tests/cases/fourslash/memberListErrorRecovery.ts
index 74bd25464f6..ee1fdf9193c 100644
--- a/tests/cases/fourslash/memberListErrorRecovery.ts
+++ b/tests/cases/fourslash/memberListErrorRecovery.ts
@@ -6,5 +6,5 @@
 /////*1*/var bar;
 
 goTo.marker();
-verify.memberListContains("fun");
+verify.completionListContains("fun");
 verify.not.errorExistsAfterMarker("1");
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListInFunctionCall.ts b/tests/cases/fourslash/memberListInFunctionCall.ts
index 3c8c8e9ceb1..82e05bc4a00 100644
--- a/tests/cases/fourslash/memberListInFunctionCall.ts
+++ b/tests/cases/fourslash/memberListInFunctionCall.ts
@@ -11,5 +11,5 @@
 goTo.marker();
 edit.insert('.');
 
-verify.memberListContains('charAt');
+verify.completionListContains('charAt');
 
diff --git a/tests/cases/fourslash/memberListInReopenedEnum.ts b/tests/cases/fourslash/memberListInReopenedEnum.ts
index 5101cb46f89..a03ee39041c 100644
--- a/tests/cases/fourslash/memberListInReopenedEnum.ts
+++ b/tests/cases/fourslash/memberListInReopenedEnum.ts
@@ -12,7 +12,7 @@
 
 
 goTo.marker('1');
-verify.memberListContains('A', '(enum member) E.A = 0');
-verify.memberListContains('B', '(enum member) E.B = 1');
-verify.memberListContains('C', '(enum member) E.C = 0');
-verify.memberListContains('D', '(enum member) E.D = 1');
\ No newline at end of file
+verify.completionListContains('A', '(enum member) E.A = 0');
+verify.completionListContains('B', '(enum member) E.B = 1');
+verify.completionListContains('C', '(enum member) E.C = 0');
+verify.completionListContains('D', '(enum member) E.D = 1');
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListInWithBlock.ts b/tests/cases/fourslash/memberListInWithBlock.ts
index a37c20dadfa..5253e924ff3 100644
--- a/tests/cases/fourslash/memberListInWithBlock.ts
+++ b/tests/cases/fourslash/memberListInWithBlock.ts
@@ -12,7 +12,7 @@
 ////}
 
 goTo.marker('1');
-verify.memberListIsEmpty();
+verify.completionListIsEmpty();
 
 goTo.marker('2');
 // Only keywords should show in completion, no members or types
diff --git a/tests/cases/fourslash/memberListInWithBlock2.ts b/tests/cases/fourslash/memberListInWithBlock2.ts
index 72bccb6926c..534cd12a416 100644
--- a/tests/cases/fourslash/memberListInWithBlock2.ts
+++ b/tests/cases/fourslash/memberListInWithBlock2.ts
@@ -9,4 +9,4 @@
 ////}
 
 goTo.marker('1');
-verify.memberListIsEmpty();
\ No newline at end of file
+verify.completionListIsEmpty();
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListInWithBlock3.ts b/tests/cases/fourslash/memberListInWithBlock3.ts
index a007b08cd02..b30ceed9897 100644
--- a/tests/cases/fourslash/memberListInWithBlock3.ts
+++ b/tests/cases/fourslash/memberListInWithBlock3.ts
@@ -4,4 +4,4 @@
 ////with(x./*1*/
 
 goTo.marker('1');
-verify.memberListContains("a");
+verify.completionListContains("a");
diff --git a/tests/cases/fourslash/memberListInsideObjectLiterals.ts b/tests/cases/fourslash/memberListInsideObjectLiterals.ts
index 99d62cbc6e5..875fb2c7fc9 100644
--- a/tests/cases/fourslash/memberListInsideObjectLiterals.ts
+++ b/tests/cases/fourslash/memberListInsideObjectLiterals.ts
@@ -26,16 +26,16 @@
 
 // Literal member completion inside empty literal.
 goTo.marker("1");
-verify.memberListContains("x1", "(property) MyPoint.x1: number");
-verify.memberListContains("y1", "(property) MyPoint.y1: number");
+verify.completionListContains("x1", "(property) MyPoint.x1: number");
+verify.completionListContains("y1", "(property) MyPoint.y1: number");
 
 // Literal member completion for 2nd member name.
 goTo.marker("2");
-verify.memberListContains("y1", "(property) MyPoint.y1: number");
+verify.completionListContains("y1", "(property) MyPoint.y1: number");
 
 // Literal member completion at existing member name location.
 goTo.marker("3");
-verify.memberListContains("y1", "(property) MyPoint.y1: number");
+verify.completionListContains("y1", "(property) MyPoint.y1: number");
 
 goTo.marker("4");
-verify.memberListContains("x1", "(property) MyPoint.x1: number");
\ No newline at end of file
+verify.completionListContains("x1", "(property) MyPoint.x1: number");
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListOfClass.ts b/tests/cases/fourslash/memberListOfClass.ts
index 6c93a0536d9..3355109e4a7 100644
--- a/tests/cases/fourslash/memberListOfClass.ts
+++ b/tests/cases/fourslash/memberListOfClass.ts
@@ -10,6 +10,6 @@
 ////f./**/
 
 goTo.marker();
-verify.memberListCount(2);
-verify.memberListContains('pubMeth', '(method) C1.pubMeth(): void');
-verify.memberListContains('pubProp', '(property) C1.pubProp: number');
\ No newline at end of file
+verify.completionListCount(2);
+verify.completionListContains('pubMeth', '(method) C1.pubMeth(): void');
+verify.completionListContains('pubProp', '(property) C1.pubProp: number');
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListOfEnumFromExternalModule.ts b/tests/cases/fourslash/memberListOfEnumFromExternalModule.ts
index 42171ff2e8b..5caaf5d9c23 100644
--- a/tests/cases/fourslash/memberListOfEnumFromExternalModule.ts
+++ b/tests/cases/fourslash/memberListOfEnumFromExternalModule.ts
@@ -10,4 +10,4 @@
 
 goTo.file("memberListOfEnumFromExternalModule_file1.ts");
 goTo.marker('1');
-verify.memberListContains("One");
\ No newline at end of file
+verify.completionListContains("One");
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListOfEnumInModule.ts b/tests/cases/fourslash/memberListOfEnumInModule.ts
index f92c5d43ea8..0a3887e3304 100644
--- a/tests/cases/fourslash/memberListOfEnumInModule.ts
+++ b/tests/cases/fourslash/memberListOfEnumInModule.ts
@@ -9,5 +9,5 @@
 ////}
 
 goTo.marker();
-verify.memberListContains("bar");
-verify.memberListContains("baz");
\ No newline at end of file
+verify.completionListContains("bar");
+verify.completionListContains("baz");
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListOfExportedClass.ts b/tests/cases/fourslash/memberListOfExportedClass.ts
index f6632bfe7b0..3c9fe36358b 100644
--- a/tests/cases/fourslash/memberListOfExportedClass.ts
+++ b/tests/cases/fourslash/memberListOfExportedClass.ts
@@ -11,5 +11,5 @@
 ////c./**/ // test on c.
 
 goTo.marker();
-verify.memberListCount(1);
-verify.memberListContains('pub', '(property) M.C.pub: number');
\ No newline at end of file
+verify.completionListCount(1);
+verify.completionListContains('pub', '(property) M.C.pub: number');
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListOfModule.ts b/tests/cases/fourslash/memberListOfModule.ts
index f09dfd67dbd..4724691c0a7 100644
--- a/tests/cases/fourslash/memberListOfModule.ts
+++ b/tests/cases/fourslash/memberListOfModule.ts
@@ -14,6 +14,6 @@
 ////var x: Foo./**/
 
 goTo.marker();
-verify.memberListCount(2);
-verify.memberListContains('Bar');
-verify.memberListContains('Blah');
\ No newline at end of file
+verify.completionListCount(2);
+verify.completionListContains('Bar');
+verify.completionListContains('Blah');
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListOfVarInArrowExpression.ts b/tests/cases/fourslash/memberListOfVarInArrowExpression.ts
index 03da06989ae..b1a91ae3cb2 100644
--- a/tests/cases/fourslash/memberListOfVarInArrowExpression.ts
+++ b/tests/cases/fourslash/memberListOfVarInArrowExpression.ts
@@ -15,4 +15,4 @@
 
 goTo.marker('1');
 verify.quickInfoIs("(property) a1: string");
-verify.memberListContains("a1", "(property) a1: string");
\ No newline at end of file
+verify.completionListContains("a1", "(property) a1: string");
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListOnContextualThis.ts b/tests/cases/fourslash/memberListOnContextualThis.ts
index 7eeb67dc620..e17600cad98 100644
--- a/tests/cases/fourslash/memberListOnContextualThis.ts
+++ b/tests/cases/fourslash/memberListOnContextualThis.ts
@@ -8,5 +8,5 @@
 goTo.marker('1');
 verify.quickInfoIs("this: A");
 goTo.marker('2');
-verify.memberListContains('a', '(property) A.a: string');
+verify.completionListContains('a', '(property) A.a: string');
 
diff --git a/tests/cases/fourslash/memberListOnExplicitThis.ts b/tests/cases/fourslash/memberListOnExplicitThis.ts
index b776a7c0641..425eb17f8ba 100644
--- a/tests/cases/fourslash/memberListOnExplicitThis.ts
+++ b/tests/cases/fourslash/memberListOnExplicitThis.ts
@@ -13,17 +13,17 @@
 ////function g(this: Restricted) {this./*4*/}
 
 goTo.marker('1');
-verify.memberListContains('f', '(method) C1.f(this: this): void');
-verify.memberListContains('g', '(method) C1.g(this: Restricted): void');
-verify.memberListContains('n', '(property) C1.n: number');
-verify.memberListContains('m', '(property) C1.m: number');
+verify.completionListContains('f', '(method) C1.f(this: this): void');
+verify.completionListContains('g', '(method) C1.g(this: Restricted): void');
+verify.completionListContains('n', '(property) C1.n: number');
+verify.completionListContains('m', '(property) C1.m: number');
 
 goTo.marker('2');
-verify.memberListContains('n', '(property) Restricted.n: number');
+verify.completionListContains('n', '(property) Restricted.n: number');
 
 goTo.marker('3');
-verify.memberListIsEmpty();
+verify.completionListIsEmpty();
 
 goTo.marker('4');
-verify.memberListContains('n', '(property) Restricted.n: number');
+verify.completionListContains('n', '(property) Restricted.n: number');
 
diff --git a/tests/cases/fourslash/memberListOnFunctionParameter.ts b/tests/cases/fourslash/memberListOnFunctionParameter.ts
index ee33cdc95e5..52daacb3573 100644
--- a/tests/cases/fourslash/memberListOnFunctionParameter.ts
+++ b/tests/cases/fourslash/memberListOnFunctionParameter.ts
@@ -6,8 +6,8 @@
 ////}
 
 goTo.marker();
-verify.memberListContains("charAt");
-verify.memberListContains("charCodeAt");
-verify.memberListContains("length");
-verify.memberListContains("concat");
-verify.not.memberListContains("toFixed");
\ No newline at end of file
+verify.completionListContains("charAt");
+verify.completionListContains("charCodeAt");
+verify.completionListContains("length");
+verify.completionListContains("concat");
+verify.not.completionListContains("toFixed");
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberListOnThisInClassWithPrivates.ts b/tests/cases/fourslash/memberListOnThisInClassWithPrivates.ts
index 341605e391c..c44835f6882 100644
--- a/tests/cases/fourslash/memberListOnThisInClassWithPrivates.ts
+++ b/tests/cases/fourslash/memberListOnThisInClassWithPrivates.ts
@@ -8,6 +8,6 @@
 ////}
 
 goTo.marker();
-verify.memberListContains('privMeth', '(method) C1.privMeth(): void');
-verify.memberListContains('pubMeth', '(method) C1.pubMeth(): void');
-verify.memberListContains('pubProp', '(property) C1.pubProp: number');
\ No newline at end of file
+verify.completionListContains('privMeth', '(method) C1.privMeth(): void');
+verify.completionListContains('pubMeth', '(method) C1.pubMeth(): void');
+verify.completionListContains('pubProp', '(property) C1.pubProp: number');
\ No newline at end of file
diff --git a/tests/cases/fourslash/memberlistOnDDot.ts b/tests/cases/fourslash/memberlistOnDDot.ts
index 604bf531fc7..11efdd5d523 100644
--- a/tests/cases/fourslash/memberlistOnDDot.ts
+++ b/tests/cases/fourslash/memberlistOnDDot.ts
@@ -6,4 +6,4 @@
 goTo.marker();
 edit.insert('.');
 edit.insert('.');
-//verify.not.memberListContains('charAt');
\ No newline at end of file
+//verify.not.completionListContains('charAt');
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts b/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts
index cfeaabfbb86..25e6cd4c68e 100644
--- a/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts
+++ b/tests/cases/fourslash/quickInfoOnNarrowedTypeInModule.ts
@@ -64,12 +64,12 @@ verify.completionListContains("exportedStrOrNum", "var m.exportedStrOrNum: strin
 
 goTo.marker('7');
 verify.quickInfoIs('var m.exportedStrOrNum: string | number');
-verify.memberListContains("exportedStrOrNum", "var m.exportedStrOrNum: string | number");
+verify.completionListContains("exportedStrOrNum", "var m.exportedStrOrNum: string | number");
 
 goTo.marker('8');
 verify.quickInfoIs('var m.exportedStrOrNum: number');
-verify.memberListContains("exportedStrOrNum", "var m.exportedStrOrNum: number");
+verify.completionListContains("exportedStrOrNum", "var m.exportedStrOrNum: number");
 
 goTo.marker('9');
 verify.quickInfoIs('var m.exportedStrOrNum: string');
-verify.memberListContains("exportedStrOrNum", "var m.exportedStrOrNum: string");
\ No newline at end of file
+verify.completionListContains("exportedStrOrNum", "var m.exportedStrOrNum: string");
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoOnObjectLiteralWithAccessors.ts b/tests/cases/fourslash/quickInfoOnObjectLiteralWithAccessors.ts
index 3ae0533d340..e11af2beda4 100644
--- a/tests/cases/fourslash/quickInfoOnObjectLiteralWithAccessors.ts
+++ b/tests/cases/fourslash/quickInfoOnObjectLiteralWithAccessors.ts
@@ -17,8 +17,8 @@ verify.quickInfos({
 });
 
 goTo.marker('3');
-verify.memberListContains("x", "(property) x: number", undefined);
-verify.memberListContains("b", "(property) b: number", undefined);
+verify.completionListContains("x", "(property) x: number", undefined);
+verify.completionListContains("b", "(property) b: number", undefined);
 verify.quickInfoIs("(property) x: number");
 
 verify.quickInfoAt("4", "var point: {\n    b: number;\n    x: number;\n}");
diff --git a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts
index 7beaf5548fb..f592b255ac0 100644
--- a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts
+++ b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts
@@ -14,6 +14,6 @@ verify.quickInfos({
 });
 
 goTo.marker('3');
-verify.memberListContains("x", "(property) x: number", undefined);
+verify.completionListContains("x", "(property) x: number", undefined);
 
 verify.quickInfoAt("4", "var point: {\n    readonly x: number;\n}");
diff --git a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlySetter.ts b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlySetter.ts
index 95a304329f2..d66626cc99d 100644
--- a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlySetter.ts
+++ b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlySetter.ts
@@ -12,8 +12,8 @@
 verify.quickInfoAt("1", "function makePoint(x: number): {\n    b: number;\n    x: number;\n}");
 
 goTo.marker('2');
-verify.memberListContains("x", "(property) x: number", undefined);
-verify.memberListContains("b", "(property) b: number", undefined);
+verify.completionListContains("x", "(property) x: number", undefined);
+verify.completionListContains("b", "(property) b: number", undefined);
 verify.quickInfoIs("(property) x: number");
 
 verify.quickInfoAt("3", "var point: {\n    b: number;\n    x: number;\n}");
diff --git a/tests/cases/fourslash/quickInfoWithNestedDestructuredParameterInLambda.ts b/tests/cases/fourslash/quickInfoWithNestedDestructuredParameterInLambda.ts
new file mode 100644
index 00000000000..39453ba8cdc
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoWithNestedDestructuredParameterInLambda.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+// @filename: a.tsx
+////import * as React from 'react';
+////interface SomeInterface {
+////    someBoolean: boolean,
+////    someString: string;
+////}
+////interface SomeProps {
+////    someProp: SomeInterface;
+////}
+////export const /*1*/SomeStatelessComponent = ({someProp: { someBoolean, someString}}: SomeProps) => (<div>{`${someBoolean}${someString}`});
+
+goTo.marker("1");
+verify.quickInfoExists();
diff --git a/tests/cases/fourslash/server/completions01.ts b/tests/cases/fourslash/server/completions01.ts
index a837a74849d..38fdbab4eda 100644
--- a/tests/cases/fourslash/server/completions01.ts
+++ b/tests/cases/fourslash/server/completions01.ts
@@ -6,11 +6,11 @@
 
 goTo.marker('1');
 edit.insert('.');
-verify.memberListContains('trim');
-verify.memberListCount(21);
+verify.completionListContains('trim');
+verify.completionListCount(21);
 edit.insert('});'); // need the following lines to not have parse errors in order for completion list to appear
 
 goTo.marker('2');
 edit.insert('.');
-verify.memberListContains('trim');
-verify.memberListCount(21);
+verify.completionListContains('trim');
+verify.completionListCount(21);
diff --git a/tests/cases/fourslash/server/jsdocTypedefTag.ts b/tests/cases/fourslash/server/jsdocTypedefTag.ts
index 968e30a412d..9e980114835 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTag.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTag.ts
@@ -52,37 +52,37 @@
 //// d.dogAge./*dogAge*/;
 
 goTo.marker('numberLike');
-verify.memberListContains('charAt');
-verify.memberListContains('toExponential');
+verify.completionListContains('charAt');
+verify.completionListContains('toExponential');
 
 goTo.marker('person');
-verify.memberListContains('personName');
-verify.memberListContains('personAge');
+verify.completionListContains('personName');
+verify.completionListContains('personAge');
 goTo.marker('personName');
-verify.memberListContains('charAt');
+verify.completionListContains('charAt');
 goTo.marker('personAge');
-verify.memberListContains('toExponential');
+verify.completionListContains('toExponential');
 
 goTo.marker('animal');
-verify.memberListContains('animalName');
-verify.memberListContains('animalAge');
+verify.completionListContains('animalName');
+verify.completionListContains('animalAge');
 goTo.marker('animalName');
-verify.memberListContains('charAt');
+verify.completionListContains('charAt');
 goTo.marker('animalAge');
-verify.memberListContains('toExponential');
+verify.completionListContains('toExponential');
 
 goTo.marker('dog');
-verify.memberListContains('dogName');
-verify.memberListContains('dogAge');
+verify.completionListContains('dogName');
+verify.completionListContains('dogAge');
 goTo.marker('dogName');
-verify.memberListContains('charAt');
+verify.completionListContains('charAt');
 goTo.marker('dogAge');
-verify.memberListContains('toExponential');
+verify.completionListContains('toExponential');
 
 goTo.marker('cat');
-verify.memberListContains('catName');
-verify.memberListContains('catAge');
+verify.completionListContains('catName');
+verify.completionListContains('catAge');
 goTo.marker('catName');
-verify.memberListContains('charAt');
+verify.completionListContains('charAt');
 goTo.marker('catAge');
-verify.memberListContains('toExponential');
\ No newline at end of file
+verify.completionListContains('toExponential');
\ No newline at end of file
diff --git a/tests/cases/fourslash/server/jsdocTypedefTagNamespace.ts b/tests/cases/fourslash/server/jsdocTypedefTagNamespace.ts
index 1d7a0bf318a..29330a73d3c 100644
--- a/tests/cases/fourslash/server/jsdocTypedefTagNamespace.ts
+++ b/tests/cases/fourslash/server/jsdocTypedefTagNamespace.ts
@@ -16,12 +16,12 @@
 //// var x1; x1./*3*/;
 
 goTo.marker("1");
-verify.memberListContains('charAt');
-verify.memberListContains('toExponential');
+verify.completionListContains('charAt');
+verify.completionListContains('toExponential');
 
 goTo.marker("2");
-verify.memberListContains('age');
+verify.completionListContains('age');
 
 goTo.marker("3");
-verify.memberListContains('charAt');
-verify.memberListContains('toExponential');
\ No newline at end of file
+verify.completionListContains('charAt');
+verify.completionListContains('toExponential');
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletion10.ts b/tests/cases/fourslash/tsxCompletion10.ts
index f10e014c282..d36b2369218 100644
--- a/tests/cases/fourslash/tsxCompletion10.ts
+++ b/tests/cases/fourslash/tsxCompletion10.ts
@@ -10,5 +10,5 @@
 //// var x1 = <div><//**/
 
 goTo.marker();
-verify.memberListCount(1);
+verify.completionListCount(1);
 verify.completionListContains('div');
diff --git a/tests/cases/fourslash/tsxCompletionOnClosingTag1.ts b/tests/cases/fourslash/tsxCompletionOnClosingTag1.ts
index 54a0b61879f..554dd23bcbc 100644
--- a/tests/cases/fourslash/tsxCompletionOnClosingTag1.ts
+++ b/tests/cases/fourslash/tsxCompletionOnClosingTag1.ts
@@ -10,5 +10,5 @@
 //// var x1 = <div><//**/
 
 goTo.marker();
-verify.memberListCount(1);
+verify.completionListCount(1);
 verify.completionListContains('div');
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletionOnClosingTag2.ts b/tests/cases/fourslash/tsxCompletionOnClosingTag2.ts
index a39740df586..95b18585a48 100644
--- a/tests/cases/fourslash/tsxCompletionOnClosingTag2.ts
+++ b/tests/cases/fourslash/tsxCompletionOnClosingTag2.ts
@@ -12,9 +12,9 @@
 ////    </ /*1*/>
 
 goTo.marker("1");
-verify.memberListCount(1);
+verify.completionListCount(1);
 verify.completionListContains('div');
 
 goTo.marker("2");
-verify.memberListCount(1);
+verify.completionListCount(1);
 verify.completionListContains('h1')
diff --git a/tests/cases/fourslash/tsxCompletionOnClosingTagWithoutJSX1.ts b/tests/cases/fourslash/tsxCompletionOnClosingTagWithoutJSX1.ts
index 742009b487e..7719e04a9ef 100644
--- a/tests/cases/fourslash/tsxCompletionOnClosingTagWithoutJSX1.ts
+++ b/tests/cases/fourslash/tsxCompletionOnClosingTagWithoutJSX1.ts
@@ -4,5 +4,5 @@
 //// var x1 = <div><//**/
 
 goTo.marker();
-verify.memberListCount(1);
+verify.completionListCount(1);
 verify.completionListContains('div');
\ No newline at end of file
diff --git a/tests/cases/fourslash/tsxCompletionOnClosingTagWithoutJSX2.ts b/tests/cases/fourslash/tsxCompletionOnClosingTagWithoutJSX2.ts
index 04176ba7fcb..30f40e5a41d 100644
--- a/tests/cases/fourslash/tsxCompletionOnClosingTagWithoutJSX2.ts
+++ b/tests/cases/fourslash/tsxCompletionOnClosingTagWithoutJSX2.ts
@@ -6,9 +6,9 @@
 ////    </ /*1*/>
 
 goTo.marker("1");
-verify.memberListCount(1);
+verify.completionListCount(1);
 verify.completionListContains('div');
 
 goTo.marker("2");
-verify.memberListCount(1);
+verify.completionListCount(1);
 verify.completionListContains('h1')
diff --git a/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts b/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts
index d0ef579f401..f208b0a44a4 100644
--- a/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts
+++ b/tests/cases/fourslash/tsxCompletionOnOpeningTagWithoutJSX1.ts
@@ -4,4 +4,4 @@
 //// var x = </**/;
 
 goTo.marker();
-verify.memberListCount(42);
+verify.completionListCount(42);
diff --git a/tests/cases/fourslash/unclosedStringLiteralErrorRecovery.ts b/tests/cases/fourslash/unclosedStringLiteralErrorRecovery.ts
index 138f61ccc52..88c13954ec0 100644
--- a/tests/cases/fourslash/unclosedStringLiteralErrorRecovery.ts
+++ b/tests/cases/fourslash/unclosedStringLiteralErrorRecovery.ts
@@ -8,4 +8,4 @@
 
 goTo.marker();
 // Error recovery for unclosed string literals
-verify.memberListContains('x');
+verify.completionListContains('x');
diff --git a/tests/cases/fourslash/untypedModuleImport.ts b/tests/cases/fourslash/untypedModuleImport.ts
index d128ad24ea3..da6473cf992 100644
--- a/tests/cases/fourslash/untypedModuleImport.ts
+++ b/tests/cases/fourslash/untypedModuleImport.ts
@@ -8,7 +8,6 @@
 ////[|foo|]();
 
 goTo.file("a.ts");
-debug.printErrorList();
 verify.numberOfErrorsInCurrentFile(0);
 
 goTo.marker("fooModule");