diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.js b/tests/baselines/reference/arrowFunctionWithParameterNameAsync.js
deleted file mode 100644
index 0baea798c03..00000000000
--- a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [arrowFunctionWithParameterNameAsync.ts]
-
-const x = async => async;
-
-//// [arrowFunctionWithParameterNameAsync.js]
-var x = function (async) { return async; };
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.symbols b/tests/baselines/reference/arrowFunctionWithParameterNameAsync.symbols
deleted file mode 100644
index 26f36f48df7..00000000000
--- a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.symbols
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync.ts ===
-
-const x = async => async;
->x : Symbol(x, Decl(arrowFunctionWithParameterNameAsync.ts, 1, 5))
->async : Symbol(async, Decl(arrowFunctionWithParameterNameAsync.ts, 1, 9))
->async : Symbol(async, Decl(arrowFunctionWithParameterNameAsync.ts, 1, 9))
-
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.js b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.js
new file mode 100644
index 00000000000..8527fefc50d
--- /dev/null
+++ b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.js
@@ -0,0 +1,6 @@
+//// [arrowFunctionWithParameterNameAsync_es6.ts]
+
+const x = async => async;
+
+//// [arrowFunctionWithParameterNameAsync_es6.js]
+var x = function (async) { return async; };
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.symbols b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.symbols
new file mode 100644
index 00000000000..73e5f31aeb3
--- /dev/null
+++ b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts ===
+
+const x = async => async;
+>x : Symbol(x, Decl(arrowFunctionWithParameterNameAsync_es6.ts, 1, 5))
+>async : Symbol(async, Decl(arrowFunctionWithParameterNameAsync_es6.ts, 1, 9))
+>async : Symbol(async, Decl(arrowFunctionWithParameterNameAsync_es6.ts, 1, 9))
+
diff --git a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.types b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.types
similarity index 79%
rename from tests/baselines/reference/arrowFunctionWithParameterNameAsync.types
rename to tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.types
index 4bdc60935ea..b6a19fe30ed 100644
--- a/tests/baselines/reference/arrowFunctionWithParameterNameAsync.types
+++ b/tests/baselines/reference/arrowFunctionWithParameterNameAsync_es6.types
@@ -1,4 +1,4 @@
-=== tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync.ts ===
+=== tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts ===
 
 const x = async => async;
 >x : (async: any) => any
diff --git a/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt b/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt
index 08e59e69b9f..b5ea2a9d926 100644
--- a/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt
+++ b/tests/baselines/reference/asyncArrowFunction10_es6.errors.txt
@@ -1,21 +1,9 @@
-tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,11): error TS2304: Cannot find name 'async'.
-tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,17): error TS1005: ',' expected.
-tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,20): error TS1005: '=' expected.
-tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(2,24): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts(4,11): error TS2304: Cannot find name 'await'.
 
 
-==== tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts (5 errors) ====
+==== tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts (1 errors) ====
     
-    var foo = async foo(): Promise<void> => {
-              ~~~~~
-!!! error TS2304: Cannot find name 'async'.
-                    ~~~
-!!! error TS1005: ',' expected.
-                       ~
-!!! error TS1005: '=' expected.
-                           ~~~~~~~~~~~~~
-!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
+    var foo = async (): Promise<void> => {
        // Legal to use 'await' in a type context.
        var v: await;
               ~~~~~
diff --git a/tests/baselines/reference/asyncArrowFunction10_es6.js b/tests/baselines/reference/asyncArrowFunction10_es6.js
index 23b2c3af80e..301e41544bb 100644
--- a/tests/baselines/reference/asyncArrowFunction10_es6.js
+++ b/tests/baselines/reference/asyncArrowFunction10_es6.js
@@ -1,13 +1,13 @@
 //// [asyncArrowFunction10_es6.ts]
 
-var foo = async foo(): Promise<void> => {
+var foo = async (): Promise<void> => {
    // Legal to use 'await' in a type context.
    var v: await;
 }
 
 
 //// [asyncArrowFunction10_es6.js]
-var foo = async, foo = () => {
+var foo = () => __awaiter(this, void 0, void 0, function* () {
     // Legal to use 'await' in a type context.
     var v;
-};
+});
diff --git a/tests/baselines/reference/asyncMultiFile.js b/tests/baselines/reference/asyncMultiFile_es6.js
similarity index 89%
rename from tests/baselines/reference/asyncMultiFile.js
rename to tests/baselines/reference/asyncMultiFile_es6.js
index cbf3445ecc9..08d63521fb5 100644
--- a/tests/baselines/reference/asyncMultiFile.js
+++ b/tests/baselines/reference/asyncMultiFile_es6.js
@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/async/es6/asyncMultiFile.ts] ////
+//// [tests/cases/conformance/async/es6/asyncMultiFile_es6.ts] ////
 
 //// [a.ts]
 async function f() {}
diff --git a/tests/baselines/reference/asyncMultiFile.symbols b/tests/baselines/reference/asyncMultiFile_es6.symbols
similarity index 100%
rename from tests/baselines/reference/asyncMultiFile.symbols
rename to tests/baselines/reference/asyncMultiFile_es6.symbols
diff --git a/tests/baselines/reference/asyncMultiFile.types b/tests/baselines/reference/asyncMultiFile_es6.types
similarity index 100%
rename from tests/baselines/reference/asyncMultiFile.types
rename to tests/baselines/reference/asyncMultiFile_es6.types
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es6.js b/tests/baselines/reference/awaitBinaryExpression1_es6.js
index a19e94353d5..83979a5b19b 100644
--- a/tests/baselines/reference/awaitBinaryExpression1_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression1_es6.js
@@ -1,17 +1,19 @@
 //// [awaitBinaryExpression1_es6.ts]
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p || a;
-    "after";
+    after();
 }
 
 //// [awaitBinaryExpression1_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = (yield p) || a;
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es6.symbols b/tests/baselines/reference/awaitBinaryExpression1_es6.symbols
index aee3dbefe96..0f05f6521cb 100644
--- a/tests/baselines/reference/awaitBinaryExpression1_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression1_es6.symbols
@@ -6,15 +6,24 @@ declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression1_es6.ts, 1, 11))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression1_es6.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression1_es6.ts, 2, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitBinaryExpression1_es6.ts, 1, 32))
+>func : Symbol(func, Decl(awaitBinaryExpression1_es6.ts, 3, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression1_es6.ts, 1, 32))
+
     var b = await p || a;
