diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments1.js b/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments1.js
deleted file mode 100644
index 1319052ee92..00000000000
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments1.js
+++ /dev/null
@@ -1,19 +0,0 @@
-//// [tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments1.ts] ////
-
-//// [file0.ts]
-
-
-//// [file1.ts]
-
-//
-// Copy Right comment
-//
-
-/// <reference path="file0.ts" />
-
-
-//// [file0.js]
-//// [file1.js]
-//
-// Copy Right comment
-//
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments1.symbols b/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments1.symbols
deleted file mode 100644
index 2928e218121..00000000000
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments1.symbols
+++ /dev/null
@@ -1,12 +0,0 @@
-=== tests/cases/compiler/file1.ts ===
-
-No type information for this code.//
-No type information for this code.// Copy Right comment
-No type information for this code.//
-No type information for this code.
-No type information for this code./// <reference path="file0.ts" />
-No type information for this code.
-No type information for this code.=== tests/cases/compiler/file0.ts ===
-
-No type information for this code.
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments1.types b/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments1.types
deleted file mode 100644
index 2928e218121..00000000000
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments1.types
+++ /dev/null
@@ -1,12 +0,0 @@
-=== tests/cases/compiler/file1.ts ===
-
-No type information for this code.//
-No type information for this code.// Copy Right comment
-No type information for this code.//
-No type information for this code.
-No type information for this code./// <reference path="file0.ts" />
-No type information for this code.
-No type information for this code.=== tests/cases/compiler/file0.ts ===
-
-No type information for this code.
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments2.js b/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments2.js
deleted file mode 100644
index 753abd0e3b0..00000000000
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments2.js
+++ /dev/null
@@ -1,20 +0,0 @@
-//// [tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments2.ts] ////
-
-//// [file0.ts]
-
-
-//// [file1.ts]
-
-//
-// Copy Right comment
-//
-
-/// <reference path="file0.ts" />
-var x = 10;
-
-//// [file0.js]
-//// [file1.js]
-//
-// Copy Right comment
-//
-var x = 10;
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments2.symbols b/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments2.symbols
deleted file mode 100644
index 6df1bcf1b7c..00000000000
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments2.symbols
+++ /dev/null
@@ -1,14 +0,0 @@
-=== tests/cases/compiler/file1.ts ===
-
-//
-// Copy Right comment
-//
-
-/// <reference path="file0.ts" />
-var x = 10;
->x : Symbol(x, Decl(file1.ts, 6, 3))
-
-=== tests/cases/compiler/file0.ts ===
-
-No type information for this code.
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments2.types b/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments2.types
deleted file mode 100644
index 0058d1a4028..00000000000
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments2.types
+++ /dev/null
@@ -1,15 +0,0 @@
-=== tests/cases/compiler/file1.ts ===
-
-//
-// Copy Right comment
-//
-
-/// <reference path="file0.ts" />
-var x = 10;
->x : number
->10 : number
-
-=== tests/cases/compiler/file0.ts ===
-
-No type information for this code.
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments3.js b/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments3.js
deleted file mode 100644
index b1353fa92b2..00000000000
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments3.js
+++ /dev/null
@@ -1,15 +0,0 @@
-//// [tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments3.ts] ////
-
-//// [file0.ts]
-
-
-//// [file1.ts]
-
-//
-// Copy Right comment
-//
-/// <reference path="file0.ts" />
-
-
-//// [file0.js]
-//// [file1.js]
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments3.symbols b/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments3.symbols
deleted file mode 100644
index b5f22abf23b..00000000000
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments3.symbols
+++ /dev/null
@@ -1,11 +0,0 @@
-=== tests/cases/compiler/file1.ts ===
-
-No type information for this code.//
-No type information for this code.// Copy Right comment
-No type information for this code.//
-No type information for this code./// <reference path="file0.ts" />
-No type information for this code.
-No type information for this code.=== tests/cases/compiler/file0.ts ===
-
-No type information for this code.
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments3.types b/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments3.types
deleted file mode 100644
index b5f22abf23b..00000000000
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsButPreserveDetachComments3.types
+++ /dev/null
@@ -1,11 +0,0 @@
-=== tests/cases/compiler/file1.ts ===
-
-No type information for this code.//
-No type information for this code.// Copy Right comment
-No type information for this code.//
-No type information for this code./// <reference path="file0.ts" />
-No type information for this code.
-No type information for this code.=== tests/cases/compiler/file0.ts ===
-
-No type information for this code.
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInAmbientDeclaration.js b/tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInAmbientDeclaration.js
deleted file mode 100644
index bf69047bce0..00000000000
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInAmbientDeclaration.js
+++ /dev/null
@@ -1,12 +0,0 @@
-//// [tests/cases/compiler/doNotEmitTripleSlashCommentsEvenInAmbientDeclaration.ts] ////
-
-//// [file0.ts]
-
-
-//// [file1.ts]
-
-/// <reference path="file0.ts" />
-declare var OData: any;
-
-//// [file0.js]
-//// [file1.js]
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsInTheMiddle.js b/tests/baselines/reference/doNotEmitTripleSlashCommentsInTheMiddle.js
new file mode 100644
index 00000000000..58a9e2caf66
--- /dev/null
+++ b/tests/baselines/reference/doNotEmitTripleSlashCommentsInTheMiddle.js
@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/doNotEmitTripleSlashCommentsInTheMiddle.ts] ////
+
+//// [0.ts]
+
+
+//// [1.ts]
+/// <reference path="0.ts" />
+var x = 10;
+/// <reference path="0.ts" />
+var y = 1000;
+
+//// [0.js]
+//// [1.js]
+/// <reference path="0.ts" />
+var x = 10;
+var y = 1000;
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsInTheMiddle.symbols b/tests/baselines/reference/doNotEmitTripleSlashCommentsInTheMiddle.symbols
new file mode 100644
index 00000000000..353b90f3812
--- /dev/null
+++ b/tests/baselines/reference/doNotEmitTripleSlashCommentsInTheMiddle.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/1.ts ===
+/// <reference path="0.ts" />
+var x = 10;
+>x : Symbol(x, Decl(1.ts, 1, 3))
+
+/// <reference path="0.ts" />
+var y = 1000;
+>y : Symbol(y, Decl(1.ts, 3, 3))
+
+=== tests/cases/compiler/0.ts ===
+
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsInTheMiddle.types b/tests/baselines/reference/doNotEmitTripleSlashCommentsInTheMiddle.types
new file mode 100644
index 00000000000..e26f99fa1a7
--- /dev/null
+++ b/tests/baselines/reference/doNotEmitTripleSlashCommentsInTheMiddle.types
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/1.ts ===
+/// <reference path="0.ts" />
+var x = 10;
+>x : number
+>10 : number
+
+/// <reference path="0.ts" />
+var y = 1000;
+>y : number
+>1000 : number
+
+=== tests/cases/compiler/0.ts ===
+
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/doNotEmitTripleSlashComments.js b/tests/baselines/reference/emitTripleSlashComments.js
similarity index 55%
rename from tests/baselines/reference/doNotEmitTripleSlashComments.js
rename to tests/baselines/reference/emitTripleSlashComments.js
index 42d48f62b23..ac86bc880f1 100644
--- a/tests/baselines/reference/doNotEmitTripleSlashComments.js
+++ b/tests/baselines/reference/emitTripleSlashComments.js
@@ -1,4 +1,4 @@
-//// [tests/cases/compiler/doNotEmitTripleSlashComments.ts] ////
+//// [tests/cases/compiler/emitTripleSlashComments.ts] ////
 
 //// [file0.ts]
 
