diff --git a/_infrastructure/tests/runner.js b/_infrastructure/tests/runner.js
index c6ab61c8a..e21bbd42b 100644
--- a/_infrastructure/tests/runner.js
+++ b/_infrastructure/tests/runner.js
@@ -608,10 +608,20 @@ var DT;
             });
         };
 
+        Print.prototype.printQueue = function (files) {
+            var _this = this;
+            this.printDiv();
+            this.printSubHeader('Queued for testing');
+            this.printDiv();
+
+            files.forEach(function (file) {
+                _this.printLine(file.filePathWithName);
+            });
+        };
         Print.prototype.printFiles = function (files) {
             var _this = this;
             this.printDiv();
-            this.printSubHeader('Files:');
+            this.printSubHeader('Files');
             this.printDiv();
 
             files.forEach(function (file) {
@@ -650,7 +660,18 @@ var DT;
         Print.prototype.printRelChanges = function (changeMap) {
             var _this = this;
             this.printDiv();
-            this.printSubHeader('Relevant changes');
+            this.printSubHeader('Interesting files');
+            this.printDiv();
+
+            Object.keys(changeMap).sort().forEach(function (src) {
+                _this.printLine(changeMap[src].filePathWithName);
+            });
+        };
+
+        Print.prototype.printRemovals = function (changeMap) {
+            var _this = this;
+            this.printDiv();
+            this.printSubHeader('Removed files');
             this.printDiv();
 
             Object.keys(changeMap).sort().forEach(function (src) {
@@ -823,7 +844,7 @@ var DT;
 
     var Promise = require('bluebird');
 
-    var endTestDts = /-test.ts$/i;
+    var endTestDts = /-tests?.ts$/i;
 
     /////////////////////////////////
     // Compile with *-tests.ts
@@ -1023,6 +1044,8 @@ var DT;
                 _this.print.printAllChanges(changes);
                 return _this.index.collectDiff(changes);
             }).then(function () {
+                _this.print.printRemovals(_this.index.removed);
+                _this.print.printRelChanges(_this.index.changed);
                 return _this.index.parseFiles();
             }).then(function () {
                 // this.print.printRefMap(this.index, this.index.refMap);
@@ -1033,12 +1056,13 @@ var DT;
                     _this.print.printBoldDiv();
 
                     // bail
-                    return Promise.delay(500).return(false);
+                    return Promise.cast(false);
                 }
 
                 // this.print.printFiles(this.files);
                 return _this.index.collectTargets().then(function (files) {
-                    // this.print.printTests(files);
+                    _this.print.printQueue(files);
+
                     return _this.runTests(files);
                 }).then(function () {
                     return !_this.suites.some(function (suite) {
diff --git a/_infrastructure/tests/runner.ts b/_infrastructure/tests/runner.ts
index 126b824b2..4e72001b8 100644
--- a/_infrastructure/tests/runner.ts
+++ b/_infrastructure/tests/runner.ts
@@ -123,6 +123,8 @@ module DT {
 				this.print.printAllChanges(changes);
 				return this.index.collectDiff(changes);
 			}).then(() => {
+				this.print.printRemovals(this.index.removed);
+				this.print.printRelChanges(this.index.changed);
 				return this.index.parseFiles();
 			}).then(() => {
 				// this.print.printRefMap(this.index, this.index.refMap);
@@ -131,11 +133,11 @@ module DT {
 					this.print.printMissing(this.index, this.index.missing);
 					this.print.printBoldDiv();
 					// bail
-					return Promise.delay(500).return(false);
+					return Promise.cast(false);
 				}
 				// this.print.printFiles(this.files);
 				return this.index.collectTargets().then((files) => {
-					// this.print.printTests(files);
+					this.print.printQueue(files);
 
 					return this.runTests(files);
 				}).then(() => {
diff --git a/_infrastructure/tests/src/printer.ts b/_infrastructure/tests/src/printer.ts
index 9be9a79aa..962d7b644 100644
--- a/_infrastructure/tests/src/printer.ts
+++ b/_infrastructure/tests/src/printer.ts
@@ -180,9 +180,19 @@ module DT {
 			});
 		}
 
+		public printQueue(files: File[]): void {
+			this.printDiv();
+			this.printSubHeader('Queued for testing');
+			this.printDiv();
+
+			files.forEach((file) => {
+				this.printLine(file.filePathWithName);
+			});
+
+		}
 		public printFiles(files: File[]): void {
 			this.printDiv();
-			this.printSubHeader('Files:');
+			this.printSubHeader('Files');
 			this.printDiv();
 
 			files.forEach((file) => {
@@ -218,7 +228,17 @@ module DT {
 
 		public printRelChanges(changeMap: FileDict): void {
 			this.printDiv();
-			this.printSubHeader('Relevant changes');
+			this.printSubHeader('Interesting files');
+			this.printDiv();
+
+			Object.keys(changeMap).sort().forEach((src) => {
+				this.printLine(changeMap[src].filePathWithName);
+			});
+		}
+
+		public printRemovals(changeMap: FileDict): void {
+			this.printDiv();
+			this.printSubHeader('Removed files');
 			this.printDiv();
 
 			Object.keys(changeMap).sort().forEach((src) => {
diff --git a/_infrastructure/tests/src/suite/testEval.ts b/_infrastructure/tests/src/suite/testEval.ts
index 95044daa7..410d8998b 100644
--- a/_infrastructure/tests/src/suite/testEval.ts
+++ b/_infrastructure/tests/src/suite/testEval.ts
@@ -6,7 +6,7 @@ module DT {
 
 	var Promise: typeof Promise = require('bluebird');
 
-	var endTestDts = /-test.ts$/i;
+	var endTestDts = /-tests?.ts$/i;
 
 	/////////////////////////////////
 	// Compile with *-tests.ts
@@ -23,5 +23,4 @@ module DT {
 			}));
 		}
 	}
-
 }