->b : Symbol(b, Decl(awaitBinaryExpression1_es6.ts, 4, 7))
+>b : Symbol(b, Decl(awaitBinaryExpression1_es6.ts, 6, 7))
 >p : Symbol(p, Decl(awaitBinaryExpression1_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitBinaryExpression1_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression1_es6.ts, 2, 32))
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression1_es6.types b/tests/baselines/reference/awaitBinaryExpression1_es6.types
index 4718f5f8fe9..6078e2b6dff 100644
--- a/tests/baselines/reference/awaitBinaryExpression1_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression1_es6.types
@@ -6,12 +6,19 @@ declare var p: Promise<boolean>;
 >p : Promise<boolean>
 >Promise : Promise<T>
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = await p || a;
 >b : boolean
@@ -20,6 +27,7 @@ async function func(): Promise<void> {
 >p : Promise<boolean>
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es6.js b/tests/baselines/reference/awaitBinaryExpression2_es6.js
index 7fb1a70446b..a40a948576d 100644
--- a/tests/baselines/reference/awaitBinaryExpression2_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression2_es6.js
@@ -1,17 +1,19 @@
 //// [awaitBinaryExpression2_es6.ts]
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p && a;
-    "after";
+    after();
 }
 
 //// [awaitBinaryExpression2_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = (yield p) && a;
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es6.symbols b/tests/baselines/reference/awaitBinaryExpression2_es6.symbols
index a4ed0ec14bd..518e6eec528 100644
--- a/tests/baselines/reference/awaitBinaryExpression2_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression2_es6.symbols
@@ -6,15 +6,24 @@ declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression2_es6.ts, 1, 11))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression2_es6.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression2_es6.ts, 2, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitBinaryExpression2_es6.ts, 1, 32))
+>func : Symbol(func, Decl(awaitBinaryExpression2_es6.ts, 3, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression2_es6.ts, 1, 32))
+
     var b = await p && a;
->b : Symbol(b, Decl(awaitBinaryExpression2_es6.ts, 4, 7))
+>b : Symbol(b, Decl(awaitBinaryExpression2_es6.ts, 6, 7))
 >p : Symbol(p, Decl(awaitBinaryExpression2_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitBinaryExpression2_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression2_es6.ts, 2, 32))
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression2_es6.types b/tests/baselines/reference/awaitBinaryExpression2_es6.types
index 6154377a6f1..5f092675e85 100644
--- a/tests/baselines/reference/awaitBinaryExpression2_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression2_es6.types
@@ -6,12 +6,19 @@ declare var p: Promise<boolean>;
 >p : Promise<boolean>
 >Promise : Promise<T>
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = await p && a;
 >b : boolean
@@ -20,6 +27,7 @@ async function func(): Promise<void> {
 >p : Promise<boolean>
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es6.js b/tests/baselines/reference/awaitBinaryExpression3_es6.js
index f845ce12421..56092a490b3 100644
--- a/tests/baselines/reference/awaitBinaryExpression3_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression3_es6.js
@@ -1,17 +1,19 @@
 //// [awaitBinaryExpression3_es6.ts]
 declare var a: number;
 declare var p: Promise<number>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p + a;
-    "after";
+    after();
 }
 
 //// [awaitBinaryExpression3_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = (yield p) + a;
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es6.symbols b/tests/baselines/reference/awaitBinaryExpression3_es6.symbols
index 4b3beb9d9a5..0d653c1ff7b 100644
--- a/tests/baselines/reference/awaitBinaryExpression3_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression3_es6.symbols
@@ -6,15 +6,24 @@ declare var p: Promise<number>;
 >p : Symbol(p, Decl(awaitBinaryExpression3_es6.ts, 1, 11))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression3_es6.ts, 1, 31))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression3_es6.ts, 2, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitBinaryExpression3_es6.ts, 1, 31))
