diff --git a/tests/baselines/reference/YieldExpression3_es6.js b/tests/baselines/reference/YieldExpression3_es6.js
index c69e8b29700..737b3534886 100644
--- a/tests/baselines/reference/YieldExpression3_es6.js
+++ b/tests/baselines/reference/YieldExpression3_es6.js
@@ -5,7 +5,7 @@ function* foo() {
 }
 
 //// [YieldExpression3_es6.js]
-function foo() {
+function* foo() {
     yield;
     yield;
 }
diff --git a/tests/baselines/reference/YieldExpression4_es6.js b/tests/baselines/reference/YieldExpression4_es6.js
index 5f50b721bc8..c97a7949b2b 100644
--- a/tests/baselines/reference/YieldExpression4_es6.js
+++ b/tests/baselines/reference/YieldExpression4_es6.js
@@ -5,7 +5,7 @@ function* foo() {
 }
 
 //// [YieldExpression4_es6.js]
-function foo() {
+function* foo() {
     yield;
     yield;
 }
diff --git a/tests/baselines/reference/YieldExpression5_es6.js b/tests/baselines/reference/YieldExpression5_es6.js
index 82b405a4cda..8599cfdb6bb 100644
--- a/tests/baselines/reference/YieldExpression5_es6.js
+++ b/tests/baselines/reference/YieldExpression5_es6.js
@@ -4,6 +4,6 @@ function* foo() {
 }
 
 //// [YieldExpression5_es6.js]
-function foo() {
+function* foo() {
     yield* ;
 }
diff --git a/tests/baselines/reference/YieldExpression6_es6.js b/tests/baselines/reference/YieldExpression6_es6.js
index 67d5a745e72..c511daec989 100644
--- a/tests/baselines/reference/YieldExpression6_es6.js
+++ b/tests/baselines/reference/YieldExpression6_es6.js
@@ -4,6 +4,6 @@ function* foo() {
 }
 
 //// [YieldExpression6_es6.js]
-function foo() {
+function* foo() {
     yield* foo;
 }
diff --git a/tests/baselines/reference/YieldExpression7_es6.js b/tests/baselines/reference/YieldExpression7_es6.js
index 226555dd6ef..8055b96ec73 100644
--- a/tests/baselines/reference/YieldExpression7_es6.js
+++ b/tests/baselines/reference/YieldExpression7_es6.js
@@ -4,6 +4,6 @@ function* foo() {
 }
 
 //// [YieldExpression7_es6.js]
-function foo() {
+function* foo() {
     yield foo;
 }
diff --git a/tests/baselines/reference/YieldExpression8_es6.js b/tests/baselines/reference/YieldExpression8_es6.js
index 990164af20d..cc92b79c722 100644
--- a/tests/baselines/reference/YieldExpression8_es6.js
+++ b/tests/baselines/reference/YieldExpression8_es6.js
@@ -6,6 +6,6 @@ function* foo() {
 
 //// [YieldExpression8_es6.js]
 yield(foo);
-function foo() {
+function* foo() {
     yield (foo);
 }
diff --git a/tests/baselines/reference/YieldExpression9_es6.js b/tests/baselines/reference/YieldExpression9_es6.js
index f38aa811fec..a2ffa0fa01b 100644
--- a/tests/baselines/reference/YieldExpression9_es6.js
+++ b/tests/baselines/reference/YieldExpression9_es6.js
@@ -4,6 +4,6 @@ var v = function*() {
 }
 
 //// [YieldExpression9_es6.js]
-var v = function () {
+var v = function* () {
     yield (foo);
 };
diff --git a/tests/baselines/reference/YieldStarExpression3_es6.js b/tests/baselines/reference/YieldStarExpression3_es6.js
index 7463fc01bc1..e64306dc4cf 100644
--- a/tests/baselines/reference/YieldStarExpression3_es6.js
+++ b/tests/baselines/reference/YieldStarExpression3_es6.js
@@ -4,6 +4,6 @@ function *g() {
 }
 
 //// [YieldStarExpression3_es6.js]
-function g() {
+function* g() {
     yield* ;
 }
diff --git a/tests/baselines/reference/YieldStarExpression4_es6.js b/tests/baselines/reference/YieldStarExpression4_es6.js
index 6283b81cca3..8ec5fa0c933 100644
--- a/tests/baselines/reference/YieldStarExpression4_es6.js
+++ b/tests/baselines/reference/YieldStarExpression4_es6.js
@@ -4,6 +4,6 @@ function *g() {
 }
 
 //// [YieldStarExpression4_es6.js]
-function g() {
+function* g() {
     yield* [];
 }
diff --git a/tests/baselines/reference/arrowFunctionContexts.js b/tests/baselines/reference/arrowFunctionContexts.js
index 7b424107bd1..73e3be15e11 100644
--- a/tests/baselines/reference/arrowFunctionContexts.js
+++ b/tests/baselines/reference/arrowFunctionContexts.js
@@ -102,9 +102,10 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
+var _this = this;
 // Arrow function used in with statement
 with (window) {
-    var p = function () { return this; };
+    var p = function () { return _this; };
 }
 // Arrow function as argument to super call
 var Base = (function () {
@@ -130,6 +131,7 @@ var arr; // Incorrect error here (bug 829597)
 // Arrow function as enum value
 var E;
 (function (E) {
+    var _this = this;
     E[E["x"] = function () { return 4; }] = "x";
     E[E["y"] = (function () { return _this; }).length] = "y"; // error, can't use this in enum
 })(E || (E = {}));
@@ -142,9 +144,10 @@ var M;
 // Repeat above for module members that are functions? (necessary to redo all of them?)
 var M2;
 (function (M2) {
+    var _this = this;
     // Arrow function used in with statement
     with (window) {
-        var p = function () { return this; };
+        var p = function () { return _this; };
     }
     // Arrow function as argument to super call
     var Base = (function () {
@@ -170,6 +173,7 @@ var M2;
     // Arrow function as enum value
     var E;
     (function (E) {
+        var _this = this;
         E[E["x"] = function () { return 4; }] = "x";
         E[E["y"] = (function () { return _this; }).length] = "y";
     })(E || (E = {}));
diff --git a/tests/baselines/reference/emitThisInSuperMethodCall.js b/tests/baselines/reference/emitThisInSuperMethodCall.js
index ba648b12d86..1350ed9d4c8 100644
--- a/tests/baselines/reference/emitThisInSuperMethodCall.js
+++ b/tests/baselines/reference/emitThisInSuperMethodCall.js
@@ -54,8 +54,9 @@ var RegisteredUser = (function (_super) {
     };
     RegisteredUser.prototype.g = function () {
         function inner() {
+            var _this = this;
             (function () {
-                _super.sayHello.call(this);
+                _super.sayHello.call(_this);
             });
         }
     };
diff --git a/tests/baselines/reference/exportEqualsUmd.js b/tests/baselines/reference/exportEqualsUmd.js
index 615cc2cddbe..a9b75978d06 100644
--- a/tests/baselines/reference/exportEqualsUmd.js
+++ b/tests/baselines/reference/exportEqualsUmd.js
@@ -2,14 +2,14 @@
 export = { ["hi"]: "there" };
 
 //// [exportEqualsUmd.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     return (_a = {}, _a["hi"] = "there", _a);
     var _a;
diff --git a/tests/baselines/reference/functionExpressionInWithBlock.js b/tests/baselines/reference/functionExpressionInWithBlock.js
index f2353412d5c..2fae2384313 100644
--- a/tests/baselines/reference/functionExpressionInWithBlock.js
+++ b/tests/baselines/reference/functionExpressionInWithBlock.js
@@ -11,7 +11,8 @@ function x() {
 function x() {
     with ({}) {
         function f() {
-            (function () { return this; });
+            var _this = this;
+            (function () { return _this; });
         }
     }
 }
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
index 08ec75c48f0..ecc8ade69b7 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
@@ -5,14 +5,14 @@ run(1);
 
 
 //// [isolatedModulesPlainFile-UMD.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     run(1);
 });
diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js
index a573559b7e9..fb366945d66 100644
--- a/tests/baselines/reference/modulePrologueUmd.js
+++ b/tests/baselines/reference/modulePrologueUmd.js
@@ -4,14 +4,14 @@
 export class Foo {}
 
 //// [modulePrologueUmd.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     "use strict";
     var Foo = (function () {
         function Foo() {
diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js
index 4821f1fe69c..2ada9f1bb52 100644
--- a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js
+++ b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.js
@@ -6,8 +6,9 @@ return this.edit(role)
 
 
 //// [multiLinePropertyAccessAndArrowFunctionIndent1.js]
+var _this = this;
 return this.edit(role)
     .then(function (role) {
-    return this.roleService.add(role)
+    return _this.roleService.add(role)
         .then(function (data) { return data.data; });
 });
diff --git a/tests/baselines/reference/noEmitHelpers2.js b/tests/baselines/reference/noEmitHelpers2.js
index fc4baf334c3..64acadf07e3 100644
--- a/tests/baselines/reference/noEmitHelpers2.js
+++ b/tests/baselines/reference/noEmitHelpers2.js
@@ -16,6 +16,6 @@ var A = (function () {
 }());
 A = __decorate([
     decorator,
-    __param(1, decorator), 
-    __metadata('design:paramtypes', [Number, String])
+    __param(1, decorator),
+    __metadata("design:paramtypes", [Number, String])
 ], A);
diff --git a/tests/baselines/reference/noImplicitUseStrict_system.js b/tests/baselines/reference/noImplicitUseStrict_system.js
index cf5a7e1b261..f1100e20fd7 100644
--- a/tests/baselines/reference/noImplicitUseStrict_system.js
+++ b/tests/baselines/reference/noImplicitUseStrict_system.js
@@ -3,13 +3,13 @@
 export var x = 0;
 
 //// [noImplicitUseStrict_system.js]
-System.register([], function(exports_1, context_1) {
+System.register([], function (exports_1, context_1) {
     var __moduleName = context_1 && context_1.id;
     var x;
     return {
-        setters:[],
-        execute: function() {
+        setters: [],
+        execute: function () {
             exports_1("x", x = 0);
         }
-    }
+    };
 });
diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.js b/tests/baselines/reference/noImplicitUseStrict_umd.js
index ca252daeb9d..566c3bbe0b6 100644
--- a/tests/baselines/reference/noImplicitUseStrict_umd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.js
@@ -3,13 +3,13 @@
 export var x = 0;
 
 //// [noImplicitUseStrict_umd.js]
-(function (factory) {
+(function (dependencies, factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
     }
     else if (typeof define === 'function' && define.amd) {
-        define(["require", "exports"], factory);
+        define(dependencies, factory);
     }
-})(function (require, exports) {
+})(["require", "exports"], function (require, exports) {
     exports.x = 0;
 });
diff --git a/tests/baselines/reference/objectLiteralWithSemicolons4.js b/tests/baselines/reference/objectLiteralWithSemicolons4.js
index a01d52548ee..9e1e3dea4b9 100644
--- a/tests/baselines/reference/objectLiteralWithSemicolons4.js
+++ b/tests/baselines/reference/objectLiteralWithSemicolons4.js
@@ -5,4 +5,5 @@ var v = {
 
 //// [objectLiteralWithSemicolons4.js]
 var v = {
-    a:  };
+    a: 
+};
diff --git a/tests/baselines/reference/superErrors.js b/tests/baselines/reference/superErrors.js
index 0208e720b0c..fd70114d0fd 100644
--- a/tests/baselines/reference/superErrors.js
+++ b/tests/baselines/reference/superErrors.js
@@ -58,6 +58,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
 function foo() {
+    var _this = this;
     // super in a non class context
     var x = _super.;
     var y = function () { return _super.; };
@@ -83,20 +84,28 @@ var RegisteredUser = (function (_super) {
         }
         // super call in a lambda in an inner function in a constructor 
         function inner2() {
-            var x = function () { return _super.sayHello.call(this); };
+            var _this = this;
+            var x = function () { return _super.sayHello.call(_this); };
         }
         // super call in a lambda in a function expression in a constructor 
-        (function () { return function () { return _super.; }; })();
+        (function () {
+            var _this = this;
+            return function () { return _super.; };
+        })();
     }
     RegisteredUser.prototype.sayHello = function () {
         // super call in a method
         _super.prototype.sayHello.call(this);
         // super call in a lambda in an inner function in a method
         function inner() {
-            var x = function () { return _super.sayHello.call(this); };
+            var _this = this;
+            var x = function () { return _super.sayHello.call(_this); };
         }
         // super call in a lambda in a function expression in a constructor 
-        (function () { return function () { return _super.; }; })();
+        (function () {
+            var _this = this;
+            return function () { return _super.; };
+        })();
     };
     RegisteredUser.staticFunction = function () {
         var _this = this;