diff --git a/tests/cases/fourslash/referenceToClass.ts b/tests/cases/fourslash/referenceToClass.ts
index 1c4910a1b8..2dd0bdc3e7 100644
--- a/tests/cases/fourslash/referenceToClass.ts
+++ b/tests/cases/fourslash/referenceToClass.ts
@@ -3,7 +3,7 @@
 // Class references should work across file and not find local variables.
 
 // @Filename: referenceToClass_1.ts
-////class foo/*1*/ {
+////class /*1*/foo {
 ////    public n: /*2*/foo;
 ////    public foo: number;
 ////}
diff --git a/tests/cases/fourslash/referencesForClassLocal.ts b/tests/cases/fourslash/referencesForClassLocal.ts
index fd42bfa90f..3351bcd1af 100644
--- a/tests/cases/fourslash/referencesForClassLocal.ts
+++ b/tests/cases/fourslash/referencesForClassLocal.ts
@@ -1,30 +1,27 @@
-/// <reference path='fourslash.ts'/>
-
-// References to local inside a class.
-
-////var n = 14;
-////
-////class foo {
-////    private /*1*/n = 0;
-////
-////    public bar() {
-////        this.n = 9;
-////    }
-////
-////    constructor() {
-////        this.n/*2*/ = 4;
-////    }
-////
-////    public bar2() {
-////        var n = 12;
-////    }
-////}
-
-// this line triggers a semantic/syntactic error check, remove line when 788570 is fixed
-edit.insert('');
-
-goTo.marker("1");
-verify.referencesCountIs(3);
-
-goTo.marker("2");
+/// <reference path='fourslash.ts'/>
+
+// References to local inside a class.
+
+////var n = 14;
+////
+////class foo {
+////    private /*1*/n = 0;
+////
+////    public bar() {
+////        this.n = 9;
+////    }
+////
+////    constructor() {
+////        this./*2*/n = 4;
+////    }
+////
+////    public bar2() {
+////        var n = 12;
+////    }
+////}
+
+goTo.marker("1");
+verify.referencesCountIs(3);
+
+goTo.marker("2");
 verify.referencesCountIs(3);
\ No newline at end of file
diff --git a/tests/cases/fourslash/referencesForFunctionParameter.ts b/tests/cases/fourslash/referencesForFunctionParameter.ts
index 412308e2b9..b8ffc5f639 100644
--- a/tests/cases/fourslash/referencesForFunctionParameter.ts
+++ b/tests/cases/fourslash/referencesForFunctionParameter.ts
@@ -3,7 +3,7 @@
 ////var x;
 ////var n;
 ////
-////function n(x: number, n/*1*/: number) {
+////function n(x: number, /*1*/n: number) {
 ////    /*2*/n = 32;
 ////    x = n;
 ////}
diff --git a/tests/cases/fourslash/referencesForOverrides.ts b/tests/cases/fourslash/referencesForOverrides.ts
index df3a6f208a..16e69be01a 100644
--- a/tests/cases/fourslash/referencesForOverrides.ts
+++ b/tests/cases/fourslash/referencesForOverrides.ts
@@ -73,12 +73,12 @@
 
 // References to a field declared in a base class.
 goTo.marker("1");
-verify.referencesCountIs(3);
+verify.referencesCountIs(2);
 
 // References to a field declared in a base interface.
 goTo.marker("2");
-verify.referencesCountIs(3);
+verify.referencesCountIs(2);
 
 // References to a field declared in a chain of base class and interfaces.
 goTo.marker("3");
-verify.referencesCountIs(6);
+verify.referencesCountIs(2);
diff --git a/tests/cases/fourslash/referencesForStatic.ts b/tests/cases/fourslash/referencesForStatic.ts
index ec2f2631a5..97a88a9278 100644
--- a/tests/cases/fourslash/referencesForStatic.ts
+++ b/tests/cases/fourslash/referencesForStatic.ts
@@ -17,7 +17,7 @@
 ////}
 ////
 ////class foo2 {
-////    private x = foo.n/*2*/;
+////    private x = foo./*2*/n;
 ////    constructor() {
 ////        foo./*3*/n = x;
 ////    }