+>func : Symbol(func, Decl(awaitBinaryExpression3_es6.ts, 3, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression3_es6.ts, 1, 31))
+
     var b = await p + a;
->b : Symbol(b, Decl(awaitBinaryExpression3_es6.ts, 4, 7))
+>b : Symbol(b, Decl(awaitBinaryExpression3_es6.ts, 6, 7))
 >p : Symbol(p, Decl(awaitBinaryExpression3_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitBinaryExpression3_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression3_es6.ts, 2, 32))
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression3_es6.types b/tests/baselines/reference/awaitBinaryExpression3_es6.types
index 2d5b087d6e3..98bff3b9439 100644
--- a/tests/baselines/reference/awaitBinaryExpression3_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression3_es6.types
@@ -6,12 +6,19 @@ declare var p: Promise<number>;
 >p : Promise<number>
 >Promise : Promise<T>
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = await p + a;
 >b : number
@@ -20,6 +27,7 @@ async function func(): Promise<void> {
 >p : Promise<number>
 >a : number
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es6.js b/tests/baselines/reference/awaitBinaryExpression4_es6.js
index b6e14c82487..99d568c0227 100644
--- a/tests/baselines/reference/awaitBinaryExpression4_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression4_es6.js
@@ -1,17 +1,19 @@
 //// [awaitBinaryExpression4_es6.ts]
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p, a;
-    "after";
+    after();
 }
 
 //// [awaitBinaryExpression4_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = yield p, a;
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es6.symbols b/tests/baselines/reference/awaitBinaryExpression4_es6.symbols
index 1c52cbb48ef..c7a1b17eaa8 100644
--- a/tests/baselines/reference/awaitBinaryExpression4_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression4_es6.symbols
@@ -6,15 +6,24 @@ declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression4_es6.ts, 1, 11))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression4_es6.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression4_es6.ts, 2, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitBinaryExpression4_es6.ts, 1, 32))
+>func : Symbol(func, Decl(awaitBinaryExpression4_es6.ts, 3, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
-    var b = await p, a;
->b : Symbol(b, Decl(awaitBinaryExpression4_es6.ts, 4, 7))
->p : Symbol(p, Decl(awaitBinaryExpression4_es6.ts, 1, 11))
->a : Symbol(a, Decl(awaitBinaryExpression4_es6.ts, 4, 20))
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression4_es6.ts, 1, 32))
 
-    "after";
+    var b = await p, a;
+>b : Symbol(b, Decl(awaitBinaryExpression4_es6.ts, 6, 7))
+>p : Symbol(p, Decl(awaitBinaryExpression4_es6.ts, 1, 11))
+>a : Symbol(a, Decl(awaitBinaryExpression4_es6.ts, 6, 20))
+
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression4_es6.ts, 2, 32))
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression4_es6.types b/tests/baselines/reference/awaitBinaryExpression4_es6.types
index 80135203a82..672d8624168 100644
--- a/tests/baselines/reference/awaitBinaryExpression4_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression4_es6.types
@@ -6,12 +6,19 @@ declare var p: Promise<boolean>;
 >p : Promise<boolean>
 >Promise : Promise<T>
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = await p, a;
 >b : boolean
@@ -19,6 +26,7 @@ async function func(): Promise<void> {
 >p : Promise<boolean>
 >a : any
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es6.js b/tests/baselines/reference/awaitBinaryExpression5_es6.js
index 65a5bbfee77..1b5d7677b52 100644
--- a/tests/baselines/reference/awaitBinaryExpression5_es6.js
+++ b/tests/baselines/reference/awaitBinaryExpression5_es6.js
@@ -1,19 +1,21 @@
 //// [awaitBinaryExpression5_es6.ts]
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var o: { a: boolean; };
     o.a = await p;
-    "after";
+    after();
 }
 
 //// [awaitBinaryExpression5_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var o;
         o.a = yield p;
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es6.symbols b/tests/baselines/reference/awaitBinaryExpression5_es6.symbols
index 28f96aa55f5..57a7958a13c 100644
--- a/tests/baselines/reference/awaitBinaryExpression5_es6.symbols
+++ b/tests/baselines/reference/awaitBinaryExpression5_es6.symbols
@@ -6,20 +6,29 @@ declare var p: Promise<boolean>;
 >p : Symbol(p, Decl(awaitBinaryExpression5_es6.ts, 1, 11))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitBinaryExpression5_es6.ts, 1, 32))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitBinaryExpression5_es6.ts, 2, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitBinaryExpression5_es6.ts, 1, 32))
+>func : Symbol(func, Decl(awaitBinaryExpression5_es6.ts, 3, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitBinaryExpression5_es6.ts, 1, 32))
+
     var o: { a: boolean; };