@@ -14,4 +14,7 @@ var OData: any;
 //// [file0.js]
 //// [file2.js]
 //// [file1.js]
+/// <reference path="file0.ts" />
+/// <reference path="file2.ts" />
+/// <amd-dependency path="/js/libs/hgn.js!app/templates/home" name="compiler"/>
 var OData;
diff --git a/tests/baselines/reference/doNotEmitTripleSlashComments.symbols b/tests/baselines/reference/emitTripleSlashComments.symbols
similarity index 100%
rename from tests/baselines/reference/doNotEmitTripleSlashComments.symbols
rename to tests/baselines/reference/emitTripleSlashComments.symbols
diff --git a/tests/baselines/reference/doNotEmitTripleSlashComments.types b/tests/baselines/reference/emitTripleSlashComments.types
similarity index 100%
rename from tests/baselines/reference/doNotEmitTripleSlashComments.types
rename to tests/baselines/reference/emitTripleSlashComments.types
diff --git a/tests/baselines/reference/emitTripleSlashCommentsEvenInAmbientDeclaration.js b/tests/baselines/reference/emitTripleSlashCommentsEvenInAmbientDeclaration.js
new file mode 100644
index 00000000000..2cc952a8f3a
--- /dev/null
+++ b/tests/baselines/reference/emitTripleSlashCommentsEvenInAmbientDeclaration.js
@@ -0,0 +1,13 @@
+//// [tests/cases/compiler/emitTripleSlashCommentsEvenInAmbientDeclaration.ts] ////
+
+//// [file0.ts]
+
+
+//// [file1.ts]
+
+/// <reference path="file0.ts" />
+declare var OData: any;
+
+//// [file0.js]
+//// [file1.js]
+/// <reference path="file0.ts" />
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInAmbientDeclaration.symbols b/tests/baselines/reference/emitTripleSlashCommentsEvenInAmbientDeclaration.symbols
similarity index 100%
rename from tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInAmbientDeclaration.symbols
rename to tests/baselines/reference/emitTripleSlashCommentsEvenInAmbientDeclaration.symbols
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInAmbientDeclaration.types b/tests/baselines/reference/emitTripleSlashCommentsEvenInAmbientDeclaration.types
similarity index 100%
rename from tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInAmbientDeclaration.types
rename to tests/baselines/reference/emitTripleSlashCommentsEvenInAmbientDeclaration.types
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInEmptyFile.js b/tests/baselines/reference/emitTripleSlashCommentsEvenInEmptyFile.js
similarity index 51%
rename from tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInEmptyFile.js
rename to tests/baselines/reference/emitTripleSlashCommentsEvenInEmptyFile.js
index 55dd71c6f09..6a827528bec 100644
--- a/tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInEmptyFile.js
+++ b/tests/baselines/reference/emitTripleSlashCommentsEvenInEmptyFile.js
@@ -1,4 +1,4 @@
-//// [tests/cases/compiler/doNotEmitTripleSlashCommentsEvenInEmptyFile.ts] ////
+//// [tests/cases/compiler/emitTripleSlashCommentsEvenInEmptyFile.ts] ////
 
 //// [file0.ts]
 
