diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index ad2dc8ff49431..06591a7ab3d44 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1265,9 +1265,13 @@ namespace ts {
                 const right = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).right : (<PropertyAccessExpression>name).name;
 
                 const namespace = resolveEntityName(left, SymbolFlags.Namespace, ignoreErrors);
-                if (!namespace || namespace === unknownSymbol || nodeIsMissing(right)) {
+                if (!namespace || nodeIsMissing(right)) {
                     return undefined;
                 }
+                else if (namespace === unknownSymbol) {
+                    return namespace;
+                }
+
                 symbol = getSymbol(getExportsOfSymbol(namespace), right.text, meaning);
                 if (!symbol) {
                     if (!ignoreErrors) {
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index 4af0beeddcb99..a057b496b250b 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -46,8 +46,9 @@ var MyClass = (function () {
     }
     MyClass = __decorate([
         someDecorator, 
-        __metadata('design:paramtypes', [Object])
+        __metadata('design:paramtypes', [(typeof (_a = typeof db_1.default !== 'undefined' && db_1.default.db) === 'function' && _a) || Object])
     ], MyClass);
     return MyClass;
+    var _a;
 }());
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
new file mode 100644
index 0000000000000..d6d803104c96a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
@@ -0,0 +1,14 @@
+main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.
+
+
+==== main.ts (1 errors) ====
+    import * as ng from "angular2/core";
+                        ~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'angular2/core'.
+    
+    declare function foo(...args: any[]);
+    
+    @foo
+    export class MyClass1 {
+        constructor(private _elementRef: ng.ElementRef){}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.json b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.json
new file mode 100644
index 0000000000000..470c5bf1301a6
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModule",
+    "baselineCheck": true,
+    "runTest": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "main.ts"
+    ],
+    "emittedFiles": [
+        "main.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
new file mode 100644
index 0000000000000..41ab9194c4e67
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
@@ -0,0 +1,24 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+define(["require", "exports", "angular2/core"], function (require, exports, ng) {
+    "use strict";
+    var MyClass1 = (function () {
+        function MyClass1(_elementRef) {
+            this._elementRef = _elementRef;
+        }
+        MyClass1 = __decorate([
+            foo, 
+            __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+        ], MyClass1);
+        return MyClass1;
+        var _a;
+    }());
+    exports.MyClass1 = MyClass1;
+});
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
new file mode 100644
index 0000000000000..d6d803104c96a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
@@ -0,0 +1,14 @@
+main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.
+
+
+==== main.ts (1 errors) ====
+    import * as ng from "angular2/core";
+                        ~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'angular2/core'.
+    
+    declare function foo(...args: any[]);
+    
+    @foo
+    export class MyClass1 {
+        constructor(private _elementRef: ng.ElementRef){}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.json b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.json
new file mode 100644
index 0000000000000..470c5bf1301a6
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModule",
+    "baselineCheck": true,
+    "runTest": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "main.ts"
+    ],
+    "emittedFiles": [
+        "main.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
new file mode 100644
index 0000000000000..e8bd90fc47517
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
@@ -0,0 +1,23 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var ng = require("angular2/core");
+var MyClass1 = (function () {
+    function MyClass1(_elementRef) {
+        this._elementRef = _elementRef;
+    }
+    MyClass1 = __decorate([
+        foo, 
+        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+    ], MyClass1);
+    return MyClass1;
+    var _a;
+}());
+exports.MyClass1 = MyClass1;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
new file mode 100644
index 0000000000000..d6d803104c96a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
@@ -0,0 +1,14 @@
+main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.
+
+
+==== main.ts (1 errors) ====
+    import * as ng from "angular2/core";
+                        ~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'angular2/core'.
+    
+    declare function foo(...args: any[]);
+    
+    @foo
+    export class MyClass1 {
+        constructor(private _elementRef: ng.ElementRef){}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.json b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.json
new file mode 100644
index 0000000000000..91749c0e18944
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve",
+    "baselineCheck": true,
+    "runTest": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "main.ts"
+    ],
+    "emittedFiles": [
+        "main.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
new file mode 100644
index 0000000000000..41ab9194c4e67
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
@@ -0,0 +1,24 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+define(["require", "exports", "angular2/core"], function (require, exports, ng) {
+    "use strict";
+    var MyClass1 = (function () {
+        function MyClass1(_elementRef) {
+            this._elementRef = _elementRef;
+        }
+        MyClass1 = __decorate([
+            foo, 
+            __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+        ], MyClass1);
+        return MyClass1;
+        var _a;
+    }());
+    exports.MyClass1 = MyClass1;
+});
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
new file mode 100644
index 0000000000000..d6d803104c96a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
@@ -0,0 +1,14 @@
+main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.
+
+
+==== main.ts (1 errors) ====
+    import * as ng from "angular2/core";
+                        ~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'angular2/core'.
+    
+    declare function foo(...args: any[]);
+    
+    @foo
+    export class MyClass1 {
+        constructor(private _elementRef: ng.ElementRef){}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.json b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.json
new file mode 100644
index 0000000000000..91749c0e18944
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve",
+    "baselineCheck": true,
+    "runTest": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "main.ts"
+    ],
+    "emittedFiles": [
+        "main.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
new file mode 100644
index 0000000000000..e8bd90fc47517
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
@@ -0,0 +1,23 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var ng = require("angular2/core");
+var MyClass1 = (function () {
+    function MyClass1(_elementRef) {
+        this._elementRef = _elementRef;
+    }
+    MyClass1 = __decorate([
+        foo, 
+        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+    ], MyClass1);
+    return MyClass1;
+    var _a;
+}());
+exports.MyClass1 = MyClass1;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.errors.txt
new file mode 100644
index 0000000000000..d6d803104c96a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.errors.txt
@@ -0,0 +1,14 @@
+main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.
+
+
+==== main.ts (1 errors) ====
+    import * as ng from "angular2/core";
+                        ~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'angular2/core'.
+    
+    declare function foo(...args: any[]);
+    
+    @foo
+    export class MyClass1 {
+        constructor(private _elementRef: ng.ElementRef){}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.json b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.json
new file mode 100644
index 0000000000000..5b48b8fe70c1d
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJS",
+    "baselineCheck": true,
+    "runTest": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "main.ts"
+    ],
+    "emittedFiles": [
+        "main.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
new file mode 100644
index 0000000000000..41ab9194c4e67
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
@@ -0,0 +1,24 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+define(["require", "exports", "angular2/core"], function (require, exports, ng) {
+    "use strict";
+    var MyClass1 = (function () {
+        function MyClass1(_elementRef) {
+            this._elementRef = _elementRef;
+        }
+        MyClass1 = __decorate([
+            foo, 
+            __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+        ], MyClass1);
+        return MyClass1;
+        var _a;
+    }());
+    exports.MyClass1 = MyClass1;
+});
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.errors.txt
new file mode 100644
index 0000000000000..d6d803104c96a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.errors.txt
@@ -0,0 +1,14 @@
+main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.
+
+
+==== main.ts (1 errors) ====
+    import * as ng from "angular2/core";
+                        ~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'angular2/core'.
+    
+    declare function foo(...args: any[]);
+    
+    @foo
+    export class MyClass1 {
+        constructor(private _elementRef: ng.ElementRef){}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.json b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.json
new file mode 100644
index 0000000000000..5b48b8fe70c1d
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJS",
+    "baselineCheck": true,
+    "runTest": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "main.ts"
+    ],
+    "emittedFiles": [
+        "main.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
new file mode 100644
index 0000000000000..e8bd90fc47517
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
@@ -0,0 +1,23 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var ng = require("angular2/core");
+var MyClass1 = (function () {
+    function MyClass1(_elementRef) {
+        this._elementRef = _elementRef;
+    }
+    MyClass1 = __decorate([
+        foo, 
+        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+    ], MyClass1);
+    return MyClass1;
+    var _a;
+}());
+exports.MyClass1 = MyClass1;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
new file mode 100644
index 0000000000000..d6d803104c96a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
@@ -0,0 +1,14 @@
+main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.
+
+
+==== main.ts (1 errors) ====
+    import * as ng from "angular2/core";
+                        ~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'angular2/core'.
+    
+    declare function foo(...args: any[]);
+    
+    @foo
+    export class MyClass1 {
+        constructor(private _elementRef: ng.ElementRef){}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.json b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.json
new file mode 100644
index 0000000000000..a01c921fdd15a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModule",
+    "baselineCheck": true,
+    "runTest": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "main.ts"
+    ],
+    "emittedFiles": [
+        "main.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
new file mode 100644
index 0000000000000..41ab9194c4e67
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
@@ -0,0 +1,24 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+define(["require", "exports", "angular2/core"], function (require, exports, ng) {
+    "use strict";
+    var MyClass1 = (function () {
+        function MyClass1(_elementRef) {
+            this._elementRef = _elementRef;
+        }
+        MyClass1 = __decorate([
+            foo, 
+            __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+        ], MyClass1);
+        return MyClass1;
+        var _a;
+    }());
+    exports.MyClass1 = MyClass1;
+});
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
new file mode 100644
index 0000000000000..d6d803104c96a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
@@ -0,0 +1,14 @@
+main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.
+
+
+==== main.ts (1 errors) ====
+    import * as ng from "angular2/core";
+                        ~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'angular2/core'.
+    
+    declare function foo(...args: any[]);
+    
+    @foo
+    export class MyClass1 {
+        constructor(private _elementRef: ng.ElementRef){}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.json b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.json
new file mode 100644
index 0000000000000..a01c921fdd15a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModule",
+    "baselineCheck": true,
+    "runTest": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "main.ts"
+    ],
+    "emittedFiles": [
+        "main.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
new file mode 100644
index 0000000000000..e8bd90fc47517
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
@@ -0,0 +1,23 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var ng = require("angular2/core");
+var MyClass1 = (function () {
+    function MyClass1(_elementRef) {
+        this._elementRef = _elementRef;
+    }
+    MyClass1 = __decorate([
+        foo, 
+        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+    ], MyClass1);
+    return MyClass1;
+    var _a;
+}());
+exports.MyClass1 = MyClass1;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
new file mode 100644
index 0000000000000..d6d803104c96a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
@@ -0,0 +1,14 @@
+main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.
+
+
+==== main.ts (1 errors) ====
+    import * as ng from "angular2/core";
+                        ~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'angular2/core'.
+    
+    declare function foo(...args: any[]);
+    
+    @foo
+    export class MyClass1 {
+        constructor(private _elementRef: ng.ElementRef){}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.json b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.json
new file mode 100644
index 0000000000000..14eafad1200b3
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModuleNoResolve",
+    "baselineCheck": true,
+    "runTest": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "main.ts"
+    ],
+    "emittedFiles": [
+        "main.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
new file mode 100644
index 0000000000000..41ab9194c4e67
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
@@ -0,0 +1,24 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+define(["require", "exports", "angular2/core"], function (require, exports, ng) {
+    "use strict";
+    var MyClass1 = (function () {
+        function MyClass1(_elementRef) {
+            this._elementRef = _elementRef;
+        }
+        MyClass1 = __decorate([
+            foo, 
+            __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+        ], MyClass1);
+        return MyClass1;
+        var _a;
+    }());
+    exports.MyClass1 = MyClass1;
+});
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
new file mode 100644
index 0000000000000..d6d803104c96a
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
@@ -0,0 +1,14 @@
+main.ts(1,21): error TS2307: Cannot find module 'angular2/core'.
+
+
+==== main.ts (1 errors) ====
+    import * as ng from "angular2/core";
+                        ~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'angular2/core'.
+    
+    declare function foo(...args: any[]);
+    
+    @foo
+    export class MyClass1 {
+        constructor(private _elementRef: ng.ElementRef){}
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.json b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.json
new file mode 100644
index 0000000000000..14eafad1200b3
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.json
@@ -0,0 +1,13 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModuleNoResolve",
+    "baselineCheck": true,
+    "runTest": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "main.ts"
+    ],
+    "emittedFiles": [
+        "main.js"
+    ]
+}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
new file mode 100644
index 0000000000000..e8bd90fc47517
--- /dev/null
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
@@ -0,0 +1,23 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var ng = require("angular2/core");
+var MyClass1 = (function () {
+    function MyClass1(_elementRef) {
+        this._elementRef = _elementRef;
+    }
+    MyClass1 = __decorate([
+        foo, 
+        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+    ], MyClass1);
+    return MyClass1;
+    var _a;
+}());
+exports.MyClass1 = MyClass1;
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js
new file mode 100644
index 0000000000000..e5495f226d2a5
--- /dev/null
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
@@ -0,0 +1,23 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var ng = require("angular2/core");
+var MyClass1 = (function () {
+    function MyClass1(_elementRef) {
+        this._elementRef = _elementRef;
+    }
+    MyClass1 = __decorate([
+        fooexport, 
+        __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+    ], MyClass1);
+    return MyClass1;
+    var _a;
+}());
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.js
new file mode 100644
index 0000000000000..491481e6a4029
--- /dev/null
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.js	
@@ -0,0 +1,35 @@
+System.register(["angular2/core"], function(exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+        var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+        if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+        else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+        return c > 3 && r && Object.defineProperty(target, key, r), r;
+    };
+    var __metadata = (this && this.__metadata) || function (k, v) {
+        if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+    };
+    var ng;
+    var MyClass1;
+    return {
+        setters:[
+            function (ng_1) {
+                ng = ng_1;
+            }],
+        execute: function() {
+            MyClass1 = (function () {
+                function MyClass1(_elementRef) {
+                    this._elementRef = _elementRef;
+                }
+                MyClass1 = __decorate([
+                    fooexport, 
+                    __metadata('design:paramtypes', [(typeof (_a = typeof ng !== 'undefined' && ng.ElementRef) === 'function' && _a) || Object])
+                ], MyClass1);
+                return MyClass1;
+                var _a;
+            }());
+        }
+    }
+});
+//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/cases/project/emitDecoratorMetadataCommonJSISolatedModules.json b/tests/cases/project/emitDecoratorMetadataCommonJSISolatedModules.json
new file mode 100644
index 0000000000000..27b2e09172b7c
--- /dev/null
+++ b/tests/cases/project/emitDecoratorMetadataCommonJSISolatedModules.json
@@ -0,0 +1,6 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModule",
+    "baselineCheck": true,
+    "runTest": true
+}
\ No newline at end of file
diff --git a/tests/cases/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.json b/tests/cases/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.json
new file mode 100644
index 0000000000000..8930951b9a45f
--- /dev/null
+++ b/tests/cases/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.json
@@ -0,0 +1,6 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve",
+    "baselineCheck": true,
+    "runTest": true
+}
\ No newline at end of file
diff --git a/tests/cases/project/emitDecoratorMetadataSystemJS.json b/tests/cases/project/emitDecoratorMetadataSystemJS.json
new file mode 100644
index 0000000000000..1ed6b13dcb379
--- /dev/null
+++ b/tests/cases/project/emitDecoratorMetadataSystemJS.json
@@ -0,0 +1,6 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJS",
+    "baselineCheck": true,
+    "runTest": true
+}
\ No newline at end of file
diff --git a/tests/cases/project/emitDecoratorMetadataSystemJSISolatedModules.json b/tests/cases/project/emitDecoratorMetadataSystemJSISolatedModules.json
new file mode 100644
index 0000000000000..da18f2602af70
--- /dev/null
+++ b/tests/cases/project/emitDecoratorMetadataSystemJSISolatedModules.json
@@ -0,0 +1,6 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModule",
+    "baselineCheck": true,
+    "runTest": true
+}
\ No newline at end of file
diff --git a/tests/cases/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.json b/tests/cases/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.json
new file mode 100644
index 0000000000000..d87a1361cddea
--- /dev/null
+++ b/tests/cases/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.json
@@ -0,0 +1,6 @@
+{
+    "scenario": "Emit decorator metadata when commonJS and isolatedModules are on",
+    "projectRoot": "tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModuleNoResolve",
+    "baselineCheck": true,
+    "runTest": true
+}
\ No newline at end of file
diff --git a/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModule/main.ts b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModule/main.ts
new file mode 100644
index 0000000000000..f75e8a4d9d664
--- /dev/null
+++ b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModule/main.ts
@@ -0,0 +1,8 @@
+import * as ng from "angular2/core";
+
+declare function foo(...args: any[]);
+
+@foo
+export class MyClass1 {
+    constructor(private _elementRef: ng.ElementRef){}
+}
\ No newline at end of file
diff --git a/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModule/tsconfig.json b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModule/tsconfig.json
new file mode 100644
index 0000000000000..27d98c7f2c9af
--- /dev/null
+++ b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModule/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "isolatedModules": true
+  },
+  "files": [
+    "main.ts"
+  ]
+}
\ No newline at end of file
diff --git a/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve/main.ts b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve/main.ts
new file mode 100644
index 0000000000000..f75e8a4d9d664
--- /dev/null
+++ b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve/main.ts
@@ -0,0 +1,8 @@
+import * as ng from "angular2/core";
+
+declare function foo(...args: any[]);
+
+@foo
+export class MyClass1 {
+    constructor(private _elementRef: ng.ElementRef){}
+}
\ No newline at end of file
diff --git a/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve/tsconfig.json b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve/tsconfig.json
new file mode 100644
index 0000000000000..a34d38cb68e06
--- /dev/null
+++ b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataCommonJSIsolatedModuleNoResolve/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "isolatedModules": true,
+    "noResolve": true
+  },
+  "files": [
+    "main.ts"
+  ]
+}
\ No newline at end of file
diff --git a/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJS/main.ts b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJS/main.ts
new file mode 100644
index 0000000000000..f75e8a4d9d664
--- /dev/null
+++ b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJS/main.ts
@@ -0,0 +1,8 @@
+import * as ng from "angular2/core";
+
+declare function foo(...args: any[]);
+
+@foo
+export class MyClass1 {
+    constructor(private _elementRef: ng.ElementRef){}
+}
\ No newline at end of file
diff --git a/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJS/tsconfig.json b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJS/tsconfig.json
new file mode 100644
index 0000000000000..6c78695c505b3
--- /dev/null
+++ b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJS/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "target": "es5",
+    "module": "system",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true
+  },
+  "files": [
+    "main.ts"
+  ]
+}
\ No newline at end of file
diff --git a/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModule/main.ts b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModule/main.ts
new file mode 100644
index 0000000000000..f75e8a4d9d664
--- /dev/null
+++ b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModule/main.ts
@@ -0,0 +1,8 @@
+import * as ng from "angular2/core";
+
+declare function foo(...args: any[]);
+
+@foo
+export class MyClass1 {
+    constructor(private _elementRef: ng.ElementRef){}
+}
\ No newline at end of file
diff --git a/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModule/tsconfig.json b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModule/tsconfig.json
new file mode 100644
index 0000000000000..2a8dcffba74f2
--- /dev/null
+++ b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModule/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "target": "es5",
+    "module": "system",
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "isolatedModules": true
+  },
+  "files": [
+    "main.ts"
+  ]
+}
\ No newline at end of file
diff --git a/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModuleNoResolve/main.ts b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModuleNoResolve/main.ts
new file mode 100644
index 0000000000000..f75e8a4d9d664
--- /dev/null
+++ b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModuleNoResolve/main.ts
@@ -0,0 +1,8 @@
+import * as ng from "angular2/core";
+
+declare function foo(...args: any[]);
+
+@foo
+export class MyClass1 {
+    constructor(private _elementRef: ng.ElementRef){}
+}
\ No newline at end of file
diff --git a/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModuleNoResolve/tsconfig.json b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModuleNoResolve/tsconfig.json
new file mode 100644
index 0000000000000..b76669d932903
--- /dev/null
+++ b/tests/cases/projects/decoratorMetadata/emitDecoratorMetadataSystemJSIsolatedModuleNoResolve/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "target": "es5",
+    "module": "system",
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "isolatedModules": true,
+    "noResolve": true
+  },
+  "files": [
+    "main.ts"
+  ]
+}
\ No newline at end of file
diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts
index 206f69142a50d..1766e3280d4a2 100644
--- a/tests/cases/unittests/transpile.ts
+++ b/tests/cases/unittests/transpile.ts
@@ -429,5 +429,43 @@ var x = 0;`, {
         transpilesCorrectly("Supports setting 'typeRoots'", "x;", {
             options: { compilerOptions: { typeRoots: ["./folder"] }, fileName: "input.js", reportDiagnostics: true }
         });
+
+        transpilesCorrectly("Correctly serialize metadata when transpile with CommonJS option",
+            `import * as ng from "angular2/core";` +
+            `declare function foo(...args: any[]);` +
+            `@foo` +
+            `export class MyClass1 {` +
+            `    constructor(private _elementRef: ng.ElementRef){}` +
+            `}`, {
+            options: {
+                compilerOptions: {
+                    target: ScriptTarget.ES5,
+                    module: ModuleKind.CommonJS,
+                    moduleResolution: ModuleResolutionKind.NodeJs,
+                    emitDecoratorMetadata: true,
+                    experimentalDecorators: true,
+                    isolatedModules: true,
+                }
+            }
+        });
+
+        transpilesCorrectly("Correctly serialize metadata when transpile with System option",
+            `import * as ng from "angular2/core";` +
+            `declare function foo(...args: any[]);` +
+            `@foo` +
+            `export class MyClass1 {` +
+            `    constructor(private _elementRef: ng.ElementRef){}` +
+            `}`, {
+            options: {
+                compilerOptions: {
+                    target: ScriptTarget.ES5,
+                    module: ModuleKind.System,
+                    moduleResolution: ModuleResolutionKind.NodeJs,
+                    emitDecoratorMetadata: true,
+                    experimentalDecorators: true,
+                    isolatedModules: true,
+                }
+            }
+        });
     });
 }