diff --git a/src/harness/runnerbase.ts b/src/harness/runnerbase.ts
index a16eddcbeec..346382b7a57 100644
--- a/src/harness/runnerbase.ts
+++ b/src/harness/runnerbase.ts
@@ -31,18 +31,12 @@ abstract class RunnerBase {
 
     /** Replaces instances of full paths with fileNames only */
     static removeFullPaths(path: string) {
-        let fixedPath = path;
-
-        // full paths either start with a drive letter or / for *nix, shouldn't have \ in the path at this point
-        const fullPath = /(\w+:|\/)?([\w+\-\.]|\/)*\.tsx?/g;
-        const fullPathList = fixedPath.match(fullPath);
-        if (fullPathList) {
-            fullPathList.forEach((match: string) => fixedPath = fixedPath.replace(match, Harness.Path.getFileName(match)));
-        }
+        // If its a full path (starts with "C:" or "/") replace with just the filename
+        let fixedPath = /^(\w:|\/)/.test(path) ? Harness.Path.getFileName(path) : path;
 
         // when running in the browser the 'full path' is the host name, shows up in error baselines
         const localHost = /http:\/localhost:\d+/g;
         fixedPath = fixedPath.replace(localHost, "");
         return fixedPath;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/baselines/reference/declarationEmit_invalidReference2.errors.txt b/tests/baselines/reference/declarationEmit_invalidReference2.errors.txt
index 1f3960a87ab..9d480419022 100644
--- a/tests/baselines/reference/declarationEmit_invalidReference2.errors.txt
+++ b/tests/baselines/reference/declarationEmit_invalidReference2.errors.txt
@@ -4,5 +4,5 @@ tests/cases/compiler/declarationEmit_invalidReference2.ts(1,1): error TS6053: Fi
 ==== tests/cases/compiler/declarationEmit_invalidReference2.ts (1 errors) ====
     /// <reference path="invalid.ts" />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'invalid.ts' not found.
+!!! error TS6053: File 'tests/cases/compiler/invalid.ts' not found.
     var x = 0;
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationFileOverwriteError.errors.txt b/tests/baselines/reference/declarationFileOverwriteError.errors.txt
index a12c60482e9..1974976dee1 100644
--- a/tests/baselines/reference/declarationFileOverwriteError.errors.txt
+++ b/tests/baselines/reference/declarationFileOverwriteError.errors.txt
@@ -1,7 +1,7 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 
 
-!!! error TS5055: Cannot write file 'a.d.ts' because it would overwrite input file.
+!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 ==== tests/cases/compiler/a.d.ts (0 errors) ====
     
     declare class c {
diff --git a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
index 02251900345..658465de9c2 100644
--- a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
+++ b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
@@ -1,7 +1,7 @@
 error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
 
 
-!!! error TS5055: Cannot write file 'out.d.ts' because it would overwrite input file.
+!!! error TS5055: Cannot write file 'tests/cases/compiler/out.d.ts' because it would overwrite input file.
 ==== tests/cases/compiler/out.d.ts (0 errors) ====
     
     declare class c {
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.errors.txt b/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
index 9d781da2707..8ca80fae408 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
+++ b/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
@@ -14,7 +14,7 @@ tests/cases/compiler/exportStarFromEmptyModule_module4.ts(4,5): error TS2339: Pr
 ==== tests/cases/compiler/exportStarFromEmptyModule_module3.ts (1 errors) ====
     export * from "./exportStarFromEmptyModule_module2";
                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2306: File 'exportStarFromEmptyModule_module2.ts' is not a module.
+!!! error TS2306: File 'tests/cases/compiler/exportStarFromEmptyModule_module2.ts' is not a module.
     export * from "./exportStarFromEmptyModule_module1";
     
     export class A {
diff --git a/tests/baselines/reference/importNonExternalModule.errors.txt b/tests/baselines/reference/importNonExternalModule.errors.txt
index fb8294c5c03..96f8959565c 100644
--- a/tests/baselines/reference/importNonExternalModule.errors.txt
+++ b/tests/baselines/reference/importNonExternalModule.errors.txt
@@ -4,7 +4,7 @@ tests/cases/conformance/externalModules/foo_1.ts(1,22): error TS2306: File 'test
 ==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
     import foo = require("./foo_0");
                          ~~~~~~~~~
-!!! error TS2306: File 'foo_0.ts' is not a module.
+!!! error TS2306: File 'tests/cases/conformance/externalModules/foo_0.ts' is not a module.
     // Import should fail.  foo_0 not an external module
     if(foo.answer === 42){
     
diff --git a/tests/baselines/reference/invalidTripleSlashReference.errors.txt b/tests/baselines/reference/invalidTripleSlashReference.errors.txt
index 40d75004a99..1de5ecaaae1 100644
--- a/tests/baselines/reference/invalidTripleSlashReference.errors.txt
+++ b/tests/baselines/reference/invalidTripleSlashReference.errors.txt
@@ -5,10 +5,10 @@ tests/cases/compiler/invalidTripleSlashReference.ts(2,1): error TS6053: File 'te
 ==== tests/cases/compiler/invalidTripleSlashReference.ts (2 errors) ====
     /// <reference path='filedoesnotexist.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'filedoesnotexist.ts' not found.
+!!! error TS6053: File 'tests/cases/compiler/filedoesnotexist.ts' not found.
     /// <reference path='otherdoesnotexist.d.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'otherdoesnotexist.d.ts' not found.
+!!! error TS6053: File 'tests/cases/compiler/otherdoesnotexist.d.ts' not found.
     
     // this test doesn't actually give the errors you want due to the way the compiler reports errors
     var x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt
index 84900bccc88..9e9c2adb0ef 100644
--- a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.errors.txt
@@ -1,7 +1,7 @@
 error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 
 
-!!! error TS5055: Cannot write file 'a.d.ts' because it would overwrite input file.
+!!! error TS5055: Cannot write file 'tests/cases/compiler/a.d.ts' because it would overwrite input file.
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
index 826f906538f..10c7b8c90dd 100644
--- a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
@@ -1,7 +1,7 @@
 error TS5055: Cannot write file 'tests/cases/compiler/b.d.ts' because it would overwrite input file.
 
 
-!!! error TS5055: Cannot write file 'b.d.ts' because it would overwrite input file.
+!!! error TS5055: Cannot write file 'tests/cases/compiler/b.d.ts' because it would overwrite input file.
 ==== tests/cases/compiler/a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/library-reference-5.errors.txt b/tests/baselines/reference/library-reference-5.errors.txt
index ea571cad1a3..a3729bc3a99 100644
--- a/tests/baselines/reference/library-reference-5.errors.txt
+++ b/tests/baselines/reference/library-reference-5.errors.txt
@@ -18,7 +18,7 @@
 ==== /node_modules/bar/index.d.ts (1 errors) ====
     /// <reference types="alpha" />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! message TS4090: Conflicting library definitions for 'alpha' found at 'index.d.ts' and 'index.d.ts'. Copy the correct file to the 'typings' folder to resolve this conflict.
+!!! message TS4090: Conflicting library definitions for 'alpha' found at '/node_modules/bar/node_modules/alpha/index.d.ts' and '/node_modules/foo/node_modules/alpha/index.d.ts'. Copy the correct file to the 'typings' folder to resolve this conflict.
     declare var bar: any;
     
 ==== /node_modules/bar/node_modules/alpha/index.d.ts (0 errors) ====
diff --git a/tests/baselines/reference/parserRealSource1.errors.txt b/tests/baselines/reference/parserRealSource1.errors.txt
index 0d238dabf2b..23d1a1d744a 100644
--- a/tests/baselines/reference/parserRealSource1.errors.txt
+++ b/tests/baselines/reference/parserRealSource1.errors.txt
@@ -7,7 +7,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource1.ts(4,1): error TS60
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export module CompilerDiagnostics {
diff --git a/tests/baselines/reference/parserRealSource10.errors.txt b/tests/baselines/reference/parserRealSource10.errors.txt
index b3c40202c4f..d6199636e69 100644
--- a/tests/baselines/reference/parserRealSource10.errors.txt
+++ b/tests/baselines/reference/parserRealSource10.errors.txt
@@ -348,7 +348,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(449,40): error
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export enum TokenID {
diff --git a/tests/baselines/reference/parserRealSource11.errors.txt b/tests/baselines/reference/parserRealSource11.errors.txt
index 718bda19a67..efae0f962fd 100644
--- a/tests/baselines/reference/parserRealSource11.errors.txt
+++ b/tests/baselines/reference/parserRealSource11.errors.txt
@@ -523,7 +523,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource11.ts(2356,48): error
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export class ASTSpan {
diff --git a/tests/baselines/reference/parserRealSource12.errors.txt b/tests/baselines/reference/parserRealSource12.errors.txt
index b7b221cbc03..22fb209d80c 100644
--- a/tests/baselines/reference/parserRealSource12.errors.txt
+++ b/tests/baselines/reference/parserRealSource12.errors.txt
@@ -215,7 +215,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource12.ts(524,30): error
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export interface IAstWalker {
diff --git a/tests/baselines/reference/parserRealSource13.errors.txt b/tests/baselines/reference/parserRealSource13.errors.txt
index e9380882e28..6ddc41ed610 100644
--- a/tests/baselines/reference/parserRealSource13.errors.txt
+++ b/tests/baselines/reference/parserRealSource13.errors.txt
@@ -122,7 +122,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource13.ts(135,36): error
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript.AstWalkerWithDetailCallback {
         export interface AstWalkerDetailCallback {
diff --git a/tests/baselines/reference/parserRealSource14.errors.txt b/tests/baselines/reference/parserRealSource14.errors.txt
index bc32a8e585b..4881864e236 100644
--- a/tests/baselines/reference/parserRealSource14.errors.txt
+++ b/tests/baselines/reference/parserRealSource14.errors.txt
@@ -166,7 +166,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource14.ts(572,20): error
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export function lastOf(items: any[]): any {
diff --git a/tests/baselines/reference/parserRealSource2.errors.txt b/tests/baselines/reference/parserRealSource2.errors.txt
index e552cb77812..42fcff36c70 100644
--- a/tests/baselines/reference/parserRealSource2.errors.txt
+++ b/tests/baselines/reference/parserRealSource2.errors.txt
@@ -7,7 +7,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource2.ts(4,1): error TS60
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
     
diff --git a/tests/baselines/reference/parserRealSource3.errors.txt b/tests/baselines/reference/parserRealSource3.errors.txt
index 98aae9660a8..5b00994052b 100644
--- a/tests/baselines/reference/parserRealSource3.errors.txt
+++ b/tests/baselines/reference/parserRealSource3.errors.txt
@@ -7,7 +7,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource3.ts(4,1): error TS60
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         // Note: Any addition to the NodeType should also be supported with addition to AstWalkerDetailCallback
diff --git a/tests/baselines/reference/parserRealSource4.errors.txt b/tests/baselines/reference/parserRealSource4.errors.txt
index e0ae0d2221e..9722a5b670d 100644
--- a/tests/baselines/reference/parserRealSource4.errors.txt
+++ b/tests/baselines/reference/parserRealSource4.errors.txt
@@ -8,7 +8,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource4.ts(195,37): error T
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
     
diff --git a/tests/baselines/reference/parserRealSource5.errors.txt b/tests/baselines/reference/parserRealSource5.errors.txt
index 78894b21420..7dc9b5942d5 100644
--- a/tests/baselines/reference/parserRealSource5.errors.txt
+++ b/tests/baselines/reference/parserRealSource5.errors.txt
@@ -16,7 +16,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource5.ts(61,65): error TS
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         // TODO: refactor indent logic for use in emit
diff --git a/tests/baselines/reference/parserRealSource6.errors.txt b/tests/baselines/reference/parserRealSource6.errors.txt
index aa646ca1aba..aa6a9f41392 100644
--- a/tests/baselines/reference/parserRealSource6.errors.txt
+++ b/tests/baselines/reference/parserRealSource6.errors.txt
@@ -67,7 +67,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource6.ts(215,20): error T
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export class TypeCollectionContext {
diff --git a/tests/baselines/reference/parserRealSource7.errors.txt b/tests/baselines/reference/parserRealSource7.errors.txt
index 7945e5d7034..a3635dabc48 100644
--- a/tests/baselines/reference/parserRealSource7.errors.txt
+++ b/tests/baselines/reference/parserRealSource7.errors.txt
@@ -309,7 +309,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource7.ts(828,13): error T
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export class Continuation {
diff --git a/tests/baselines/reference/parserRealSource8.errors.txt b/tests/baselines/reference/parserRealSource8.errors.txt
index d497b0884db..6249d3fd991 100644
--- a/tests/baselines/reference/parserRealSource8.errors.txt
+++ b/tests/baselines/reference/parserRealSource8.errors.txt
@@ -140,7 +140,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource8.ts(454,35): error T
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
     
diff --git a/tests/baselines/reference/parserRealSource9.errors.txt b/tests/baselines/reference/parserRealSource9.errors.txt
index 9d89848ff20..caa142db60e 100644
--- a/tests/baselines/reference/parserRealSource9.errors.txt
+++ b/tests/baselines/reference/parserRealSource9.errors.txt
@@ -39,7 +39,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource9.ts(200,48): error T
     
     ///<reference path='typescript.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
     
     module TypeScript {
         export class Binder {
diff --git a/tests/baselines/reference/parserharness.errors.txt b/tests/baselines/reference/parserharness.errors.txt
index 963ce12ddf1..fd9ad6d3a10 100644
--- a/tests/baselines/reference/parserharness.errors.txt
+++ b/tests/baselines/reference/parserharness.errors.txt
@@ -128,16 +128,16 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserharness.ts(2030,32):
     
     ///<reference path='..\compiler\io.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'io.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/compiler/io.ts' not found.
     ///<reference path='..\compiler\typescript.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescript.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/compiler/typescript.ts' not found.
     ///<reference path='..\services\typescriptServices.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'typescriptServices.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/services/typescriptServices.ts' not found.
     ///<reference path='diff.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'diff.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/RealWorld/diff.ts' not found.
     
     declare var assert: Harness.Assert;
                                 ~~~~~~
diff --git a/tests/baselines/reference/parserindenter.errors.txt b/tests/baselines/reference/parserindenter.errors.txt
index 8ccc9220710..2f51281e7aa 100644
--- a/tests/baselines/reference/parserindenter.errors.txt
+++ b/tests/baselines/reference/parserindenter.errors.txt
@@ -146,7 +146,7 @@ tests/cases/conformance/parser/ecmascript5/RealWorld/parserindenter.ts(736,38):
     
     ///<reference path='formatting.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'formatting.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/parser/ecmascript5/RealWorld/formatting.ts' not found.
     
     
     module Formatting {
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
index dd2b221798c..68a1ef3b7c9 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
@@ -1,7 +1,7 @@
 importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/entry.js (0 errors) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -10,7 +10,7 @@ importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
@@ -22,7 +22,7 @@ importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type
     
     exports.f2 = m2;
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+==== index.js (0 errors) ====
     exports.person = {
         "name": "John Doe",
         "age": 42
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt b/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
index dd2b221798c..68a1ef3b7c9 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
@@ -1,7 +1,7 @@
 importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/entry.js (0 errors) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -10,7 +10,7 @@ importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
@@ -22,7 +22,7 @@ importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type
     
     exports.f2 = m2;
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/importHigher/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+==== index.js (0 errors) ====
     exports.person = {
         "name": "John Doe",
         "age": 42
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
index 81612e2a387..f03b958275b 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
@@ -1,7 +1,7 @@
 maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/entry.js (0 errors) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -10,7 +10,7 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
index 81612e2a387..f03b958275b 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
@@ -1,7 +1,7 @@
 maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m2/entry.js (0 errors) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -10,7 +10,7 @@ maxDepthExceeded/root.ts(3,1): error TS2322: Type 'string' is not assignable to
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthExceeded/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
index 5a395b70ee6..f63c2a789e8 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
@@ -1,13 +1,13 @@
 maxDepthIncreased/root.ts(4,1): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+==== index.js (0 errors) ====
     exports.person = {
         "name": "John Doe",
         "age": 42
     }
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/entry.js (0 errors) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -16,7 +16,7 @@ maxDepthIncreased/root.ts(4,1): error TS2322: Type 'string' is not assignable to
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
index 5a395b70ee6..f63c2a789e8 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
@@ -1,13 +1,13 @@
 maxDepthIncreased/root.ts(4,1): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/node_modules/m3/index.js (0 errors) ====
+==== index.js (0 errors) ====
     exports.person = {
         "name": "John Doe",
         "age": 42
     }
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m2/entry.js (0 errors) ====
+==== entry.js (0 errors) ====
     var m3 = require("m3");
     
     module.exports = {
@@ -16,7 +16,7 @@ maxDepthIncreased/root.ts(4,1): error TS2322: Type 'string' is not assignable to
     	"person": m3.person
     };
     
-==== C:/src/TypeScript/tests/cases/projects/NodeModulesSearch/maxDepthIncreased/node_modules/m1/index.js (0 errors) ====
+==== index.js (0 errors) ====
     var m2 = require('m2');
     
     /**
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
index dfbdd679685..f0809b38f27 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
@@ -1,7 +1,7 @@
 error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 
 
-!!! error TS6059: File 'fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
+!!! error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 ==== FolderA/FolderB/FolderC/fileC.ts (0 errors) ====
     class C {
     }
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
index dfbdd679685..f0809b38f27 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
@@ -1,7 +1,7 @@
 error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 
 
-!!! error TS6059: File 'fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
+!!! error TS6059: File 'FolderA/FolderB/fileB.ts' is not under 'rootDir' 'FolderA/FolderB/FolderC'. 'rootDir' is expected to contain all source files.
 ==== FolderA/FolderB/FolderC/fileC.ts (0 errors) ====
     class C {
     }
diff --git a/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt b/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
index d02593feff9..922ff48ef58 100644
--- a/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
+++ b/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/requireOfAnEmptyFile1_a.ts(3,21): error TS2306: File 'tests
     
     import fs = require('./requireOfAnEmptyFile1_b');
                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2306: File 'requireOfAnEmptyFile1_b.ts' is not a module.
+!!! error TS2306: File 'tests/cases/compiler/requireOfAnEmptyFile1_b.ts' is not a module.
     
 ==== tests/cases/compiler/requireOfAnEmptyFile1_b.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/baselines/reference/scannertest1.errors.txt b/tests/baselines/reference/scannertest1.errors.txt
index 3831dbe398e..fce2a0b292a 100644
--- a/tests/baselines/reference/scannertest1.errors.txt
+++ b/tests/baselines/reference/scannertest1.errors.txt
@@ -19,7 +19,7 @@ tests/cases/conformance/scanner/ecmascript5/scannertest1.ts(20,23): error TS2304
 ==== tests/cases/conformance/scanner/ecmascript5/scannertest1.ts (16 errors) ====
     ///<reference path='References.ts' />
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'References.ts' not found.
+!!! error TS6053: File 'tests/cases/conformance/scanner/ecmascript5/References.ts' not found.
     
     class CharacterInfo {
         public static isDecimalDigit(c: number): boolean {
diff --git a/tests/baselines/reference/selfReferencingFile2.errors.txt b/tests/baselines/reference/selfReferencingFile2.errors.txt
index c993616784a..002e087d60e 100644
--- a/tests/baselines/reference/selfReferencingFile2.errors.txt
+++ b/tests/baselines/reference/selfReferencingFile2.errors.txt
@@ -4,7 +4,7 @@ tests/cases/compiler/selfReferencingFile2.ts(1,1): error TS6053: File 'tests/cas
 ==== tests/cases/compiler/selfReferencingFile2.ts (1 errors) ====
     ///<reference path='../selfReferencingFile2.ts'/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6053: File 'selfReferencingFile2.ts' not found.
+!!! error TS6053: File 'tests/cases/selfReferencingFile2.ts' not found.
     
     class selfReferencingFile2 {