diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index 7c53d70f591..6e5a1409856 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -153,6 +153,8 @@ module ts {
         External_module_0_has_no_default_export_or_export_assignment: { code: 1192, category: DiagnosticCategory.Error, key: "External module '{0}' has no default export or export assignment." },
         An_export_declaration_cannot_have_modifiers: { code: 1193, category: DiagnosticCategory.Error, key: "An export declaration cannot have modifiers." },
         Export_declarations_are_not_permitted_in_an_internal_module: { code: 1194, category: DiagnosticCategory.Error, key: "Export declarations are not permitted in an internal module." },
+        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1195, category: DiagnosticCategory.Error, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
+        expected: { code: 1196, category: DiagnosticCategory.Error, key: "'}' expected." },
         Duplicate_identifier_0: { code: 2300, category: DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
         Static_members_cannot_reference_class_type_parameters: { code: 2302, category: DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 7a7efe4e43c..dc2c9b29bb5 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -603,7 +603,14 @@
         "category": "Error",
         "code": 1194
     },
-
+    "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.": {
+        "category": "Error",
+        "code": 1195
+    },
+    "'}' expected.": {
+        "category": "Error",
+        "code":  1196
+    },
     "Duplicate identifier '{0}'.": {
         "category": "Error",
         "code": 2300
@@ -1572,7 +1579,7 @@
     "Exported type alias '{0}' has or is using private name '{1}'.": {
         "category": "Error",
         "code": 4081
-    },
+    },
     "The current host does not support the '{0}' option.": {
         "category": "Error",
         "code": 5001
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 6ee71b7e494..5e3a7e3a112 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -774,11 +774,44 @@ module ts {
                     return "\'";
                 case CharacterCodes.doubleQuote:
                     return "\"";
-                case CharacterCodes.x:
                 case CharacterCodes.u:
-                    var ch = scanExactNumberOfHexDigits(ch === CharacterCodes.x ? 2 : 4);
-                    if (ch >= 0) {
-                        return String.fromCharCode(ch);
+                    if (text.charCodeAt(pos) === CharacterCodes.openBrace) {
+                        pos++;
+                        var escapedValue = scanMinimumNumberOfHexDigits(1);
+                        
+                        if (escapedValue < 0) {
+                            // TODO(drosen): give a proper error message for escaped values that are too large.
+                            error(Diagnostics.Hexadecimal_digit_expected)
+                            return "";
+                        }
+                        
+                        if (escapedValue > 0x10FFFF) {
+                            error(Diagnostics.An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive);
+                            return "";
+                        }
+                        
+                        if (pos >= len) {
+                            error(Diagnostics.Unexpected_end_of_text);
+                            return "";
+                        }
+                        
+                        // Only swallow the following character up if it's a '}'.
+                        var escapeTerminator = text.charCodeAt(pos);
+                        if (escapeTerminator == CharacterCodes.closeBrace) {
+                            pos++;
+                        }
+                        else {
+                            // '}' expected.
+                            error(Diagnostics.expected);
+                        }
+                        
+                        return utf16EncodeAsString(escapedValue);
+                    }
+                    // fall through
+                case CharacterCodes.x:
+                    var escapedValue = scanExactNumberOfHexDigits(ch === CharacterCodes.x ? 2 : 4);
+                    if (escapedValue >= 0) {
+                        return String.fromCharCode(escapedValue);
                     }
                     else {
                         error(Diagnostics.Hexadecimal_digit_expected);
@@ -800,6 +833,20 @@ module ts {
                     return String.fromCharCode(ch);
             }
         }
+        
+        // Derived from the 10.1.1 UTF16Encoding of the ES6 Spec.
+        function utf16EncodeAsString(codePoint: number): string {
+            Debug.assert(0x0 <= codePoint && codePoint <= 0x10FFFF);
+            
+            if (codePoint <= 65535) {
+                return String.fromCharCode(codePoint);
+            }
+            
+            var codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800;
+            var codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00;
+            
+            return String.fromCharCode(codeUnit1, codeUnit2);
+        }
 
         // Current character is known to be a backslash. Check for Unicode escape of the form '\uXXXX'
         // and return code point value if valid Unicode escape is found. Otherwise return -1.
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.errors.txt
deleted file mode 100644
index df3def2cb22..00000000000
--- a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapes.ts(4,7): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapes.ts (1 errors) ====
-    function f(...args: any[]) {
-    }
-    
-    f `'\u{1f4a9}'${ " should be converted to " }'\uD83D\uDCA9'`;
-          
-!!! error TS1125: Hexadecimal digit expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
index bcf0732218a..e2f6b608f96 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.js
@@ -11,5 +11,5 @@ function f() {
         args[_i - 0] = arguments[_i];
     }
 }
-(_a = ["'{1f4a9}'", "'💩'"], _a.raw = ["'\\u{1f4a9}'", "'\\uD83D\\uDCA9'"], f(_a, " should be converted to "));
+(_a = ["'💩'", "'💩'"], _a.raw = ["'\\u{1f4a9}'", "'\\uD83D\\uDCA9'"], f(_a, " should be converted to "));
 var _a;
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.types b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.types
new file mode 100644
index 00000000000..30c27d376d1
--- /dev/null
+++ b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapes.types
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapes.ts ===
+function f(...args: any[]) {
+>f : (...args: any[]) => void
+>args : any[]
+}
+
+f `'\u{1f4a9}'${ " should be converted to " }'\uD83D\uDCA9'`;
+>f : (...args: any[]) => void
+
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.errors.txt b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.errors.txt
deleted file mode 100644
index c48b43dc3ff..00000000000
--- a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapesES6.ts(4,7): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapesES6.ts (1 errors) ====
-    function f(...args: any[]) {
-    }
-    
-    f `'\u{1f4a9}'${ " should be converted to " }'\uD83D\uDCA9'`;
-          
-!!! error TS1125: Hexadecimal digit expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.types b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.types
new file mode 100644
index 00000000000..d3c9ad68c21
--- /dev/null
+++ b/tests/baselines/reference/taggedTemplateStringsWithUnicodeEscapesES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/taggedTemplateStringsWithUnicodeEscapesES6.ts ===
+function f(...args: any[]) {
+>f : (...args: any[]) => void
+>args : any[]
+}
+
+f `'\u{1f4a9}'${ " should be converted to " }'\uD83D\uDCA9'`;
+>f : (...args: any[]) => void
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.errors.txt
deleted file mode 100644
index f6e522c7462..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts (1 errors) ====
-    
-    var x = "\u{0}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.types
new file mode 100644
index 00000000000..7dec031af28
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES5.ts ===
+
+var x = "\u{0}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.errors.txt
deleted file mode 100644
index 6e807fdae9d..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts (1 errors) ====
-    
-    var x = "\u{0}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.types
new file mode 100644
index 00000000000..77e507e0129
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings01_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings01_ES6.ts ===
+
+var x = "\u{0}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.errors.txt
deleted file mode 100644
index b5b874edfb3..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts (1 errors) ====
-    
-    var x = "\u{00}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.types
new file mode 100644
index 00000000000..9ab14e5e1ad
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES5.ts ===
+
+var x = "\u{00}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.errors.txt
deleted file mode 100644
index c779458cfb3..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts (1 errors) ====
-    
-    var x = "\u{00}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.types
new file mode 100644
index 00000000000..37178d5c390
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings02_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings02_ES6.ts ===
+
+var x = "\u{00}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.errors.txt
deleted file mode 100644
index 68620245fb3..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts (1 errors) ====
-    
-    var x = "\u{0000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.types
new file mode 100644
index 00000000000..1b601533fe1
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES5.ts ===
+
+var x = "\u{0000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.errors.txt
deleted file mode 100644
index b2cc2e1abb1..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts (1 errors) ====
-    
-    var x = "\u{0000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.types
new file mode 100644
index 00000000000..b1ec28bfe07
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings03_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings03_ES6.ts ===
+
+var x = "\u{0000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.errors.txt
deleted file mode 100644
index f0a76a1b1f9..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts (1 errors) ====
-    
-    var x = "\u{00000000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.types
new file mode 100644
index 00000000000..c7d45d6b086
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES5.ts ===
+
+var x = "\u{00000000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.errors.txt
deleted file mode 100644
index ad73340bbf6..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts (1 errors) ====
-    
-    var x = "\u{00000000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.types
new file mode 100644
index 00000000000..f1f2a2937de
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings04_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings04_ES6.ts ===
+
+var x = "\u{00000000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.errors.txt
deleted file mode 100644
index 66de2730a0f..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,42): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,48): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,54): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,60): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts(2,72): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts (11 errors) ====
-    
-    var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                         
-!!! error TS1125: Hexadecimal digit expected.
-                                                               
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                           
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.types
new file mode 100644
index 00000000000..9e096784155
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES5.ts ===
+
+var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.errors.txt
deleted file mode 100644
index 10ea76fcd97..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,42): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,48): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,54): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,60): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts(2,72): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts (11 errors) ====
-    
-    var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                         
-!!! error TS1125: Hexadecimal digit expected.
-                                                               
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                           
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.types
new file mode 100644
index 00000000000..febfe78595c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings05_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings05_ES6.ts ===
+
+var x = "\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.errors.txt
deleted file mode 100644
index 78b8ebf73db..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-    var x = "\u{10FFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.types
new file mode 100644
index 00000000000..fb979e6b7ba
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES5.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{10FFFF}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.errors.txt
deleted file mode 100644
index 07bfa2803bf..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-    var x = "\u{10FFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.types
new file mode 100644
index 00000000000..e61467ab47f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings06_ES6.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings06_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = "\u{10FFFF}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt
index e2e5a278269..345d53cdc65 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts(4,19): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES5.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrin
     // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
     //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
     var x = "\u{110000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                      
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt
index 9ce28a36922..497ccf480cf 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings07_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts(4,19): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings07_ES6.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrin
     // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
     //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
     var x = "\u{110000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                      
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.errors.txt
deleted file mode 100644
index 2082a82583d..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (FFFF == 65535)
-    var x = "\u{FFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.types
new file mode 100644
index 00000000000..31a6a586dff
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = "\u{FFFF}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.errors.txt
deleted file mode 100644
index 7e91f7ce891..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (FFFF == 65535)
-    var x = "\u{FFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.types
new file mode 100644
index 00000000000..5060bb11305
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings08_ES6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings08_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = "\u{FFFF}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.errors.txt
deleted file mode 100644
index 1df05a3d270..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (10000 == 65536)
-    var x = "\u{10000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.types
new file mode 100644
index 00000000000..ffc1bb7d67d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = "\u{10000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.errors.txt
deleted file mode 100644
index eda5060456d..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (10000 == 65536)
-    var x = "\u{10000}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.types
new file mode 100644
index 00000000000..e7a303a0699
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings09_ES6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings09_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = "\u{10000}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.errors.txt
deleted file mode 100644
index a3c99aaf5dd..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
-    // Although we should just get back a single code point value of 0xD800,
-    // this is a useful edge-case test.
-    var x = "\u{D800}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.types
new file mode 100644
index 00000000000..bbe19a788a0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES5.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = "\u{D800}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.errors.txt
deleted file mode 100644
index 0a7876cfc71..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
-    // Although we should just get back a single code point value of 0xD800,
-    // this is a useful edge-case test.
-    var x = "\u{D800}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.types
new file mode 100644
index 00000000000..6ce1f692cec
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings10_ES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings10_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = "\u{D800}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.errors.txt
deleted file mode 100644
index da8207b2e11..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
-    // Although we should just get back a single code point value of 0xDC00,
-    // this is a useful edge-case test.
-    var x = "\u{DC00}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.types
new file mode 100644
index 00000000000..b413a2a5509
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES5.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = "\u{DC00}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.errors.txt
deleted file mode 100644
index 51357e5b7a6..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
-    // Although we should just get back a single code point value of 0xDC00,
-    // this is a useful edge-case test.
-    var x = "\u{DC00}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.types
new file mode 100644
index 00000000000..b07f9f0a35d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings11_ES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings11_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = "\u{DC00}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt
index 4a311e3460b..b85e959f5d3 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts(2,21): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES5.ts (1 errors) ====
     
     var x = "\u{FFFFFFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                        
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt
index 238cfb17813..1aa973df3ff 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings12_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts(2,21): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings12_ES6.ts (1 errors) ====
     
     var x = "\u{FFFFFFFF}";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                        
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.errors.txt
deleted file mode 100644
index 581ab88da40..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts (1 errors) ====
-    
-    var x = "\u{DDDDD}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.types
new file mode 100644
index 00000000000..597e10ab6dc
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES5.ts ===
+
+var x = "\u{DDDDD}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.errors.txt
deleted file mode 100644
index 9ffeb1ac441..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts (1 errors) ====
-    
-    var x = "\u{DDDDD}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.types
new file mode 100644
index 00000000000..c0092e04c5f
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings13_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings13_ES6.ts ===
+
+var x = "\u{DDDDD}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt
index e886e90ff3a..76abc30d5eb 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES5.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts(3,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts(3,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES5.ts (1 errors) ====
     
     // Shouldn't work, negatives are not allowed.
     var x = "\u{-DDDD}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt
index 5a253a2408a..4ccf4311b33 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings14_ES6.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts(3,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts(3,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings14_ES6.ts (1 errors) ====
     
     // Shouldn't work, negatives are not allowed.
     var x = "\u{-DDDD}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.errors.txt
deleted file mode 100644
index 74035937ab6..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts (4 errors) ====
-    
-    var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.types
new file mode 100644
index 00000000000..449bd7d2bdc
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES5.ts ===
+
+var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.errors.txt
deleted file mode 100644
index a265dd8ab92..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts (4 errors) ====
-    
-    var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.types
new file mode 100644
index 00000000000..c4352dd72e0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings15_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings15_ES6.ts ===
+
+var x = "\u{abcd}\u{ef12}\u{3456}\u{7890}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.errors.txt
deleted file mode 100644
index 8df651f156a..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts (4 errors) ====
-    
-    var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.types
new file mode 100644
index 00000000000..cd295c84253
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES5.ts ===
+
+var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.errors.txt
deleted file mode 100644
index a4d23fd81df..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts (4 errors) ====
-    
-    var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.types
new file mode 100644
index 00000000000..f63afc17b1c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings16_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings16_ES6.ts ===
+
+var x = "\u{ABCD}\u{EF12}\u{3456}\u{7890}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt
index f67b264b0a3..ddf4b8dba7a 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES5.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,17): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,22): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,13): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts(2,23): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES5.ts (3 errors) ====
     
     var x = "\u{r}\u{n}\u{t}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
-                    
+                     
 !!! error TS1125: Hexadecimal digit expected.
-                         
+                          
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt
index 1823486dc80..b338efb03e5 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings17_ES6.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,17): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,22): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,13): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts(2,23): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings17_ES6.ts (3 errors) ====
     
     var x = "\u{r}\u{n}\u{t}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
