diff --git a/tests/baselines/reference/constructableDecoratorOnClass01.js b/tests/baselines/reference/constructableDecoratorOnClass01.js
index 26c5bf4a1c4..290c36bb830 100644
--- a/tests/baselines/reference/constructableDecoratorOnClass01.js
+++ b/tests/baselines/reference/constructableDecoratorOnClass01.js
@@ -23,8 +23,8 @@ var CtorDtor = (function () {
 var C = (function () {
     function C() {
     }
-    C = __decorate([
-        CtorDtor
-    ], C);
     return C;
 }());
+C = __decorate([
+    CtorDtor
+], C);
diff --git a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
index 38a2a731af4..69d98d4b0c6 100644
--- a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
@@ -21,11 +21,6 @@ var __extends = (this && this.__extends) || function (d, b) {
 var Parent = (function () {
     function Parent() {
     }
-    Object.defineProperty(Parent.prototype, "message", {
-        set: function (str) { },
-        enumerable: true,
-        configurable: true
-    });
     return Parent;
 }());
 var Child = (function (_super) {
diff --git a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
index d4e0d17186d..7ad703fd3b7 100644
--- a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
@@ -20,11 +20,6 @@ var __extends = (this && this.__extends) || function (d, b) {
 var Parent = (function () {
     function Parent() {
     }
-    Object.defineProperty(Parent.prototype, "message", {
-        get: function () { },
-        enumerable: true,
-        configurable: true
-    });
     return Parent;
 }());
 var Child = (function (_super) {
diff --git a/tests/baselines/reference/typeReferenceDirectives11.errors.txt b/tests/baselines/reference/typeReferenceDirectives11.errors.txt
new file mode 100644
index 00000000000..910c6a8e4c6
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives11.errors.txt
@@ -0,0 +1,19 @@
+/mod1.ts(2,17): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
+
+
+==== /mod2.ts (0 errors) ====
+    
+    import {foo} from "./mod1";
+    export const bar = foo();
+==== /types/lib/index.d.ts (0 errors) ====
+    
+    
+    
+    interface Lib { x }
+    
+==== /mod1.ts (1 errors) ====
+    
+    export function foo(): Lib { return {x: 1} }
+                    ~~~
+!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives11.js b/tests/baselines/reference/typeReferenceDirectives11.js
deleted file mode 100644
index b75ce8b4762..00000000000
--- a/tests/baselines/reference/typeReferenceDirectives11.js
+++ /dev/null
@@ -1,36 +0,0 @@
-//// [tests/cases/compiler/typeReferenceDirectives11.ts] ////
-
-//// [index.d.ts]
-
-
-interface Lib { x }
-
-//// [mod1.ts]
-
-export function foo(): Lib { return {x: 1} }
-
-//// [mod2.ts]
-
-import {foo} from "./mod1";
-export const bar = foo();
-
-//// [output.js]
-define("mod1", ["require", "exports"], function (require, exports) {
-    "use strict";
-    function foo() { return { x: 1 }; }
-    exports.foo = foo;
-});
-define("mod2", ["require", "exports", "mod1"], function (require, exports, mod1_1) {
-    "use strict";
-    exports.bar = mod1_1.foo();
-});
-
-
-//// [output.d.ts]
-/// <reference types="lib" />
-declare module "mod1" {
-    export function foo(): Lib;
-}
-declare module "mod2" {
-    export const bar: Lib;
-}
diff --git a/tests/baselines/reference/typeReferenceDirectives11.trace.json b/tests/baselines/reference/typeReferenceDirectives11.trace.json
index 9cd7e2c5850..37fa7900a7c 100644
--- a/tests/baselines/reference/typeReferenceDirectives11.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives11.trace.json
@@ -1,7 +1,9 @@
 [
     "======== Resolving module './mod1' from '/mod2.ts'. ========",
-    "Module resolution kind is not specified, using 'Classic'.",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/mod1'.",
     "File '/mod1.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/mod1.ts', result '/mod1.ts'",
     "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
diff --git a/tests/baselines/reference/typeReferenceDirectives12.errors.txt b/tests/baselines/reference/typeReferenceDirectives12.errors.txt
new file mode 100644
index 00000000000..6775a2269ee
--- /dev/null
+++ b/tests/baselines/reference/typeReferenceDirectives12.errors.txt
@@ -0,0 +1,38 @@
+/main.ts(1,14): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
+
+
+==== /mod2.ts (0 errors) ====
+    import { Cls } from "./main";
+    import "./mod1";
+    
+    export const cls = Cls;
+    export const foo = new Cls().foo();
+    export const bar = Cls.bar();
+==== /types/lib/index.d.ts (0 errors) ====
+    
+    
+    
+    interface Lib { x }
+    
+==== /main.ts (1 errors) ====
+    export class Cls {
+                 ~~~
+!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
+        x
+    }
+    
+==== /mod1.ts (0 errors) ====
+    /// <reference types="lib" />
+    
+    import {Cls} from "./main";
+    Cls.prototype.foo = function() { return undefined; }
+    
+    declare module "./main" {
+        interface Cls {
+            foo(): Lib;
+        }
+        namespace Cls {
+            function bar(): Lib;
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives12.js b/tests/baselines/reference/typeReferenceDirectives12.js
deleted file mode 100644
index 8d64e1dba9b..00000000000
--- a/tests/baselines/reference/typeReferenceDirectives12.js
+++ /dev/null
@@ -1,82 +0,0 @@
-//// [tests/cases/compiler/typeReferenceDirectives12.ts] ////
-
-//// [index.d.ts]
-
-
-interface Lib { x }
-
-//// [main.ts]
-export class Cls {
-    x
-}
-
-//// [mod1.ts]
-/// <reference types="lib" />
-
-import {Cls} from "./main";
-Cls.prototype.foo = function() { return undefined; }
-
-declare module "./main" {
-    interface Cls {
-        foo(): Lib;
-    }
-    namespace Cls {
-        function bar(): Lib;
-    }
-}
-
-//// [mod2.ts]
-import { Cls } from "./main";
-import "./mod1";
-
-export const cls = Cls;
-export const foo = new Cls().foo();
-export const bar = Cls.bar();
-
-//// [output.js]
-define("main", ["require", "exports"], function (require, exports) {
-    "use strict";
-    var Cls = (function () {
-        function Cls() {
-        }
-        return Cls;
-    }());
-    exports.Cls = Cls;
-});
-/// <reference types="lib" />
-define("mod1", ["require", "exports", "main"], function (require, exports, main_1) {
-    "use strict";
-    main_1.Cls.prototype.foo = function () { return undefined; };
-});
-define("mod2", ["require", "exports", "main", "mod1"], function (require, exports, main_2) {
-    "use strict";
-    exports.cls = main_2.Cls;
-    exports.foo = new main_2.Cls().foo();
-    exports.bar = main_2.Cls.bar();
-});
-
-
-//// [output.d.ts]
-/// <reference types="lib" />
-declare module "main" {
-    export class Cls {
-        x: any;
-    }
-}
-declare module "mod1" {
-    module "main" {
-        interface Cls {
-            foo(): Lib;
-        }
-        namespace Cls {
-            function bar(): Lib;
-        }
-    }
-}
-declare module "mod2" {
-    import { Cls } from "main";
-    import "mod1";
-    export const cls: typeof Cls;
-    export const foo: Lib;
-    export const bar: Lib;
-}
diff --git a/tests/baselines/reference/typeReferenceDirectives12.trace.json b/tests/baselines/reference/typeReferenceDirectives12.trace.json
index 35826ac5394..1024b0cdef3 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.trace.json
+++ b/tests/baselines/reference/typeReferenceDirectives12.trace.json
@@ -1,11 +1,15 @@
 [
     "======== Resolving module './main' from '/mod2.ts'. ========",
-    "Module resolution kind is not specified, using 'Classic'.",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/main'.",
     "File '/main.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/main.ts', result '/main.ts'",
     "======== Module name './main' was successfully resolved to '/main.ts'. ========",
     "======== Resolving module './mod1' from '/mod2.ts'. ========",
-    "Module resolution kind is not specified, using 'Classic'.",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/mod1'.",
     "File '/mod1.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/mod1.ts', result '/mod1.ts'",
     "======== Module name './mod1' was successfully resolved to '/mod1.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/mod1.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",
@@ -13,8 +17,10 @@
     "File '/types/lib/index.d.ts' exist - use it as a name resolution result.",
     "======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ========",
     "======== Resolving module './main' from '/mod1.ts'. ========",
-    "Module resolution kind is not specified, using 'Classic'.",
+    "Module resolution kind is not specified, using 'NodeJs'.",
+    "Loading module as file / folder, candidate module location '/main'.",
     "File '/main.ts' exist - use it as a name resolution result.",
+    "Resolving real path for '/main.ts', result '/main.ts'",
     "======== Module name './main' was successfully resolved to '/main.ts'. ========",
     "======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ========",
     "Resolving with primary search path '/types'",