->o : Symbol(o, Decl(awaitBinaryExpression5_es6.ts, 4, 7))
->a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 4, 12))
+>o : Symbol(o, Decl(awaitBinaryExpression5_es6.ts, 6, 7))
+>a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 6, 12))
 
     o.a = await p;
->o.a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 4, 12))
->o : Symbol(o, Decl(awaitBinaryExpression5_es6.ts, 4, 7))
->a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 4, 12))
+>o.a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 6, 12))
+>o : Symbol(o, Decl(awaitBinaryExpression5_es6.ts, 6, 7))
+>a : Symbol(a, Decl(awaitBinaryExpression5_es6.ts, 6, 12))
 >p : Symbol(p, Decl(awaitBinaryExpression5_es6.ts, 1, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitBinaryExpression5_es6.ts, 2, 32))
 }
diff --git a/tests/baselines/reference/awaitBinaryExpression5_es6.types b/tests/baselines/reference/awaitBinaryExpression5_es6.types
index 8b76b6f8b88..649d160a847 100644
--- a/tests/baselines/reference/awaitBinaryExpression5_es6.types
+++ b/tests/baselines/reference/awaitBinaryExpression5_es6.types
@@ -6,12 +6,19 @@ declare var p: Promise<boolean>;
 >p : Promise<boolean>
 >Promise : Promise<T>
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var o: { a: boolean; };
 >o : { a: boolean; }