-                    
+                     
 !!! error TS1125: Hexadecimal digit expected.
-                         
+                          
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.errors.txt
deleted file mode 100644
index 7c4aaa7d01f..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts (2 errors) ====
-    
-    var x = "\u{65}\u{65}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.types
new file mode 100644
index 00000000000..34343989c5b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES5.ts ===
+
+var x = "\u{65}\u{65}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.errors.txt
deleted file mode 100644
index cb680b2f826..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts (2 errors) ====
-    
-    var x = "\u{65}\u{65}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.types
new file mode 100644
index 00000000000..615682a283a
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings18_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings18_ES6.ts ===
+
+var x = "\u{65}\u{65}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt
index 961a83f50a9..b670f28fe69 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES5.ts (1 errors) ====
     
     var x = "\u{}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt
index cc780a79e8d..9ddc49eff1b 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings19_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings19_ES6.ts (1 errors) ====
     
     var x = "\u{}";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt
index de3746f77cf..949d0a95ae7 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES5.ts (1 errors) ====
     
     var x = "\u{";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt
index ab0c756306b..94297328683 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings20_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings20_ES6.ts (1 errors) ====
     
     var x = "\u{";
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
index c626a43d75b..fa5b59f7c14 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts(2,15): error TS1196: '}' expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES5.ts (1 errors) ====
     
     var x = "\u{67";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                  
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
index 345161440ab..bc0c46e44b0 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings21_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts(2,15): error TS1196: '}' expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings21_ES6.ts (1 errors) ====
     
     var x = "\u{67";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                  
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
index 90979077107..d64bb4e6768 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts(2,27): error TS1196: '}' expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES5.ts (1 errors) ====
     
     var x = "\u{00000000000067";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                              
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
index dcabb7f4cf7..9adf18df0d4 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings22_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts(2,27): error TS1196: '}' expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings22_ES6.ts (1 errors) ====
     
     var x = "\u{00000000000067";
