diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt
new file mode 100644
index 00000000000..c76c6e819df
--- /dev/null
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.errors.txt
@@ -0,0 +1,50 @@
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(13,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r1' must be of type 'string', but here has type 'number'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(20,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r2' must be of type 'boolean', but here has type 'string'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(27,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r3' must be of type 'number', but here has type 'boolean'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts(34,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r4' must be of type 'C', but here has type 'string'.
+
+
+==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts (4 errors) ====
+    class C { private p: string };
+    
+    var strOrNum: string | number;
+    var strOrBool: string | boolean;
+    var numOrBool: number | boolean
+    var strOrC: string | C;
+    
+    // typeof x == s has not effect on typeguard
+    if (typeof strOrNum == "string") {
+        var r1 = strOrNum; // string | number
+    }
+    else {
+        var r1 = strOrNum; // string | number
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r1' must be of type 'string', but here has type 'number'.
+    }
+    
+    if (typeof strOrBool == "boolean") {
+        var r2 = strOrBool; // string | boolean
+    }
+    else {
+        var r2 = strOrBool; // string | boolean
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r2' must be of type 'boolean', but here has type 'string'.
+    }
+    
+    if (typeof numOrBool == "number") {
+        var r3 = numOrBool; // number | boolean
+    }
+    else {
+        var r3 =  numOrBool; // number | boolean
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r3' must be of type 'number', but here has type 'boolean'.
+    }
+    
+    if (typeof strOrC == "Object") {
+        var r4 = strOrC; // string | C
+    }
+    else {
+        var r4 = strOrC; // string | C
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r4' must be of type 'C', but here has type 'string'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.symbols
deleted file mode 100644
index 69e0dc78738..00000000000
--- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.symbols
+++ /dev/null
@@ -1,70 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts ===
-class C { private p: string };
->C : Symbol(C, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 0, 0))
->p : Symbol(p, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 0, 9))
-
-var strOrNum: string | number;
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
-
-var strOrBool: string | boolean;
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
-
-var numOrBool: number | boolean
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
-
-var strOrC: string | C;
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 0, 0))
-
-// typeof x == s has not effect on typeguard
-if (typeof strOrNum == "string") {
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
-
-    var r1 = strOrNum; // string | number
->r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
-}
-else {
-    var r1 = strOrNum; // string | number
->r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 2, 3))
-}
-
-if (typeof strOrBool == "boolean") {
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
-
-    var r2 = strOrBool; // string | boolean
->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
-}
-else {
-    var r2 = strOrBool; // string | boolean
->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 3, 3))
-}
-
-if (typeof numOrBool == "number") {
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
-
-    var r3 = numOrBool; // number | boolean
->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
-}
-else {
-    var r3 =  numOrBool; // number | boolean
->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 4, 3))
-}
-
-if (typeof strOrC == "Object") {
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
-
-    var r4 = strOrC; // string | C
->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
-}
-else {
-    var r4 = strOrC; // string | C
->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts, 5, 3))
-}
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types
deleted file mode 100644
index 4bfc8fe6bf1..00000000000
--- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.types
+++ /dev/null
@@ -1,82 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfEqualEqualHasNoEffect.ts ===
-class C { private p: string };
->C : C
->p : string
-
-var strOrNum: string | number;
->strOrNum : string | number
-
-var strOrBool: string | boolean;
->strOrBool : string | boolean
-
-var numOrBool: number | boolean
->numOrBool : number | boolean
-
-var strOrC: string | C;
->strOrC : string | C
->C : C
-
-// typeof x == s has not effect on typeguard
-if (typeof strOrNum == "string") {
->typeof strOrNum == "string" : boolean
->typeof strOrNum : string
->strOrNum : string | number
->"string" : string
-
-    var r1 = strOrNum; // string | number
->r1 : string | number
->strOrNum : string | number
-}
-else {
-    var r1 = strOrNum; // string | number
->r1 : string | number
->strOrNum : string | number
-}
-
-if (typeof strOrBool == "boolean") {
->typeof strOrBool == "boolean" : boolean
->typeof strOrBool : string
->strOrBool : string | boolean
->"boolean" : string
-
-    var r2 = strOrBool; // string | boolean
->r2 : string | boolean
->strOrBool : string | boolean
-}
-else {
-    var r2 = strOrBool; // string | boolean
->r2 : string | boolean
->strOrBool : string | boolean
-}
-
-if (typeof numOrBool == "number") {
->typeof numOrBool == "number" : boolean
->typeof numOrBool : string
->numOrBool : number | boolean
->"number" : string
-
-    var r3 = numOrBool; // number | boolean
->r3 : number | boolean
->numOrBool : number | boolean
-}
-else {
-    var r3 =  numOrBool; // number | boolean
->r3 : number | boolean
->numOrBool : number | boolean
-}
-
-if (typeof strOrC == "Object") {
->typeof strOrC == "Object" : boolean
->typeof strOrC : string
->strOrC : string | C
->"Object" : string
-
-    var r4 = strOrC; // string | C
->r4 : string | C
->strOrC : string | C
-}
-else {
-    var r4 = strOrC; // string | C
->r4 : string | C
->strOrC : string | C
-}
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt
new file mode 100644
index 00000000000..3b29f3ecba8
--- /dev/null
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.errors.txt
@@ -0,0 +1,50 @@
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(13,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r1' must be of type 'number', but here has type 'string'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(20,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r2' must be of type 'string', but here has type 'boolean'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(27,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r3' must be of type 'boolean', but here has type 'number'.
+tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts(34,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'r4' must be of type 'string', but here has type 'C'.
+
+
+==== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts (4 errors) ====
+    class C { private p: string };
+    
+    var strOrNum: string | number;
+    var strOrBool: string | boolean;
+    var numOrBool: number | boolean
+    var strOrC: string | C;
+    
+    // typeof x != s has not effect on typeguard
+    if (typeof strOrNum != "string") {
+        var r1 = strOrNum; // string | number
+    }
+    else {
+        var r1 = strOrNum; // string | number
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r1' must be of type 'number', but here has type 'string'.
+    }
+    
+    if (typeof strOrBool != "boolean") {
+        var r2 = strOrBool; // string | boolean
+    }
+    else {
+        var r2 = strOrBool; // string | boolean
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r2' must be of type 'string', but here has type 'boolean'.
+    }
+    
+    if (typeof numOrBool != "number") {
+        var r3 = numOrBool; // number | boolean
+    }
+    else {
+        var r3 = numOrBool; // number | boolean
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r3' must be of type 'boolean', but here has type 'number'.
+    }
+    
+    if (typeof strOrC != "Object") {
+        var r4 = strOrC; // string | C
+    }
+    else {
+        var r4 = strOrC; // string | C
+            ~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'r4' must be of type 'string', but here has type 'C'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.symbols b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.symbols
deleted file mode 100644
index b22f1e313a4..00000000000
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.symbols
+++ /dev/null
@@ -1,70 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts ===
-class C { private p: string };
->C : Symbol(C, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 0, 0))
->p : Symbol(p, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 0, 9))
-
-var strOrNum: string | number;
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
-
-var strOrBool: string | boolean;
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
-
-var numOrBool: number | boolean
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
-
-var strOrC: string | C;
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
->C : Symbol(C, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 0, 0))
-
-// typeof x != s has not effect on typeguard
-if (typeof strOrNum != "string") {
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
-
-    var r1 = strOrNum; // string | number
->r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
-}
-else {
-    var r1 = strOrNum; // string | number
->r1 : Symbol(r1, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 9, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 12, 7))
->strOrNum : Symbol(strOrNum, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 2, 3))
-}
-
-if (typeof strOrBool != "boolean") {
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
-
-    var r2 = strOrBool; // string | boolean
->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
-}
-else {
-    var r2 = strOrBool; // string | boolean
->r2 : Symbol(r2, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 16, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 19, 7))
->strOrBool : Symbol(strOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 3, 3))
-}
-
-if (typeof numOrBool != "number") {
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
-
-    var r3 = numOrBool; // number | boolean
->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
-}
-else {
-    var r3 = numOrBool; // number | boolean
->r3 : Symbol(r3, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 23, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 26, 7))
->numOrBool : Symbol(numOrBool, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 4, 3))
-}
-
-if (typeof strOrC != "Object") {
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
-
-    var r4 = strOrC; // string | C
->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
-}
-else {
-    var r4 = strOrC; // string | C
->r4 : Symbol(r4, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 30, 7), Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 33, 7))
->strOrC : Symbol(strOrC, Decl(typeGuardOfFormTypeOfNotEqualHasNoEffect.ts, 5, 3))
-}
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types
deleted file mode 100644
index 6eabeb25ede..00000000000
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.types
+++ /dev/null
@@ -1,82 +0,0 @@
-=== tests/cases/conformance/expressions/typeGuards/typeGuardOfFormTypeOfNotEqualHasNoEffect.ts ===
-class C { private p: string };
->C : C
->p : string
-
-var strOrNum: string | number;
->strOrNum : string | number
-
-var strOrBool: string | boolean;
->strOrBool : string | boolean
-
-var numOrBool: number | boolean
->numOrBool : number | boolean
-
-var strOrC: string | C;
->strOrC : string | C
->C : C
-
-// typeof x != s has not effect on typeguard
-if (typeof strOrNum != "string") {
->typeof strOrNum != "string" : boolean
->typeof strOrNum : string
->strOrNum : string | number
->"string" : string
-
-    var r1 = strOrNum; // string | number
->r1 : string | number
->strOrNum : string | number
-}
-else {
-    var r1 = strOrNum; // string | number
->r1 : string | number
->strOrNum : string | number
-}
-
-if (typeof strOrBool != "boolean") {
->typeof strOrBool != "boolean" : boolean
->typeof strOrBool : string
->strOrBool : string | boolean
->"boolean" : string
-
-    var r2 = strOrBool; // string | boolean
->r2 : string | boolean
->strOrBool : string | boolean
-}
-else {
-    var r2 = strOrBool; // string | boolean
->r2 : string | boolean
->strOrBool : string | boolean
-}
-
-if (typeof numOrBool != "number") {
->typeof numOrBool != "number" : boolean
->typeof numOrBool : string
->numOrBool : number | boolean
->"number" : string
-
-    var r3 = numOrBool; // number | boolean
->r3 : number | boolean
->numOrBool : number | boolean
-}
-else {
-    var r3 = numOrBool; // number | boolean
->r3 : number | boolean
->numOrBool : number | boolean
-}
-
-if (typeof strOrC != "Object") {
->typeof strOrC != "Object" : boolean
->typeof strOrC : string
->strOrC : string | C
->"Object" : string
-
-    var r4 = strOrC; // string | C
->r4 : string | C
->strOrC : string | C
-}
-else {
-    var r4 = strOrC; // string | C
->r4 : string | C
->strOrC : string | C
-}