@@ -13,3 +13,6 @@
 //// [file0.js]
 //// [file2.js]
 //// [file1.js]
+/// <reference path="file0.ts" />
+/// <reference path="file2.ts" />
+/// <amd-dependency path="/js/libs/hgn.js!app/templates/home" name="compiler"/> 
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInEmptyFile.symbols b/tests/baselines/reference/emitTripleSlashCommentsEvenInEmptyFile.symbols
similarity index 100%
rename from tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInEmptyFile.symbols
rename to tests/baselines/reference/emitTripleSlashCommentsEvenInEmptyFile.symbols
diff --git a/tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInEmptyFile.types b/tests/baselines/reference/emitTripleSlashCommentsEvenInEmptyFile.types
similarity index 100%
rename from tests/baselines/reference/doNotEmitTripleSlashCommentsEvenInEmptyFile.types
rename to tests/baselines/reference/emitTripleSlashCommentsEvenInEmptyFile.types
diff --git a/tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments1.ts b/tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments1.ts
deleted file mode 100644
index f511e75085b..00000000000
--- a/tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments1.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// @comments: false
-
-// @Filename: file0.ts
-
-// @Filename: file1.ts
-
-//
-// Copy Right comment
-//
-
-/// <reference path="file0.ts" />
diff --git a/tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments2.ts b/tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments2.ts
deleted file mode 100644
index 424c7374717..00000000000
--- a/tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments2.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// @comments: false
-
-// @Filename: file0.ts
-
-// @Filename: file1.ts
-
-//
-// Copy Right comment
-//
-
-/// <reference path="file0.ts" />
-var x = 10;
\ No newline at end of file
diff --git a/tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments3.ts b/tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments3.ts
deleted file mode 100644
index 95f1bb4cbbb..00000000000
--- a/tests/cases/compiler/doNotEmitTripleSlashCommentsButPreserveDetachComments3.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// @comments: false
-
-// @Filename: file0.ts
-
-// @Filename: file1.ts
-
-//
-// Copy Right comment
-//
-/// <reference path="file0.ts" />
diff --git a/tests/cases/compiler/doNotEmitTripleSlashCommentsInTheMiddle.ts b/tests/cases/compiler/doNotEmitTripleSlashCommentsInTheMiddle.ts
new file mode 100644
index 00000000000..a0aeecd07f5
--- /dev/null
+++ b/tests/cases/compiler/doNotEmitTripleSlashCommentsInTheMiddle.ts
@@ -0,0 +1,9 @@
+// @comments: false
+
+// @Filename: 0.ts
+
+// @filename: 1.ts
+/// <reference path="0.ts" />
+var x = 10;
+/// <reference path="0.ts" />
+var y = 1000;
\ No newline at end of file
diff --git a/tests/cases/compiler/doNotEmitTripleSlashComments.ts b/tests/cases/compiler/emitTripleSlashComments.ts
similarity index 100%
rename from tests/cases/compiler/doNotEmitTripleSlashComments.ts
rename to tests/cases/compiler/emitTripleSlashComments.ts
diff --git a/tests/cases/compiler/doNotEmitTripleSlashCommentsEvenInAmbientDeclaration.ts b/tests/cases/compiler/emitTripleSlashCommentsEvenInAmbientDeclaration.ts
similarity index 100%
rename from tests/cases/compiler/doNotEmitTripleSlashCommentsEvenInAmbientDeclaration.ts
rename to tests/cases/compiler/emitTripleSlashCommentsEvenInAmbientDeclaration.ts
diff --git a/tests/cases/compiler/doNotEmitTripleSlashCommentsEvenInEmptyFile.ts b/tests/cases/compiler/emitTripleSlashCommentsEvenInEmptyFile.ts
similarity index 100%
rename from tests/cases/compiler/doNotEmitTripleSlashCommentsEvenInEmptyFile.ts
rename to tests/cases/compiler/emitTripleSlashCommentsEvenInEmptyFile.ts