-               
-!!! error TS1125: Hexadecimal digit expected.
+                              
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.errors.txt
deleted file mode 100644
index b68a8add103..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts (1 errors) ====
-    
-    var x = "\u{00000000000067}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.types
new file mode 100644
index 00000000000..63bcf370516
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES5.ts ===
+
+var x = "\u{00000000000067}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.errors.txt
deleted file mode 100644
index 2f91b0ac308..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts (1 errors) ====
-    
-    var x = "\u{00000000000067}";
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.types
new file mode 100644
index 00000000000..2601f602869
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings23_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings23_ES6.ts ===
+
+var x = "\u{00000000000067}";
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
index 287b87a042e..45127ca4157 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES5.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,27): error TS1002: Unterminated string literal.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts(2,27): error TS1196: '}' expected.
 
 
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts (2 errors) ====
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES5.ts (1 errors) ====
     
     var x = "\u{00000000000067
-               
-!!! error TS1125: Hexadecimal digit expected.
                               
-!!! error TS1002: Unterminated string literal.
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
index 5bfce61a2d7..7b78c16c8c4 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings24_ES6.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,27): error TS1002: Unterminated string literal.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts(2,27): error TS1196: '}' expected.
 
 
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts (2 errors) ====
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings24_ES6.ts (1 errors) ====
     
     var x = "\u{00000000000067