@@ -25,6 +32,7 @@ async function func(): Promise<void> {
 >await p : boolean
 >p : Promise<boolean>
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression1_es6.js b/tests/baselines/reference/awaitCallExpression1_es6.js
index aeeb598e3bf..19ac51a6dad 100644
--- a/tests/baselines/reference/awaitCallExpression1_es6.js
+++ b/tests/baselines/reference/awaitCallExpression1_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(a, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression1_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = fn(a, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression1_es6.symbols b/tests/baselines/reference/awaitCallExpression1_es6.symbols
index c4a91817a46..1b1deb0f579 100644
--- a/tests/baselines/reference/awaitCallExpression1_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression1_es6.symbols
@@ -34,17 +34,26 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression1_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression1_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression1_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression1_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression1_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression1_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression1_es6.ts, 5, 84))
+
     var b = fn(a, a, a);
->b : Symbol(b, Decl(awaitCallExpression1_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression1_es6.ts, 10, 7))
 >fn : Symbol(fn, Decl(awaitCallExpression1_es6.ts, 1, 32))
 >a : Symbol(a, Decl(awaitCallExpression1_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression1_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression1_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression1_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression1_es6.types b/tests/baselines/reference/awaitCallExpression1_es6.types
index 334175b7edb..3807379a2f2 100644
--- a/tests/baselines/reference/awaitCallExpression1_es6.types
+++ b/tests/baselines/reference/awaitCallExpression1_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = fn(a, a, a);
 >b : void
@@ -49,6 +56,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression2_es6.js b/tests/baselines/reference/awaitCallExpression2_es6.js
index b41735275a8..d8a45fa1bf8 100644
--- a/tests/baselines/reference/awaitCallExpression2_es6.js
+++ b/tests/baselines/reference/awaitCallExpression2_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(await p, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression2_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = fn(yield p, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression2_es6.symbols b/tests/baselines/reference/awaitCallExpression2_es6.symbols
index 3931e28045d..d7f3cc0d4bd 100644
--- a/tests/baselines/reference/awaitCallExpression2_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression2_es6.symbols
@@ -34,17 +34,26 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression2_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression2_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression2_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression2_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression2_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression2_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression2_es6.ts, 5, 84))
+
     var b = fn(await p, a, a);
->b : Symbol(b, Decl(awaitCallExpression2_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression2_es6.ts, 10, 7))
 >fn : Symbol(fn, Decl(awaitCallExpression2_es6.ts, 1, 32))
 >p : Symbol(p, Decl(awaitCallExpression2_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitCallExpression2_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression2_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression2_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression2_es6.types b/tests/baselines/reference/awaitCallExpression2_es6.types
index 1617f4a14ff..8758fea7f95 100644
--- a/tests/baselines/reference/awaitCallExpression2_es6.types
+++ b/tests/baselines/reference/awaitCallExpression2_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = fn(await p, a, a);
 >b : void
@@ -50,6 +57,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression3_es6.js b/tests/baselines/reference/awaitCallExpression3_es6.js
index 74dee3e7e42..cf19e28b867 100644
--- a/tests/baselines/reference/awaitCallExpression3_es6.js
+++ b/tests/baselines/reference/awaitCallExpression3_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(a, await p, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression3_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = fn(a, yield p, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression3_es6.symbols b/tests/baselines/reference/awaitCallExpression3_es6.symbols
index 2002748c9ba..14b6f35bc30 100644
--- a/tests/baselines/reference/awaitCallExpression3_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression3_es6.symbols
@@ -34,17 +34,26 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression3_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression3_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression3_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression3_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression3_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression3_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression3_es6.ts, 5, 84))
+
     var b = fn(a, await p, a);
->b : Symbol(b, Decl(awaitCallExpression3_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression3_es6.ts, 10, 7))
 >fn : Symbol(fn, Decl(awaitCallExpression3_es6.ts, 1, 32))
 >a : Symbol(a, Decl(awaitCallExpression3_es6.ts, 0, 11))
 >p : Symbol(p, Decl(awaitCallExpression3_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitCallExpression3_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression3_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression3_es6.types b/tests/baselines/reference/awaitCallExpression3_es6.types
index 6304a803f64..490fd861a61 100644
--- a/tests/baselines/reference/awaitCallExpression3_es6.types
+++ b/tests/baselines/reference/awaitCallExpression3_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = fn(a, await p, a);
 >b : void
@@ -50,6 +57,7 @@ async function func(): Promise<void> {
 >p : Promise<boolean>
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression4_es6.js b/tests/baselines/reference/awaitCallExpression4_es6.js
index 682a1776ac5..832f0cf20e3 100644
--- a/tests/baselines/reference/awaitCallExpression4_es6.js
+++ b/tests/baselines/reference/awaitCallExpression4_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = (await pfn)(a, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression4_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = (yield pfn)(a, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression4_es6.symbols b/tests/baselines/reference/awaitCallExpression4_es6.symbols
index d31cf100ad4..d7e90fc4a53 100644
--- a/tests/baselines/reference/awaitCallExpression4_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression4_es6.symbols
@@ -34,17 +34,26 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression4_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression4_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression4_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression4_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression4_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression4_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression4_es6.ts, 5, 84))
+
     var b = (await pfn)(a, a, a);
->b : Symbol(b, Decl(awaitCallExpression4_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression4_es6.ts, 10, 7))
 >pfn : Symbol(pfn, Decl(awaitCallExpression4_es6.ts, 4, 11))
 >a : Symbol(a, Decl(awaitCallExpression4_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression4_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression4_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression4_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression4_es6.types b/tests/baselines/reference/awaitCallExpression4_es6.types
index ff5d8f4012b..d8a514a67e6 100644
--- a/tests/baselines/reference/awaitCallExpression4_es6.types
+++ b/tests/baselines/reference/awaitCallExpression4_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = (await pfn)(a, a, a);
 >b : void
@@ -51,6 +58,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression5_es6.js b/tests/baselines/reference/awaitCallExpression5_es6.js
index 30889b35011..05b06e7fc2f 100644
--- a/tests/baselines/reference/awaitCallExpression5_es6.js
+++ b/tests/baselines/reference/awaitCallExpression5_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(a, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression5_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = o.fn(a, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression5_es6.symbols b/tests/baselines/reference/awaitCallExpression5_es6.symbols
index d14a966b0b1..ba8f9878188 100644
--- a/tests/baselines/reference/awaitCallExpression5_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression5_es6.symbols
@@ -34,13 +34,21 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression5_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression5_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression5_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression5_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression5_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression5_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression5_es6.ts, 5, 84))
+
     var b = o.fn(a, a, a);
->b : Symbol(b, Decl(awaitCallExpression5_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression5_es6.ts, 10, 7))
 >o.fn : Symbol(fn, Decl(awaitCallExpression5_es6.ts, 3, 16))
 >o : Symbol(o, Decl(awaitCallExpression5_es6.ts, 3, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression5_es6.ts, 3, 16))
@@ -48,5 +56,6 @@ async function func(): Promise<void> {
 >a : Symbol(a, Decl(awaitCallExpression5_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression5_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression5_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression5_es6.types b/tests/baselines/reference/awaitCallExpression5_es6.types
index 5074c007743..3e9f1c6387e 100644
--- a/tests/baselines/reference/awaitCallExpression5_es6.types
+++ b/tests/baselines/reference/awaitCallExpression5_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = o.fn(a, a, a);
 >b : void
@@ -51,6 +58,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression6_es6.js b/tests/baselines/reference/awaitCallExpression6_es6.js
index 55d86119d64..ba488d53347 100644
--- a/tests/baselines/reference/awaitCallExpression6_es6.js
+++ b/tests/baselines/reference/awaitCallExpression6_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(await p, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression6_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = o.fn(yield p, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression6_es6.symbols b/tests/baselines/reference/awaitCallExpression6_es6.symbols
index afd07fd0185..938c49d1d41 100644
--- a/tests/baselines/reference/awaitCallExpression6_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression6_es6.symbols
@@ -34,13 +34,21 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression6_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression6_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression6_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression6_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression6_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression6_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression6_es6.ts, 5, 84))
+
     var b = o.fn(await p, a, a);
->b : Symbol(b, Decl(awaitCallExpression6_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression6_es6.ts, 10, 7))
 >o.fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 3, 16))
 >o : Symbol(o, Decl(awaitCallExpression6_es6.ts, 3, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression6_es6.ts, 3, 16))
@@ -48,5 +56,6 @@ async function func(): Promise<void> {
 >a : Symbol(a, Decl(awaitCallExpression6_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression6_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression6_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression6_es6.types b/tests/baselines/reference/awaitCallExpression6_es6.types
index 3266733fab0..6c5f0f9063e 100644
--- a/tests/baselines/reference/awaitCallExpression6_es6.types
+++ b/tests/baselines/reference/awaitCallExpression6_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = o.fn(await p, a, a);
 >b : void
@@ -52,6 +59,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression7_es6.js b/tests/baselines/reference/awaitCallExpression7_es6.js
index df805266ff3..2eb830986d9 100644
--- a/tests/baselines/reference/awaitCallExpression7_es6.js
+++ b/tests/baselines/reference/awaitCallExpression7_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(a, await p, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression7_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = o.fn(a, yield p, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression7_es6.symbols b/tests/baselines/reference/awaitCallExpression7_es6.symbols
index bb503d4b3a1..f366417b23f 100644
--- a/tests/baselines/reference/awaitCallExpression7_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression7_es6.symbols
@@ -34,13 +34,21 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression7_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression7_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression7_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression7_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression7_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression7_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression7_es6.ts, 5, 84))
+
     var b = o.fn(a, await p, a);
->b : Symbol(b, Decl(awaitCallExpression7_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression7_es6.ts, 10, 7))
 >o.fn : Symbol(fn, Decl(awaitCallExpression7_es6.ts, 3, 16))
 >o : Symbol(o, Decl(awaitCallExpression7_es6.ts, 3, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression7_es6.ts, 3, 16))
@@ -48,5 +56,6 @@ async function func(): Promise<void> {
 >p : Symbol(p, Decl(awaitCallExpression7_es6.ts, 1, 11))
 >a : Symbol(a, Decl(awaitCallExpression7_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression7_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression7_es6.types b/tests/baselines/reference/awaitCallExpression7_es6.types
index b1b382f7325..e36b3773091 100644
--- a/tests/baselines/reference/awaitCallExpression7_es6.types
+++ b/tests/baselines/reference/awaitCallExpression7_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = o.fn(a, await p, a);
 >b : void
@@ -52,6 +59,7 @@ async function func(): Promise<void> {
 >p : Promise<boolean>
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitCallExpression8_es6.js b/tests/baselines/reference/awaitCallExpression8_es6.js
index 8d7bb4b83ce..ecf36a31936 100644
--- a/tests/baselines/reference/awaitCallExpression8_es6.js
+++ b/tests/baselines/reference/awaitCallExpression8_es6.js
@@ -5,17 +5,19 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = (await po).fn(a, a, a);
-    "after";
+    after();
 }
 
 //// [awaitCallExpression8_es6.js]
 function func() {
     return __awaiter(this, void 0, void 0, function* () {
-        "before";
+        before();
         var b = (yield po).fn(a, a, a);
-        "after";
+        after();
     });
 }
diff --git a/tests/baselines/reference/awaitCallExpression8_es6.symbols b/tests/baselines/reference/awaitCallExpression8_es6.symbols
index 9f4df1046f4..89441ea3e37 100644
--- a/tests/baselines/reference/awaitCallExpression8_es6.symbols
+++ b/tests/baselines/reference/awaitCallExpression8_es6.symbols
@@ -34,13 +34,21 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : Symbol(arg1, Decl(awaitCallExpression8_es6.ts, 5, 43))
 >arg2 : Symbol(arg2, Decl(awaitCallExpression8_es6.ts, 5, 58))
 
+declare function before(): void;
+>before : Symbol(before, Decl(awaitCallExpression8_es6.ts, 5, 84))
+
+declare function after(): void;
+>after : Symbol(after, Decl(awaitCallExpression8_es6.ts, 6, 32))
+
 async function func(): Promise<void> {
->func : Symbol(func, Decl(awaitCallExpression8_es6.ts, 5, 84))
+>func : Symbol(func, Decl(awaitCallExpression8_es6.ts, 7, 31))
 >Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
 
-    "before";
+    before();
+>before : Symbol(before, Decl(awaitCallExpression8_es6.ts, 5, 84))
+
     var b = (await po).fn(a, a, a);
->b : Symbol(b, Decl(awaitCallExpression8_es6.ts, 8, 7))
+>b : Symbol(b, Decl(awaitCallExpression8_es6.ts, 10, 7))
 >(await po).fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 5, 25))
 >po : Symbol(po, Decl(awaitCallExpression8_es6.ts, 5, 11))
 >fn : Symbol(fn, Decl(awaitCallExpression8_es6.ts, 5, 25))
@@ -48,5 +56,6 @@ async function func(): Promise<void> {
 >a : Symbol(a, Decl(awaitCallExpression8_es6.ts, 0, 11))
 >a : Symbol(a, Decl(awaitCallExpression8_es6.ts, 0, 11))
 
-    "after";
+    after();
+>after : Symbol(after, Decl(awaitCallExpression8_es6.ts, 6, 32))
 }
diff --git a/tests/baselines/reference/awaitCallExpression8_es6.types b/tests/baselines/reference/awaitCallExpression8_es6.types
index 76719c09c85..8258ba830b2 100644
--- a/tests/baselines/reference/awaitCallExpression8_es6.types
+++ b/tests/baselines/reference/awaitCallExpression8_es6.types
@@ -34,12 +34,19 @@ declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 >arg1 : boolean
 >arg2 : boolean
 
+declare function before(): void;
+>before : () => void
+
+declare function after(): void;
+>after : () => void
+
 async function func(): Promise<void> {
 >func : () => Promise<void>
 >Promise : Promise<T>
 
-    "before";
->"before" : string
+    before();
+>before() : void
+>before : () => void
 
     var b = (await po).fn(a, a, a);
 >b : void
@@ -53,6 +60,7 @@ async function func(): Promise<void> {
 >a : boolean
 >a : boolean
 
-    "after";
->"after" : string
+    after();
+>after() : void
+>after : () => void
 }
diff --git a/tests/baselines/reference/awaitClassExpression_es6.js b/tests/baselines/reference/awaitClassExpression_es6.js
new file mode 100644
index 00000000000..26740b9de6d
--- /dev/null
+++ b/tests/baselines/reference/awaitClassExpression_es6.js
@@ -0,0 +1,16 @@
+//// [awaitClassExpression_es6.ts]
+declare class C { }
+declare var p: Promise<typeof C>;
+
+async function func(): Promise<void> {
+    class D extends (await p) {
+    }
+}
+
+//// [awaitClassExpression_es6.js]
+function func() {
+    return __awaiter(this, void 0, void 0, function* () {
+        class D extends (yield p) {
+        }
+    });
+}
diff --git a/tests/baselines/reference/awaitClassExpression_es6.symbols b/tests/baselines/reference/awaitClassExpression_es6.symbols
new file mode 100644
index 00000000000..6d1e9f1a103
--- /dev/null
+++ b/tests/baselines/reference/awaitClassExpression_es6.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/conformance/async/es6/awaitClassExpression_es6.ts ===
+declare class C { }
+>C : Symbol(C, Decl(awaitClassExpression_es6.ts, 0, 0))
+
+declare var p: Promise<typeof C>;
+>p : Symbol(p, Decl(awaitClassExpression_es6.ts, 1, 11))
+>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+>C : Symbol(C, Decl(awaitClassExpression_es6.ts, 0, 0))
+
+async function func(): Promise<void> {
+>func : Symbol(func, Decl(awaitClassExpression_es6.ts, 1, 33))
+>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+
+    class D extends (await p) {
+>D : Symbol(D, Decl(awaitClassExpression_es6.ts, 3, 38))
+>p : Symbol(p, Decl(awaitClassExpression_es6.ts, 1, 11))
+    }
+}
diff --git a/tests/baselines/reference/awaitClassExpression_es6.types b/tests/baselines/reference/awaitClassExpression_es6.types
new file mode 100644
index 00000000000..4a778021720
--- /dev/null
+++ b/tests/baselines/reference/awaitClassExpression_es6.types
@@ -0,0 +1,20 @@
+=== tests/cases/conformance/async/es6/awaitClassExpression_es6.ts ===
+declare class C { }
+>C : C
+
+declare var p: Promise<typeof C>;
+>p : Promise<typeof C>
+>Promise : Promise<T>
+>C : typeof C
+
+async function func(): Promise<void> {
+>func : () => Promise<void>
+>Promise : Promise<T>
+
+    class D extends (await p) {
+>D : D
+>(await p) : C
+>await p : typeof C
+>p : Promise<typeof C>
+    }
+}
diff --git a/tests/baselines/reference/awaitUnion_es6.js b/tests/baselines/reference/awaitUnion_es6.js
index 9603454b969..628e488cb4f 100644
--- a/tests/baselines/reference/awaitUnion_es6.js
+++ b/tests/baselines/reference/awaitUnion_es6.js
@@ -9,7 +9,7 @@ async function f() {
 	let await_b = await b;
 	let await_c = await c;
 	let await_d = await d;
-	let await_e = await e; 
+	let await_e = await e;
 }
 
 //// [awaitUnion_es6.js]
diff --git a/tests/baselines/reference/awaitUnion_es6.symbols b/tests/baselines/reference/awaitUnion_es6.symbols
index 98a229c4148..c301f3c5b8d 100644
--- a/tests/baselines/reference/awaitUnion_es6.symbols
+++ b/tests/baselines/reference/awaitUnion_es6.symbols
@@ -38,7 +38,7 @@ async function f() {
 >await_d : Symbol(await_d, Decl(awaitUnion_es6.ts, 9, 4))
 >d : Symbol(d, Decl(awaitUnion_es6.ts, 3, 11))
 
-	let await_e = await e; 
+	let await_e = await e;
 >await_e : Symbol(await_e, Decl(awaitUnion_es6.ts, 10, 4))
 >e : Symbol(e, Decl(awaitUnion_es6.ts, 4, 11))
 }
diff --git a/tests/baselines/reference/awaitUnion_es6.types b/tests/baselines/reference/awaitUnion_es6.types
index 97d4bd2fc57..63260772f53 100644
--- a/tests/baselines/reference/awaitUnion_es6.types
+++ b/tests/baselines/reference/awaitUnion_es6.types
@@ -42,7 +42,7 @@ async function f() {
 >await d : number | string
 >d : number | PromiseLike<string>
 
-	let await_e = await e; 
+	let await_e = await e;
 >await_e : number | string
 >await e : number | string
 >e : number | PromiseLike<number | string>
diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts
similarity index 100%
rename from tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync.ts
rename to tests/cases/conformance/async/es6/asyncArrowFunction/arrowFunctionWithParameterNameAsync_es6.ts
diff --git a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts
index 0959ed6c561..1d7f6e3079e 100644
--- a/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts
+++ b/tests/cases/conformance/async/es6/asyncArrowFunction/asyncArrowFunction10_es6.ts
@@ -1,7 +1,7 @@
 // @target: ES6
 // @noEmitHelpers: true
 
-var foo = async foo(): Promise<void> => {
+var foo = async (): Promise<void> => {
    // Legal to use 'await' in a type context.
    var v: await;
 }
diff --git a/tests/cases/conformance/async/es6/asyncMultiFile.ts b/tests/cases/conformance/async/es6/asyncMultiFile_es6.ts
similarity index 100%
rename from tests/cases/conformance/async/es6/asyncMultiFile.ts
rename to tests/cases/conformance/async/es6/asyncMultiFile_es6.ts
diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts
index 46060f309b2..da7c0d09142 100644
--- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression1_es6.ts
@@ -2,8 +2,10 @@
 // @noEmitHelpers: true
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p || a;
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts
index 362f1ecc446..a81f50c51ef 100644
--- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression2_es6.ts
@@ -2,8 +2,10 @@
 // @noEmitHelpers: true
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p && a;
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts
index d3b02033252..3ba0fa7ef07 100644
--- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression3_es6.ts
@@ -2,8 +2,10 @@
 // @noEmitHelpers: true
 declare var a: number;
 declare var p: Promise<number>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p + a;
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts
index eba3be31acf..2ed73473323 100644
--- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression4_es6.ts
@@ -2,8 +2,10 @@
 // @noEmitHelpers: true
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = await p, a;
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts
index 71b173f9e73..91fbc3cd17b 100644
--- a/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitBinaryExpression/awaitBinaryExpression5_es6.ts
@@ -2,9 +2,11 @@
 // @noEmitHelpers: true
 declare var a: boolean;
 declare var p: Promise<boolean>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var o: { a: boolean; };
     o.a = await p;
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts
index d0442f0968d..6a73dcca453 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression1_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(a, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts
index 6de07ef12ff..dd4c8a2d4d9 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression2_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(await p, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts
index 2cc0b7b12d0..01d29cd5163 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression3_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = fn(a, await p, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts
index 8e349fbc5c3..1a57debb6b1 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression4_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = (await pfn)(a, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts
index bbe81ac94b1..2a24fe28df4 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression5_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(a, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts
index 09e88f5acbc..e2d0877a39b 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression6_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(await p, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts
index fe0182da4aa..f309874232d 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression7_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = o.fn(a, await p, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts
index e3280eb7c10..ccd82ffef2f 100644
--- a/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitCallExpression/awaitCallExpression8_es6.ts
@@ -6,8 +6,10 @@ declare function fn(arg0: boolean, arg1: boolean, arg2: boolean): void;
 declare var o: { fn(arg0: boolean, arg1: boolean, arg2: boolean): void; };
 declare var pfn: Promise<{ (arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
 declare var po: Promise<{ fn(arg0: boolean, arg1: boolean, arg2: boolean): void; }>;
+declare function before(): void;
+declare function after(): void;
 async function func(): Promise<void> {
-    "before";
+    before();
     var b = (await po).fn(a, a, a);
-    "after";
+    after();
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitClassExpression_es6.ts b/tests/cases/conformance/async/es6/awaitClassExpression_es6.ts
new file mode 100644
index 00000000000..f503985ba94
--- /dev/null
+++ b/tests/cases/conformance/async/es6/awaitClassExpression_es6.ts
@@ -0,0 +1,9 @@
+// @target: ES6
+// @noEmitHelpers: true
+declare class C { }
+declare var p: Promise<typeof C>;
+
+async function func(): Promise<void> {
+    class D extends (await p) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/async/es6/awaitUnion_es6.ts b/tests/cases/conformance/async/es6/awaitUnion_es6.ts
index a132ae01dfd..1618ea28a86 100644
--- a/tests/cases/conformance/async/es6/awaitUnion_es6.ts
+++ b/tests/cases/conformance/async/es6/awaitUnion_es6.ts
@@ -10,5 +10,5 @@ async function f() {
 	let await_b = await b;
 	let await_c = await c;
 	let await_d = await d;
-	let await_e = await e; 
+	let await_e = await e;
 }
\ No newline at end of file