-               
-!!! error TS1125: Hexadecimal digit expected.
                               
-!!! error TS1002: Unterminated string literal.
+!!! error TS1196: '}' expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt
index 5e1b4fdb757..afa8fa143c0 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES5.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts(2,28): error TS1002: Unterminated string literal.
 
 
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts (2 errors) ====
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES5.ts (1 errors) ====
     
     var x = "\u{00000000000067}
-               
-!!! error TS1125: Hexadecimal digit expected.
                                
 !!! error TS1002: Unterminated string literal.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt
index 65d5175eca6..7118024206e 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInStrings25_ES6.errors.txt
@@ -1,12 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
 tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts(2,28): error TS1002: Unterminated string literal.
 
 
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts (2 errors) ====
+==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInStrings25_ES6.ts (1 errors) ====
     
     var x = "\u{00000000000067}
-               
-!!! error TS1125: Hexadecimal digit expected.
                                
 !!! error TS1002: Unterminated string literal.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.errors.txt
deleted file mode 100644
index 493285c5ef2..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts (1 errors) ====
-    
-    var x = `\u{0}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js
index 2fdab7d7e05..1b312d2431d 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{0}`;
 
 
 //// [unicodeExtendedEscapesInTemplates01_ES5.js]
-var x = "{0}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.types
new file mode 100644
index 00000000000..e0108da5696
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES5.ts ===
+
+var x = `\u{0}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.errors.txt
deleted file mode 100644
index 1de4bf97d76..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts (1 errors) ====
-    
-    var x = `\u{0}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.types
new file mode 100644
index 00000000000..f8aed1df464
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates01_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates01_ES6.ts ===
+
+var x = `\u{0}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.errors.txt
deleted file mode 100644
index d74b1ae9695..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts (1 errors) ====
-    
-    var x = `\u{00}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js
index cfcd7fcd2ba..05bb8d6eaec 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{00}`;
 
 
 //// [unicodeExtendedEscapesInTemplates02_ES5.js]
-var x = "{00}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.types
new file mode 100644
index 00000000000..da23666c4f7
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES5.ts ===
+
+var x = `\u{00}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.errors.txt
deleted file mode 100644
index 84bbc74ab8b..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts (1 errors) ====
-    
-    var x = `\u{00}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.types
new file mode 100644
index 00000000000..008d41b6793
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates02_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates02_ES6.ts ===
+
+var x = `\u{00}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.errors.txt
deleted file mode 100644
index 6de8745cf1d..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts (1 errors) ====
-    
-    var x = `\u{0000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js
index 99aba05ca1f..0ded955b074 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{0000}`;
 
 
 //// [unicodeExtendedEscapesInTemplates03_ES5.js]
-var x = "{0000}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.types
new file mode 100644
index 00000000000..3465eeedae3
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES5.ts ===
+
+var x = `\u{0000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.errors.txt
deleted file mode 100644
index 9ee2d70fc69..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts (1 errors) ====
-    
-    var x = `\u{0000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.types
new file mode 100644
index 00000000000..f47d8b6f8de
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates03_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates03_ES6.ts ===
+
+var x = `\u{0000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.errors.txt
deleted file mode 100644
index e80bbd659bb..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts (1 errors) ====
-    
-    var x = `\u{00000000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js
index 372be222ada..01d86e88a02 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{00000000}`;
 
 
 //// [unicodeExtendedEscapesInTemplates04_ES5.js]
-var x = "{00000000}";
+var x = "\0";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.types
new file mode 100644
index 00000000000..ed85074ce7b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES5.ts ===
+
+var x = `\u{00000000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.errors.txt
deleted file mode 100644
index 68964b1d943..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts (1 errors) ====
-    
-    var x = `\u{00000000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.types
new file mode 100644
index 00000000000..134d7e74d97
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates04_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates04_ES6.ts ===
+
+var x = `\u{00000000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.errors.txt
deleted file mode 100644
index e9b54c58b2c..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,42): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,48): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,54): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,60): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts(2,72): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts (11 errors) ====
-    
-    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                         
-!!! error TS1125: Hexadecimal digit expected.
-                                                               
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                           
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js
index 766c61601fa..58372d69e9c 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
 
 
 //// [unicodeExtendedEscapesInTemplates05_ES5.js]
-var x = "{48}{65}{6c}{6c}{6f}{20}{77}{6f}{72}{6c}{64}";
+var x = "Hello world";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.types
new file mode 100644
index 00000000000..4c2d3bcaabd
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES5.ts ===
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.errors.txt
deleted file mode 100644
index a00ecb7c2fe..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,42): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,48): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,54): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,60): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts(2,72): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts (11 errors) ====
-    
-    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                         
-!!! error TS1125: Hexadecimal digit expected.
-                                                               
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                           
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.types
new file mode 100644
index 00000000000..b7ea9bdacb7
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates05_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates05_ES6.ts ===
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.errors.txt
deleted file mode 100644
index f803765e0a4..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-    var x = `\u{10FFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
index dd554fd3f34..cb470d5adf6 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.js
@@ -8,4 +8,4 @@ var x = `\u{10FFFF}`;
 //// [unicodeExtendedEscapesInTemplates06_ES5.js]
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-var x = "{10FFFF}";
+var x = "􏿿";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.types
new file mode 100644
index 00000000000..7df17768955
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES5.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{10FFFF}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.errors.txt
deleted file mode 100644
index f31fcb00106..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-    var x = `\u{10FFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.types
new file mode 100644
index 00000000000..c1c62840534
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates06_ES6.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates06_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
+var x = `\u{10FFFF}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt
index 9b291aae179..8a4e1603e39 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts(4,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts(4,19): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES5.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTempl
     // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
     //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
     var x = `\u{110000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
+                      
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
index f9a423a6bb0..0411061e3eb 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES5.js
@@ -8,4 +8,4 @@ var x = `\u{110000}`;
 //// [unicodeExtendedEscapesInTemplates07_ES5.js]
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
-var x = "{110000}";
+var x = "}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt
index ac2d5f84d83..c81272fc1b0 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates07_ES6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts(4,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts(4,19): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates07_ES6.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTempl
     // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
     //  1. Assert: 0 ≤ cp ≤ 0x10FFFF.
     var x = `\u{110000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
+                      
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.errors.txt
deleted file mode 100644
index 905f5e54549..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (FFFF == 65535)
-    var x = `\u{FFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
index b7d70f1d78f..03445e734b1 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.js
@@ -10,4 +10,4 @@ var x = `\u{FFFF}`;
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  2. If cp ≤ 65535, return cp.
 // (FFFF == 65535)
-var x = "{FFFF}";
+var x = "￿";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.types
new file mode 100644
index 00000000000..f889bd268e8
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = `\u{FFFF}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.errors.txt
deleted file mode 100644
index 51c436e0736..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (FFFF == 65535)
-    var x = `\u{FFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.types
new file mode 100644
index 00000000000..76bb7148e6d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates08_ES6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates08_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (FFFF == 65535)
+var x = `\u{FFFF}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.errors.txt
deleted file mode 100644
index b0e3d49d05f..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (10000 == 65536)
-    var x = `\u{10000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
index 9c3440a645e..8c18768a229 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.js
@@ -10,4 +10,4 @@ var x = `\u{10000}`;
 // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
 //  2. If cp ≤ 65535, return cp.
 // (10000 == 65536)
-var x = "{10000}";
+var x = "𐀀";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.types
new file mode 100644
index 00000000000..d8210321401
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES5.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = `\u{10000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.errors.txt
deleted file mode 100644
index 80b72e3d2ad..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts(5,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. If cp ≤ 65535, return cp.
-    // (10000 == 65536)
-    var x = `\u{10000}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.types
new file mode 100644
index 00000000000..3b6edb2f91b
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates09_ES6.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates09_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. If cp ≤ 65535, return cp.
+// (10000 == 65536)
+var x = `\u{10000}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.errors.txt
deleted file mode 100644
index 20a504a7c72..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
-    // Although we should just get back a single code point value of 0xD800,
-    // this is a useful edge-case test.
-    var x = `\u{D800}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
index 9c51b4aa5de..68693d6fd42 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.js
@@ -12,4 +12,4 @@ var x = `\u{D800}`;
 //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
 // Although we should just get back a single code point value of 0xD800,
 // this is a useful edge-case test.
-var x = "{D800}";
+var x = "�";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.types
new file mode 100644
index 00000000000..e8a47efe0cd
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES5.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = `\u{D800}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.errors.txt
deleted file mode 100644
index baf6fee3611..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
-    // Although we should just get back a single code point value of 0xD800,
-    // this is a useful edge-case test.
-    var x = `\u{D800}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.types
new file mode 100644
index 00000000000..77f9bd420f2
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates10_ES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates10_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
+// Although we should just get back a single code point value of 0xD800,
+// this is a useful edge-case test.
+var x = `\u{D800}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.errors.txt
deleted file mode 100644
index 5a319bc534b..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
-    // Although we should just get back a single code point value of 0xDC00,
-    // this is a useful edge-case test.
-    var x = `\u{DC00}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
index f0abbf09b84..336030c54fc 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.js
@@ -12,4 +12,4 @@ var x = `\u{DC00}`;
 //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
 // Although we should just get back a single code point value of 0xDC00,
 // this is a useful edge-case test.
-var x = "{DC00}";
+var x = "�";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.types
new file mode 100644
index 00000000000..d6dce3dbfc6
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES5.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES5.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = `\u{DC00}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.errors.txt
deleted file mode 100644
index a651159fb30..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts(6,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts (1 errors) ====
-    
-    // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
-    //  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
-    // Although we should just get back a single code point value of 0xDC00,
-    // this is a useful edge-case test.
-    var x = `\u{DC00}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.types
new file mode 100644
index 00000000000..213f009c53d
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates11_ES6.types
@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates11_ES6.ts ===
+
+// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
+//  2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
+// Although we should just get back a single code point value of 0xDC00,
+// this is a useful edge-case test.
+var x = `\u{DC00}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt
index 2d2676c8dde..f1166a156c4 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts(2,21): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES5.ts (1 errors) ====
     
     var x = `\u{FFFFFFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
+                        
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
index 04b2e8311d2..d460573a9f0 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{FFFFFFFF}`;
 
 
 //// [unicodeExtendedEscapesInTemplates12_ES5.js]
-var x = "{FFFFFFFF}";
+var x = "}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt
index 164ba5080ba..737c4a704af 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates12_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts(2,21): error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates12_ES6.ts (1 errors) ====
     
     var x = `\u{FFFFFFFF}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
+                        
+!!! error TS1195: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.errors.txt
deleted file mode 100644
index f654afaeae9..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts (1 errors) ====
-    
-    var x = `\u{DDDDD}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
index a2ee97d9605..f59110e062c 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{DDDDD}`;
 
 
 //// [unicodeExtendedEscapesInTemplates13_ES5.js]
-var x = "{DDDDD}";
+var x = "󝷝";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.types
new file mode 100644
index 00000000000..70b0f580f02
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES5.ts ===
+
+var x = `\u{DDDDD}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.errors.txt
deleted file mode 100644
index 384678ddff7..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts (1 errors) ====
-    
-    var x = `\u{DDDDD}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.types
new file mode 100644
index 00000000000..c0be97ce558
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates13_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates13_ES6.ts ===
+
+var x = `\u{DDDDD}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt
index 08d816b17b4..6179a41b347 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts(3,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts(3,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES5.ts (1 errors) ====
     
     // Shouldn't work, negatives are not allowed.
     var x = `\u{-DDDD}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js
index 2c190856f57..cc2c1c1158e 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES5.js
@@ -6,4 +6,4 @@ var x = `\u{-DDDD}`;
 
 //// [unicodeExtendedEscapesInTemplates14_ES5.js]
 // Shouldn't work, negatives are not allowed.
-var x = "{-DDDD}";
+var x = "-DDDD}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt
index 23b82ede3e6..86a956159a7 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates14_ES6.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts(3,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts(3,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates14_ES6.ts (1 errors) ====
     
     // Shouldn't work, negatives are not allowed.
     var x = `\u{-DDDD}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.errors.txt
deleted file mode 100644
index 6d5fad519d0..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts (4 errors) ====
-    
-    var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
index 008ded04523..91b928af877 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
 
 
 //// [unicodeExtendedEscapesInTemplates15_ES5.js]
-var x = "{abcd}{ef12}{3456}{7890}";
+var x = "ꯍ㑖碐";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.types
new file mode 100644
index 00000000000..95eb2a2f75c
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES5.ts ===
+
+var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.errors.txt
deleted file mode 100644
index a9a6c15a1f8..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts (4 errors) ====
-    
-    var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.types
new file mode 100644
index 00000000000..d7a42b3ff24
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates15_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates15_ES6.ts ===
+
+var x = `\u{abcd}\u{ef12}\u{3456}\u{7890}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.errors.txt
deleted file mode 100644
index 81c1046cb8a..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts (4 errors) ====
-    
-    var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
index 4351e145acd..6333eb753b5 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
 
 
 //// [unicodeExtendedEscapesInTemplates16_ES5.js]
-var x = "{ABCD}{EF12}{3456}{7890}";
+var x = "ꯍ㑖碐";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.types
new file mode 100644
index 00000000000..9eb8ed1e645
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES5.ts ===
+
+var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.errors.txt
deleted file mode 100644
index cd010bd9401..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,20): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,28): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts (4 errors) ====
-    
-    var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                       
-!!! error TS1125: Hexadecimal digit expected.
-                               
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.types
new file mode 100644
index 00000000000..c5413c44c92
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates16_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates16_ES6.ts ===
+
+var x = `\u{ABCD}\u{EF12}\u{3456}\u{7890}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt
index 91b53ec2f0a..006a455963c 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,17): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,22): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,13): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts(2,23): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES5.ts (3 errors) ====
     
     var x = `\u{r}\u{n}\u{t}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
-                    
+                     
 !!! error TS1125: Hexadecimal digit expected.
-                         
+                          
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js
index cf8dbccc96a..fbab1ea1149 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{r}\u{n}\u{t}`;
 
 
 //// [unicodeExtendedEscapesInTemplates17_ES5.js]
-var x = "{r}{n}{t}";
+var x = "r}n}t}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt
index c24cceedc3b..88dca427b67 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates17_ES6.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,17): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,22): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,13): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts(2,23): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates17_ES6.ts (3 errors) ====
     
     var x = `\u{r}\u{n}\u{t}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
-                    
+                     
 !!! error TS1125: Hexadecimal digit expected.
-                         
+                          
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.errors.txt
deleted file mode 100644
index 26fd16fe419..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts (2 errors) ====
-    
-    var x = `\u{65}\u{65}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js
index 5bf26237a14..62df3ca631a 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{65}\u{65}`;
 
 
 //// [unicodeExtendedEscapesInTemplates18_ES5.js]
-var x = "{65}{65}";
+var x = "ee";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.types
new file mode 100644
index 00000000000..84cd31b0dc0
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES5.ts ===
+
+var x = `\u{65}\u{65}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.errors.txt
deleted file mode 100644
index ed0260fbfa0..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts (2 errors) ====
-    
-    var x = `\u{65}\u{65}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.types
new file mode 100644
index 00000000000..b7390bb9b68
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates18_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates18_ES6.ts ===
+
+var x = `\u{65}\u{65}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt
index 6165a377879..47d3880a761 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES5.ts (1 errors) ====
     
     var x = `\u{}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
index 4cee5a73d8c..6656b9f3efe 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{}`;
 
 
 //// [unicodeExtendedEscapesInTemplates19_ES5.js]
-var x = "{}";
+var x = "}";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt
index c2ba97e704e..d22bab8d28f 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates19_ES6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
+tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts(2,13): error TS1125: Hexadecimal digit expected.
 
 
 ==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates19_ES6.ts (1 errors) ====
     
     var x = `\u{}`;
-               
+                
 !!! error TS1125: Hexadecimal digit expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.errors.txt
deleted file mode 100644
index 38f4cef4335..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.errors.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,45): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,51): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,58): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,78): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,84): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,90): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,96): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts(2,102): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts (14 errors) ====
-    
-    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                                
-!!! error TS1125: Hexadecimal digit expected.
-                                                      
-!!! error TS1125: Hexadecimal digit expected.
-                                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                                         
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js
index 8ddd2b7a084..cbc5319d897 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.js
@@ -4,4 +4,4 @@ var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77
 
 
 //// [unicodeExtendedEscapesInTemplates20_ES5.js]
-var x = "{48}{65}{6c}{6c}{6f}" + "{20}{020}{0020}{000020}" + "{77}{6f}{72}{6c}{64}";
+var x = "Hello" + "    " + "world";
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.types
new file mode 100644
index 00000000000..cd29759d49e
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES5.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES5.ts ===
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+>x : string
+
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.errors.txt
deleted file mode 100644
index fd77edb7b3c..00000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.errors.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,12): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,18): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,24): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,30): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,36): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,45): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,51): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,58): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,66): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,78): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,84): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,90): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,96): error TS1125: Hexadecimal digit expected.
-tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts(2,102): error TS1125: Hexadecimal digit expected.
-
-
-==== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts (14 errors) ====
-    
-    var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
-               
-!!! error TS1125: Hexadecimal digit expected.
-                     
-!!! error TS1125: Hexadecimal digit expected.
-                           
-!!! error TS1125: Hexadecimal digit expected.
-                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                                
-!!! error TS1125: Hexadecimal digit expected.
-                                                      
-!!! error TS1125: Hexadecimal digit expected.
-                                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                                     
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                 
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                       
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                             
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                                   
-!!! error TS1125: Hexadecimal digit expected.
-                                                                                                         
-!!! error TS1125: Hexadecimal digit expected.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.types b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.types
new file mode 100644
index 00000000000..92722ab2df5
--- /dev/null
+++ b/tests/baselines/reference/unicodeExtendedEscapesInTemplates20_ES6.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/unicodeExtendedEscapes/unicodeExtendedEscapesInTemplates20_ES6.ts ===
+
+var x = `\u{48}\u{65}\u{6c}\u{6c}\u{6f}${`\u{20}\u{020}\u{0020}\u{000020}`}\u{77}\u{6f}\u{72}\u{6c}\u{64}`;
+>x : string
+