From c63dfbd4c7c0905b016e9b317ca2bb150ea24136 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 15 Sep 2015 11:43:28 -0700
Subject: [PATCH] Update node resolution tests

---
 .../aliasUsageInFunctionExpression.symbols    | 16 ++---
 .../aliasUsageInFunctionExpression.types      |  6 +-
 .../reference/aliasUsageInGenericFunction.js  | 10 ++--
 .../aliasUsageInGenericFunction.symbols       | 18 +++---
 .../aliasUsageInGenericFunction.types         |  6 +-
 .../reference/aliasUsageInIndexerOfClass.js   | 10 ++--
 .../aliasUsageInIndexerOfClass.symbols        | 20 +++----
 .../aliasUsageInIndexerOfClass.types          |  6 +-
 .../reference/aliasUsageInObjectLiteral.js    | 10 ++--
 .../aliasUsageInObjectLiteral.symbols         | 24 ++++----
 .../reference/aliasUsageInObjectLiteral.types |  6 +-
 .../reference/aliasUsageInOrExpression.js     | 10 ++--
 .../aliasUsageInOrExpression.symbols          | 36 +++++------
 .../reference/aliasUsageInOrExpression.types  |  6 +-
 ...aliasUsageInTypeArgumentOfExtendsClause.js | 10 ++--
 ...UsageInTypeArgumentOfExtendsClause.symbols | 18 +++---
 ...asUsageInTypeArgumentOfExtendsClause.types |  6 +-
 .../reference/aliasUsageInVarAssignment.js    |  8 +--
 .../aliasUsageInVarAssignment.symbols         | 16 ++---
 .../reference/aliasUsageInVarAssignment.types |  6 +-
 .../reference/aliasUsedAsNameValue.js         |  8 +--
 .../reference/aliasUsedAsNameValue.symbols    |  8 +--
 .../reference/aliasUsedAsNameValue.types      |  4 +-
 ...tAssignmentUsedInVarInitializer.errors.txt |  2 +-
 ...aceExportAssignmentUsedInVarInitializer.js |  2 +-
 .../reference/arrayOfExportedClass.js         |  2 +-
 .../reference/arrayOfExportedClass.symbols    |  8 +--
 .../reference/arrayOfExportedClass.types      |  2 +-
 .../baselines/reference/chainedImportAlias.js |  4 +-
 .../reference/chainedImportAlias.symbols      |  6 +-
 .../reference/chainedImportAlias.types        |  2 +-
 .../reference/commentsExternalModules3.js     |  6 +-
 .../commentsExternalModules3.symbols          |  2 +-
 .../reference/commentsExternalModules3.types  |  2 +-
 .../declFileAliasUseBeforeDeclaration.js      |  4 +-
 .../declFileAliasUseBeforeDeclaration.symbols |  2 +-
 .../declFileAliasUseBeforeDeclaration.types   |  2 +-
 .../reference/declFileForExportedImport.js    |  6 +-
 .../declFileForExportedImport.symbols         |  2 +-
 .../reference/declFileForExportedImport.types |  2 +-
 ...eclFileImportModuleWithExportAssignment.js |  6 +-
 ...leImportModuleWithExportAssignment.symbols |  2 +-
 ...FileImportModuleWithExportAssignment.types |  2 +-
 .../declarationEmit_exportAssignment.js       |  6 +-
 .../declarationEmit_exportAssignment.symbols  |  2 +-
 .../declarationEmit_exportAssignment.types    |  2 +-
 .../declarationEmit_exportDeclaration.js      |  6 +-
 .../declarationEmit_exportDeclaration.symbols |  2 +-
 .../declarationEmit_exportDeclaration.types   |  2 +-
 .../declarationEmit_nameConflicts.js          |  6 +-
 .../declarationEmit_nameConflicts.symbols     | 30 +++++-----
 .../declarationEmit_nameConflicts.types       |  2 +-
 .../defaultExportsCannotMerge01.errors.txt    | 19 ++----
 .../defaultExportsCannotMerge02.errors.txt    | 19 ++----
 .../defaultExportsCannotMerge03.errors.txt    | 19 ++----
 .../baselines/reference/elidingImportNames.js |  8 +--
 .../reference/elidingImportNames.symbols      |  4 +-
 .../reference/elidingImportNames.types        |  4 +-
 .../reference/enumFromExternalModule.js       |  4 +-
 .../reference/enumFromExternalModule.symbols  |  2 +-
 .../reference/enumFromExternalModule.types    |  2 +-
 .../errorsOnImportedSymbol.errors.txt         |  2 +-
 .../reference/errorsOnImportedSymbol.js       |  2 +-
 .../baselines/reference/es6ExportAllInEs5.js  |  6 +-
 .../reference/es6ExportAllInEs5.symbols       |  2 +-
 .../reference/es6ExportAllInEs5.types         |  2 +-
 ...ExportClauseWithoutModuleSpecifierInEs5.js | 28 ++++-----
 ...tClauseWithoutModuleSpecifierInEs5.symbols | 10 ++--
 ...ortClauseWithoutModuleSpecifierInEs5.types | 10 ++--
 .../reference/es6ImportDefaultBindingDts.js   |  8 +--
 .../es6ImportDefaultBindingDts.symbols        |  4 +-
 .../es6ImportDefaultBindingDts.types          |  4 +-
 ...tBindingFollowedWithNamedImport.errors.txt | 12 ++--
 ...rtDefaultBindingFollowedWithNamedImport.js | 22 +++----
 ...ngFollowedWithNamedImport1InEs5.errors.txt | 12 ++--
 ...ultBindingFollowedWithNamedImport1InEs5.js | 24 ++++----
 ...lowedWithNamedImport1WithExport.errors.txt | 12 ++--
 ...ndingFollowedWithNamedImport1WithExport.js | 24 ++++----
 ...ndingFollowedWithNamedImportDts.errors.txt | 12 ++--
 ...efaultBindingFollowedWithNamedImportDts.js | 32 +++++-----
 ...dingFollowedWithNamedImportDts1.errors.txt | 12 ++--
 ...faultBindingFollowedWithNamedImportDts1.js | 26 ++++----
 ...ingFollowedWithNamedImportInEs5.errors.txt | 12 ++--
 ...aultBindingFollowedWithNamedImportInEs5.js | 22 +++----
 ...ndingFollowedWithNamespaceBinding1InEs5.js |  4 +-
 ...FollowedWithNamespaceBinding1InEs5.symbols |  2 +-
 ...ngFollowedWithNamespaceBinding1InEs5.types |  2 +-
 ...FollowedWithNamespaceBindingDts.errors.txt |  2 +-
 ...tBindingFollowedWithNamespaceBindingDts.js |  6 +-
 ...llowedWithNamespaceBindingInEs5.errors.txt |  2 +-
 ...indingFollowedWithNamespaceBindingInEs5.js |  4 +-
 ...dWithNamespaceBindingWithExport.errors.txt |  2 +-
 ...gFollowedWithNamespaceBindingWithExport.js |  4 +-
 .../es6ImportDefaultBindingInEs5.errors.txt   |  2 +-
 .../reference/es6ImportDefaultBindingInEs5.js |  2 +-
 ...ImportDefaultBindingMergeErrors.errors.txt |  8 +--
 .../es6ImportDefaultBindingMergeErrors.js     | 10 ++--
 ...DefaultBindingNoDefaultProperty.errors.txt |  2 +-
 ...s6ImportDefaultBindingNoDefaultProperty.js |  2 +-
 .../es6ImportNameSpaceImport.errors.txt       |  4 +-
 .../reference/es6ImportNameSpaceImport.js     |  6 +-
 .../reference/es6ImportNameSpaceImportDts.js  |  8 +--
 .../es6ImportNameSpaceImportDts.symbols       |  4 +-
 .../es6ImportNameSpaceImportDts.types         |  4 +-
 .../es6ImportNameSpaceImportInEs5.js          |  6 +-
 .../es6ImportNameSpaceImportInEs5.symbols     |  4 +-
 .../es6ImportNameSpaceImportInEs5.types       |  4 +-
 ...mportNameSpaceImportMergeErrors.errors.txt |  8 +--
 .../es6ImportNameSpaceImportMergeErrors.js    |  8 +--
 .../es6ImportNameSpaceImportNoNamedExports.js |  2 +-
 ...mportNameSpaceImportNoNamedExports.symbols |  2 +-
 ...6ImportNameSpaceImportNoNamedExports.types |  2 +-
 .../reference/es6ImportNamedImport.errors.txt | 24 ++++----
 .../reference/es6ImportNamedImport.js         | 42 ++++++-------
 .../reference/es6ImportNamedImportDts.js      | 60 +++++++++----------
 .../reference/es6ImportNamedImportDts.symbols | 24 ++++----
 .../reference/es6ImportNamedImportDts.types   | 24 ++++----
 .../reference/es6ImportNamedImportInEs5.js    | 42 ++++++-------
 .../es6ImportNamedImportInEs5.symbols         | 24 ++++----
 .../reference/es6ImportNamedImportInEs5.types | 24 ++++----
 ...rtNamedImportInExportAssignment.errors.txt |  2 +-
 .../es6ImportNamedImportInExportAssignment.js |  6 +-
 ...rtNamedImportInIndirectExportAssignment.js |  6 +-
 ...edImportInIndirectExportAssignment.symbols |  6 +-
 ...amedImportInIndirectExportAssignment.types |  2 +-
 ...es6ImportNamedImportMergeErrors.errors.txt | 12 ++--
 .../es6ImportNamedImportMergeErrors.js        | 12 ++--
 ...ImportNamedImportNoExportMember.errors.txt |  4 +-
 .../es6ImportNamedImportNoExportMember.js     |  4 +-
 ...ImportNamedImportNoNamedExports.errors.txt |  4 +-
 .../es6ImportNamedImportNoNamedExports.js     |  4 +-
 .../es6ImportNamedImportWithExport.errors.txt | 24 ++++----
 .../es6ImportNamedImportWithExport.js         | 42 ++++++-------
 .../es6ImportNamedImportWithTypesAndValues.js |  6 +-
 ...mportNamedImportWithTypesAndValues.symbols |  4 +-
 ...6ImportNamedImportWithTypesAndValues.types |  2 +-
 .../reference/exportAssignClassAndModule.js   |  2 +-
 .../exportAssignClassAndModule.symbols        |  2 +-
 .../exportAssignClassAndModule.types          |  2 +-
 .../reference/exportAssignmentEnum.js         |  4 +-
 .../reference/exportAssignmentEnum.symbols    |  2 +-
 .../reference/exportAssignmentEnum.types      |  2 +-
 ...ignmentOfDeclaredExternalModule.errors.txt |  2 +-
 ...xportAssignmentOfDeclaredExternalModule.js |  2 +-
 .../reference/exportAssignmentVariable.js     |  4 +-
 .../exportAssignmentVariable.symbols          |  2 +-
 .../reference/exportAssignmentVariable.types  |  2 +-
 .../exportEqualMemberMissing.errors.txt       |  2 +-
 .../reference/exportEqualMemberMissing.js     |  4 +-
 .../exportStarFromEmptyModule.errors.txt      |  8 +--
 .../reference/exportStarFromEmptyModule.js    | 16 ++---
 ...xtendingClassFromAliasAndUsageInIndexer.js | 18 +++---
 ...ingClassFromAliasAndUsageInIndexer.symbols | 30 +++++-----
 ...ndingClassFromAliasAndUsageInIndexer.types | 10 ++--
 ...rnalModuleExportingGenericClass.errors.txt |  2 +-
 .../externalModuleExportingGenericClass.js    |  4 +-
 ...externalModuleImmutableBindings.errors.txt |  2 +-
 .../externalModuleImmutableBindings.js        |  4 +-
 .../reference/importAsBaseClass.errors.txt    |  2 +-
 .../baselines/reference/importAsBaseClass.js  |  4 +-
 tests/baselines/reference/importDecl.js       | 34 +++++------
 tests/baselines/reference/importDecl.symbols  | 22 +++----
 tests/baselines/reference/importDecl.types    | 14 ++---
 .../importDeclarationUsedAsTypeQuery.js       |  4 +-
 .../importDeclarationUsedAsTypeQuery.symbols  |  2 +-
 .../importDeclarationUsedAsTypeQuery.types    |  2 +-
 .../reference/importUsedInExtendsList1.js     |  4 +-
 .../importUsedInExtendsList1.symbols          |  6 +-
 .../reference/importUsedInExtendsList1.types  |  2 +-
 .../reference/localAliasExportAssignment.js   |  4 +-
 .../localAliasExportAssignment.symbols        |  2 +-
 .../localAliasExportAssignment.types          |  2 +-
 .../moduleInTypePosition1.errors.txt          |  2 +-
 .../reference/moduleInTypePosition1.js        |  2 +-
 .../baselines/reference/multiImportExport.js  | 12 ++--
 .../reference/multiImportExport.symbols       |  4 +-
 .../reference/multiImportExport.types         |  4 +-
 .../multipleDefaultExports01.errors.txt       |  2 +-
 .../reference/multipleDefaultExports01.js     |  4 +-
 .../multipleDefaultExports02.errors.txt       |  2 +-
 .../reference/multipleDefaultExports02.js     |  4 +-
 ...ivacyCannotNameAccessorDeclFile.errors.txt |  4 +-
 .../privacyCannotNameAccessorDeclFile.js      | 10 ++--
 ...rivacyCannotNameVarTypeDeclFile.errors.txt |  4 +-
 .../privacyCannotNameVarTypeDeclFile.js       | 10 ++--
 ...nalModuleExportAssignmentOfGenericClass.js |  4 +-
 ...duleExportAssignmentOfGenericClass.symbols |  2 +-
 ...ModuleExportAssignmentOfGenericClass.types |  2 +-
 ...CannotNameParameterTypeDeclFile.errors.txt |  4 +-
 ...FunctionCannotNameParameterTypeDeclFile.js | 10 ++--
 ...ionCannotNameReturnTypeDeclFile.errors.txt |  4 +-
 ...acyFunctionCannotNameReturnTypeDeclFile.js | 10 ++--
 ...elAmbientExternalModuleImportWithExport.js | 12 ++--
 ...ientExternalModuleImportWithExport.symbols | 20 +++----
 ...mbientExternalModuleImportWithExport.types |  4 +-
 .../requireOfAnEmptyFile1.errors.txt          |  4 +-
 .../reference/requireOfAnEmptyFile1.js        |  2 +-
 .../reference/reuseInnerModuleMember.js       |  2 +-
 .../reference/reuseInnerModuleMember.symbols  |  6 +-
 .../reference/reuseInnerModuleMember.types    |  2 +-
 .../reference/staticInstanceResolution3.js    |  4 +-
 .../staticInstanceResolution3.symbols         |  2 +-
 .../reference/staticInstanceResolution3.types |  2 +-
 .../baselines/reference/topLevelFileModule.js |  8 +--
 .../reference/topLevelFileModule.symbols      |  8 +--
 .../reference/topLevelFileModule.types        |  4 +-
 ...pressionWithUndefinedCallResolutionData.js |  4 +-
 ...ionWithUndefinedCallResolutionData.symbols |  2 +-
 ...ssionWithUndefinedCallResolutionData.types |  2 +-
 .../typeofAmbientExternalModules.errors.txt   |  4 +-
 .../reference/typeofAmbientExternalModules.js |  8 +--
 .../typeofExternalModules.errors.txt          |  4 +-
 .../reference/typeofExternalModules.js        |  8 +--
 .../reference/unusedImportDeclaration.js      |  2 +-
 .../reference/unusedImportDeclaration.symbols |  2 +-
 .../reference/unusedImportDeclaration.types   |  2 +-
 .../visibilityOfCrossModuleTypeUsage.js       |  6 +-
 .../visibilityOfCrossModuleTypeUsage.symbols  | 18 +++---
 .../visibilityOfCrossModuleTypeUsage.types    |  6 +-
 .../voidAsNonAmbiguousReturnType.errors.txt   |  2 +-
 .../reference/voidAsNonAmbiguousReturnType.js |  4 +-
 tests/cases/compiler/aliasAssignments.ts      |  2 +-
 .../compiler/aliasUsageInAccessorsOfClass.ts  |  8 +--
 tests/cases/compiler/aliasUsageInArray.ts     |  6 +-
 .../aliasUsageInFunctionExpression.ts         |  8 +--
 .../compiler/aliasUsageInGenericFunction.ts   |  8 +--
 .../compiler/aliasUsageInIndexerOfClass.ts    |  8 +--
 .../compiler/aliasUsageInObjectLiteral.ts     |  8 +--
 .../compiler/aliasUsageInOrExpression.ts      |  8 +--
 ...aliasUsageInTypeArgumentOfExtendsClause.ts |  8 +--
 .../compiler/aliasUsageInVarAssignment.ts     |  8 +--
 tests/cases/compiler/aliasUsedAsNameValue.ts  |  6 +-
 ...aceExportAssignmentUsedInVarInitializer.ts |  4 +-
 tests/cases/compiler/arrayOfExportedClass.ts  |  4 +-
 tests/cases/compiler/chainedImportAlias.ts    |  4 +-
 .../compiler/commentsExternalModules3.ts      |  2 +-
 .../declFileAliasUseBeforeDeclaration.ts      |  6 +-
 .../compiler/declFileForExportedImport.ts     |  2 +-
 ...eclFileImportModuleWithExportAssignment.ts |  4 +-
 .../declarationEmit_exportAssignment.ts       |  2 +-
 .../declarationEmit_exportDeclaration.ts      |  2 +-
 .../compiler/declarationEmit_nameConflicts.ts |  2 +-
 tests/cases/compiler/elidingImportNames.ts    |  4 +-
 .../cases/compiler/enumFromExternalModule.ts  |  4 +-
 .../cases/compiler/errorsOnImportedSymbol.ts  |  6 +-
 tests/cases/compiler/es6ExportAllInEs5.ts     |  2 +-
 ...ExportClauseWithoutModuleSpecifierInEs5.ts | 10 ++--
 .../compiler/es6ImportDefaultBindingDts.ts    |  4 +-
 ...rtDefaultBindingFollowedWithNamedImport.ts | 12 ++--
 ...ultBindingFollowedWithNamedImport1InEs5.ts | 12 ++--
 ...ndingFollowedWithNamedImport1WithExport.ts | 12 ++--
 ...efaultBindingFollowedWithNamedImportDts.ts | 12 ++--
 ...faultBindingFollowedWithNamedImportDts1.ts | 12 ++--
 ...aultBindingFollowedWithNamedImportInEs5.ts | 12 ++--
 ...ndingFollowedWithNamespaceBinding1InEs5.ts |  2 +-
 ...tBindingFollowedWithNamespaceBindingDts.ts |  2 +-
 ...indingFollowedWithNamespaceBindingInEs5.ts |  2 +-
 ...gFollowedWithNamespaceBindingWithExport.ts |  2 +-
 .../compiler/es6ImportDefaultBindingInEs5.ts  |  2 +-
 .../es6ImportDefaultBindingMergeErrors.ts     |  8 +--
 ...s6ImportDefaultBindingNoDefaultProperty.ts |  2 +-
 .../compiler/es6ImportNameSpaceImport.ts      |  4 +-
 .../compiler/es6ImportNameSpaceImportDts.ts   |  4 +-
 .../compiler/es6ImportNameSpaceImportInEs5.ts |  4 +-
 .../es6ImportNameSpaceImportMergeErrors.ts    |  8 +--
 .../es6ImportNameSpaceImportNoNamedExports.ts |  2 +-
 tests/cases/compiler/es6ImportNamedImport.ts  | 24 ++++----
 .../cases/compiler/es6ImportNamedImportDts.ts | 24 ++++----
 .../compiler/es6ImportNamedImportInEs5.ts     | 24 ++++----
 .../es6ImportNamedImportInExportAssignment.ts |  2 +-
 ...rtNamedImportInIndirectExportAssignment.ts |  2 +-
 .../es6ImportNamedImportMergeErrors.ts        | 12 ++--
 .../es6ImportNamedImportNoExportMember.ts     |  4 +-
 .../es6ImportNamedImportNoNamedExports.ts     |  4 +-
 .../es6ImportNamedImportWithExport.ts         | 24 ++++----
 .../es6ImportNamedImportWithTypesAndValues.ts |  2 +-
 .../compiler/exportAssignClassAndModule.ts    |  4 +-
 tests/cases/compiler/exportAssignmentEnum.ts  |  4 +-
 ...xportAssignmentOfDeclaredExternalModule.ts |  4 +-
 .../compiler/exportAssignmentVariable.ts      |  4 +-
 .../compiler/exportEqualMemberMissing.ts      |  4 +-
 .../compiler/exportStarFromEmptyModule.ts     |  6 +-
 ...xtendingClassFromAliasAndUsageInIndexer.ts | 12 ++--
 .../externalModuleExportingGenericClass.ts    |  2 +-
 .../externalModuleImmutableBindings.ts        |  2 +-
 ...ernceResolutionOrderInImportDeclaration.ts |  4 +-
 tests/cases/compiler/importAsBaseClass.ts     |  4 +-
 tests/cases/compiler/importDecl.ts            | 16 ++---
 .../importDeclarationUsedAsTypeQuery.ts       |  4 +-
 .../compiler/importUsedInExtendsList1.ts      |  4 +-
 .../compiler/localAliasExportAssignment.ts    |  4 +-
 tests/cases/compiler/moduleInTypePosition1.ts |  4 +-
 tests/cases/compiler/multiImportExport.ts     |  4 +-
 .../privacyCannotNameAccessorDeclFile.ts      |  4 +-
 .../privacyCannotNameVarTypeDeclFile.ts       |  4 +-
 ...nalModuleExportAssignmentOfGenericClass.ts |  6 +-
 ...FunctionCannotNameParameterTypeDeclFile.ts |  4 +-
 ...acyFunctionCannotNameReturnTypeDeclFile.ts |  4 +-
 ...elAmbientExternalModuleImportWithExport.ts |  8 +--
 tests/cases/compiler/requireOfAnEmptyFile1.ts |  4 +-
 .../cases/compiler/reuseInnerModuleMember.ts  |  4 +-
 .../compiler/staticInstanceResolution3.ts     |  4 +-
 ...pressionWithUndefinedCallResolutionData.ts |  4 +-
 .../compiler/typeofAmbientExternalModules.ts  |  6 +-
 tests/cases/compiler/typeofExternalModules.ts |  6 +-
 .../cases/compiler/unusedImportDeclaration.ts |  6 +-
 .../visibilityOfCrossModuleTypeUsage.ts       |  8 +--
 .../compiler/voidAsNonAmbiguousReturnType.ts  |  4 +-
 .../es6/modules/multipleDefaultExports01.ts   |  2 +-
 .../es6/modules/multipleDefaultExports02.ts   |  2 +-
 .../externalModules/topLevelFileModule.ts     |  4 +-
 .../topLevelModuleDeclarationAndFile.ts       |  2 +-
 312 files changed, 1149 insertions(+), 1176 deletions(-)

diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.symbols b/tests/baselines/reference/aliasUsageInFunctionExpression.symbols
index 2afb6be55c5..bd791d4d38f 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.symbols
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInFunctionExpression_main.ts ===
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInFunctionExpression_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInFunctionExpression_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInFunctionExpression_main.ts, 0, 69))
+import moduleA = require("./aliasUsageInFunctionExpression_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInFunctionExpression_main.ts, 0, 71))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 1, 67))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 1, 69))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 2, 34))
@@ -17,13 +17,13 @@ interface IHasVisualizationModel {
 var f = (x: IHasVisualizationModel) => x;
 >f : Symbol(f, Decl(aliasUsageInFunctionExpression_main.ts, 5, 3))
 >x : Symbol(x, Decl(aliasUsageInFunctionExpression_main.ts, 5, 9))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 1, 67))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInFunctionExpression_main.ts, 1, 69))
 >x : Symbol(x, Decl(aliasUsageInFunctionExpression_main.ts, 5, 9))
 
 f = (x) => moduleA;
 >f : Symbol(f, Decl(aliasUsageInFunctionExpression_main.ts, 5, 3))
 >x : Symbol(x, Decl(aliasUsageInFunctionExpression_main.ts, 6, 5))
->moduleA : Symbol(moduleA, Decl(aliasUsageInFunctionExpression_main.ts, 0, 69))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInFunctionExpression_main.ts, 0, 71))
 
 === tests/cases/compiler/aliasUsageInFunctionExpression_backbone.ts ===
 export class Model {
@@ -34,11 +34,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInFunctionExpression_moduleA.ts ===
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInFunctionExpression_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInFunctionExpression_moduleA.ts, 0, 69))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInFunctionExpression_moduleA.ts, 0, 71))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInFunctionExpression_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInFunctionExpression_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInFunctionExpression_backbone.ts, 0, 0))
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.types b/tests/baselines/reference/aliasUsageInFunctionExpression.types
index eec4341fd67..15716de5330 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.types
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInFunctionExpression_main.ts ===
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInFunctionExpression_moduleA");
+import moduleA = require("./aliasUsageInFunctionExpression_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -37,7 +37,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInFunctionExpression_moduleA.ts ===
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js
index 8706dd592eb..7091c6d27c6 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInGenericFunction_moduleA.ts]
-import Backbone = require("aliasUsageInGenericFunction_backbone");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInGenericFunction_main.ts]
-import Backbone = require("aliasUsageInGenericFunction_backbone");
-import moduleA = require("aliasUsageInGenericFunction_moduleA");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
+import moduleA = require("./aliasUsageInGenericFunction_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInGenericFunction_backbone");
+var Backbone = require("./aliasUsageInGenericFunction_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -47,7 +47,7 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInGenericFunction_main.js]
-var moduleA = require("aliasUsageInGenericFunction_moduleA");
+var moduleA = require("./aliasUsageInGenericFunction_moduleA");
 function foo(x) {
     return x;
 }
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.symbols b/tests/baselines/reference/aliasUsageInGenericFunction.symbols
index 3f001e8bd1a..fccf60c3514 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.symbols
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInGenericFunction_main.ts ===
-import Backbone = require("aliasUsageInGenericFunction_backbone");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInGenericFunction_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInGenericFunction_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInGenericFunction_main.ts, 0, 66))
+import moduleA = require("./aliasUsageInGenericFunction_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInGenericFunction_main.ts, 0, 68))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 64))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 66))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 2, 34))
@@ -18,7 +18,7 @@ function foo<T extends { a: IHasVisualizationModel }>(x: T) {
 >foo : Symbol(foo, Decl(aliasUsageInGenericFunction_main.ts, 4, 1))
 >T : Symbol(T, Decl(aliasUsageInGenericFunction_main.ts, 5, 13))
 >a : Symbol(a, Decl(aliasUsageInGenericFunction_main.ts, 5, 24))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 64))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 66))
 >x : Symbol(x, Decl(aliasUsageInGenericFunction_main.ts, 5, 54))
 >T : Symbol(T, Decl(aliasUsageInGenericFunction_main.ts, 5, 13))
 
@@ -29,13 +29,13 @@ var r = foo({ a: moduleA });
 >r : Symbol(r, Decl(aliasUsageInGenericFunction_main.ts, 8, 3))
 >foo : Symbol(foo, Decl(aliasUsageInGenericFunction_main.ts, 4, 1))
 >a : Symbol(a, Decl(aliasUsageInGenericFunction_main.ts, 8, 13))
->moduleA : Symbol(moduleA, Decl(aliasUsageInGenericFunction_main.ts, 0, 66))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInGenericFunction_main.ts, 0, 68))
 
 var r2 = foo({ a: <IHasVisualizationModel>null });
 >r2 : Symbol(r2, Decl(aliasUsageInGenericFunction_main.ts, 9, 3))
 >foo : Symbol(foo, Decl(aliasUsageInGenericFunction_main.ts, 4, 1))
 >a : Symbol(a, Decl(aliasUsageInGenericFunction_main.ts, 9, 14))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 64))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInGenericFunction_main.ts, 1, 66))
 
 === tests/cases/compiler/aliasUsageInGenericFunction_backbone.ts ===
 export class Model {
@@ -46,11 +46,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInGenericFunction_moduleA.ts ===
-import Backbone = require("aliasUsageInGenericFunction_backbone");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInGenericFunction_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInGenericFunction_moduleA.ts, 0, 66))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInGenericFunction_moduleA.ts, 0, 68))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInGenericFunction_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInGenericFunction_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInGenericFunction_backbone.ts, 0, 0))
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.types b/tests/baselines/reference/aliasUsageInGenericFunction.types
index c21e691d773..5fe7a3e49ef 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.types
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInGenericFunction_main.ts ===
-import Backbone = require("aliasUsageInGenericFunction_backbone");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInGenericFunction_moduleA");
+import moduleA = require("./aliasUsageInGenericFunction_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -52,7 +52,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInGenericFunction_moduleA.ts ===
-import Backbone = require("aliasUsageInGenericFunction_backbone");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
index 78ddd2d4a94..82490739687 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInIndexerOfClass_moduleA.ts]
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInIndexerOfClass_main.ts]
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
-import moduleA = require("aliasUsageInIndexerOfClass_moduleA");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
+import moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -39,7 +39,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInIndexerOfClass_backbone");
+var Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -49,7 +49,7 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInIndexerOfClass_main.js]
-var moduleA = require("aliasUsageInIndexerOfClass_moduleA");
+var moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
 var N = (function () {
     function N() {
         this.x = moduleA;
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.symbols b/tests/baselines/reference/aliasUsageInIndexerOfClass.symbols
index 900653c7fd1..37529d2ead2 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.symbols
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInIndexerOfClass_main.ts ===
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInIndexerOfClass_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 65))
+import moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 67))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 63))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 65))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 2, 34))
@@ -19,22 +19,22 @@ class N {
 
     [idx: string]: IHasVisualizationModel
 >idx : Symbol(idx, Decl(aliasUsageInIndexerOfClass_main.ts, 6, 5))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 63))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 65))
 
     x = moduleA;
 >x : Symbol(x, Decl(aliasUsageInIndexerOfClass_main.ts, 6, 41))
->moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 65))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 67))
 }
 class N2 {
 >N2 : Symbol(N2, Decl(aliasUsageInIndexerOfClass_main.ts, 8, 1))
 
     [idx: string]: typeof moduleA
 >idx : Symbol(idx, Decl(aliasUsageInIndexerOfClass_main.ts, 10, 5))
->moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 65))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInIndexerOfClass_main.ts, 0, 67))
 
     x: IHasVisualizationModel;
 >x : Symbol(x, Decl(aliasUsageInIndexerOfClass_main.ts, 10, 33))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 63))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInIndexerOfClass_main.ts, 1, 65))
 }
 === tests/cases/compiler/aliasUsageInIndexerOfClass_backbone.ts ===
 export class Model {
@@ -45,11 +45,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA.ts ===
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInIndexerOfClass_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInIndexerOfClass_moduleA.ts, 0, 65))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInIndexerOfClass_moduleA.ts, 0, 67))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInIndexerOfClass_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInIndexerOfClass_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInIndexerOfClass_backbone.ts, 0, 0))
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.types b/tests/baselines/reference/aliasUsageInIndexerOfClass.types
index b7e4873ba34..d6040a90410 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.types
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInIndexerOfClass_main.ts ===
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInIndexerOfClass_moduleA");
+import moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -45,7 +45,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA.ts ===
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js
index f38cdf2111c..f1bb99018df 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInObjectLiteral_moduleA.ts]
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInObjectLiteral_main.ts]
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
-import moduleA = require("aliasUsageInObjectLiteral_moduleA");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
+import moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInObjectLiteral_backbone");
+var Backbone = require("./aliasUsageInObjectLiteral_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -44,7 +44,7 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInObjectLiteral_main.js]
-var moduleA = require("aliasUsageInObjectLiteral_moduleA");
+var moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 var a = { x: moduleA };
 var b = { x: moduleA };
 var c = { y: { z: moduleA } };
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.symbols b/tests/baselines/reference/aliasUsageInObjectLiteral.symbols
index a508e9fafc1..ef94a9037ad 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.symbols
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInObjectLiteral_main.ts ===
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInObjectLiteral_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInObjectLiteral_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 64))
+import moduleA = require("./aliasUsageInObjectLiteral_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 66))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 62))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 64))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 2, 34))
@@ -17,25 +17,25 @@ interface IHasVisualizationModel {
 var a: { x: typeof moduleA } = { x: moduleA };
 >a : Symbol(a, Decl(aliasUsageInObjectLiteral_main.ts, 5, 3))
 >x : Symbol(x, Decl(aliasUsageInObjectLiteral_main.ts, 5, 8))
->moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 64))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 66))
 >x : Symbol(x, Decl(aliasUsageInObjectLiteral_main.ts, 5, 32))
->moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 64))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 66))
 
 var b: { x: IHasVisualizationModel } = { x: moduleA };
 >b : Symbol(b, Decl(aliasUsageInObjectLiteral_main.ts, 6, 3))
 >x : Symbol(x, Decl(aliasUsageInObjectLiteral_main.ts, 6, 8))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 62))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 64))
 >x : Symbol(x, Decl(aliasUsageInObjectLiteral_main.ts, 6, 40))
->moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 64))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 66))
 
 var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } };
 >c : Symbol(c, Decl(aliasUsageInObjectLiteral_main.ts, 7, 3))
 >y : Symbol(y, Decl(aliasUsageInObjectLiteral_main.ts, 7, 8))
 >z : Symbol(z, Decl(aliasUsageInObjectLiteral_main.ts, 7, 13))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 62))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInObjectLiteral_main.ts, 1, 64))
 >y : Symbol(y, Decl(aliasUsageInObjectLiteral_main.ts, 7, 47))
 >z : Symbol(z, Decl(aliasUsageInObjectLiteral_main.ts, 7, 52))
->moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 64))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInObjectLiteral_main.ts, 0, 66))
 
 === tests/cases/compiler/aliasUsageInObjectLiteral_backbone.ts ===
 export class Model {
@@ -46,11 +46,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInObjectLiteral_moduleA.ts ===
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInObjectLiteral_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInObjectLiteral_moduleA.ts, 0, 64))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInObjectLiteral_moduleA.ts, 0, 66))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInObjectLiteral_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInObjectLiteral_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInObjectLiteral_backbone.ts, 0, 0))
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.types b/tests/baselines/reference/aliasUsageInObjectLiteral.types
index 5ab294b7350..5c8f08a6af2 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.types
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInObjectLiteral_main.ts ===
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInObjectLiteral_moduleA");
+import moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -50,7 +50,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInObjectLiteral_moduleA.ts ===
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js
index 906a2c019d7..817ad95aaea 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInOrExpression_moduleA.ts]
-import Backbone = require("aliasUsageInOrExpression_backbone");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInOrExpression_main.ts]
-import Backbone = require("aliasUsageInOrExpression_backbone");
-import moduleA = require("aliasUsageInOrExpression_moduleA");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
+import moduleA = require("./aliasUsageInOrExpression_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInOrExpression_backbone");
+var Backbone = require("./aliasUsageInOrExpression_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -47,7 +47,7 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInOrExpression_main.js]
-var moduleA = require("aliasUsageInOrExpression_moduleA");
+var moduleA = require("./aliasUsageInOrExpression_moduleA");
 var i;
 var d1 = i || moduleA;
 var d2 = i || moduleA;
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.symbols b/tests/baselines/reference/aliasUsageInOrExpression.symbols
index adfba01a119..3d9331b1fa9 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.symbols
+++ b/tests/baselines/reference/aliasUsageInOrExpression.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInOrExpression_main.ts ===
-import Backbone = require("aliasUsageInOrExpression_backbone");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInOrExpression_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInOrExpression_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+import moduleA = require("./aliasUsageInOrExpression_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 2, 34))
@@ -16,42 +16,42 @@ interface IHasVisualizationModel {
 }
 var i: IHasVisualizationModel;
 >i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 
 var d1 = i || moduleA;
 >d1 : Symbol(d1, Decl(aliasUsageInOrExpression_main.ts, 6, 3))
 >i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 var d2: IHasVisualizationModel = i || moduleA;
 >d2 : Symbol(d2, Decl(aliasUsageInOrExpression_main.ts, 7, 3), Decl(aliasUsageInOrExpression_main.ts, 8, 3))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 >i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 var d2: IHasVisualizationModel = moduleA || i;
 >d2 : Symbol(d2, Decl(aliasUsageInOrExpression_main.ts, 7, 3), Decl(aliasUsageInOrExpression_main.ts, 8, 3))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 >i : Symbol(i, Decl(aliasUsageInOrExpression_main.ts, 5, 3))
 
 var e: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null || { x: moduleA };
 >e : Symbol(e, Decl(aliasUsageInOrExpression_main.ts, 9, 3))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 9, 8))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 9, 41))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 9, 79))
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x: moduleA } : null;
 >f : Symbol(f, Decl(aliasUsageInOrExpression_main.ts, 10, 3))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 10, 8))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 10, 41))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 61))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInOrExpression_main.ts, 1, 63))
 >x : Symbol(x, Decl(aliasUsageInOrExpression_main.ts, 10, 78))
->moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 63))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInOrExpression_main.ts, 0, 65))
 
 === tests/cases/compiler/aliasUsageInOrExpression_backbone.ts ===
 export class Model {
@@ -62,11 +62,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInOrExpression_moduleA.ts ===
-import Backbone = require("aliasUsageInOrExpression_backbone");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInOrExpression_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInOrExpression_moduleA.ts, 0, 63))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInOrExpression_moduleA.ts, 0, 65))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInOrExpression_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInOrExpression_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInOrExpression_backbone.ts, 0, 0))
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.types b/tests/baselines/reference/aliasUsageInOrExpression.types
index f009e7084eb..c43b7889cc5 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.types
+++ b/tests/baselines/reference/aliasUsageInOrExpression.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInOrExpression_main.ts ===
-import Backbone = require("aliasUsageInOrExpression_backbone");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInOrExpression_moduleA");
+import moduleA = require("./aliasUsageInOrExpression_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -74,7 +74,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInOrExpression_moduleA.ts ===
-import Backbone = require("aliasUsageInOrExpression_backbone");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
index 27f85bb5fcd..270a2807319 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts]
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInTypeArgumentOfExtendsClause_main.ts]
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
-import moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -37,7 +37,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+var Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -52,7 +52,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
+var moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
 var C = (function () {
     function C() {
     }
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.symbols b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.symbols
index f3ca1f7ec37..6fc639da2c1 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.symbols
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_main.ts ===
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 78))
+import moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 80))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 76))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 78))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 2, 34))
@@ -17,7 +17,7 @@ interface IHasVisualizationModel {
 class C<T extends IHasVisualizationModel> {
 >C : Symbol(C, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 4, 1))
 >T : Symbol(T, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 5, 8))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 76))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 78))
 
     x: T;
 >x : Symbol(x, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 5, 43))
@@ -26,11 +26,11 @@ class C<T extends IHasVisualizationModel> {
 class D extends C<IHasVisualizationModel> {
 >D : Symbol(D, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 7, 1))
 >C : Symbol(C, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 4, 1))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 76))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 1, 78))
 
     x = moduleA;
 >x : Symbol(x, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 8, 43))
->moduleA : Symbol(moduleA, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 78))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInTypeArgumentOfExtendsClause_main.ts, 0, 80))
 }
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_backbone.ts ===
 export class Model {
@@ -41,11 +41,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts ===
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts, 0, 78))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts, 0, 80))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInTypeArgumentOfExtendsClause_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInTypeArgumentOfExtendsClause_backbone.ts, 0, 0))
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
index ae20caa9c37..3d3d3b6d3f5 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_main.ts ===
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
+import moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -41,7 +41,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts ===
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js
index bfc63868ff4..f7949348cdd 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -6,14 +6,14 @@ export class Model {
 }
 
 //// [aliasUsageInVarAssignment_moduleA.ts]
-import Backbone = require("aliasUsageInVarAssignment_backbone");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [aliasUsageInVarAssignment_main.ts]
-import Backbone = require("aliasUsageInVarAssignment_backbone");
-import moduleA = require("aliasUsageInVarAssignment_moduleA");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
+import moduleA = require("./aliasUsageInVarAssignment_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -33,7 +33,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("aliasUsageInVarAssignment_backbone");
+var Backbone = require("./aliasUsageInVarAssignment_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.symbols b/tests/baselines/reference/aliasUsageInVarAssignment.symbols
index d1996fe8ecb..d0e7f6b7d05 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.symbols
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/aliasUsageInVarAssignment_main.ts ===
-import Backbone = require("aliasUsageInVarAssignment_backbone");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInVarAssignment_main.ts, 0, 0))
 
-import moduleA = require("aliasUsageInVarAssignment_moduleA");
->moduleA : Symbol(moduleA, Decl(aliasUsageInVarAssignment_main.ts, 0, 64))
+import moduleA = require("./aliasUsageInVarAssignment_moduleA");
+>moduleA : Symbol(moduleA, Decl(aliasUsageInVarAssignment_main.ts, 0, 66))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 1, 62))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 1, 64))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 2, 34))
@@ -16,11 +16,11 @@ interface IHasVisualizationModel {
 }
 var i: IHasVisualizationModel;
 >i : Symbol(i, Decl(aliasUsageInVarAssignment_main.ts, 5, 3))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 1, 62))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(aliasUsageInVarAssignment_main.ts, 1, 64))
 
 var m: typeof moduleA = i;
 >m : Symbol(m, Decl(aliasUsageInVarAssignment_main.ts, 6, 3))
->moduleA : Symbol(moduleA, Decl(aliasUsageInVarAssignment_main.ts, 0, 64))
+>moduleA : Symbol(moduleA, Decl(aliasUsageInVarAssignment_main.ts, 0, 66))
 >i : Symbol(i, Decl(aliasUsageInVarAssignment_main.ts, 5, 3))
 
 === tests/cases/compiler/aliasUsageInVarAssignment_backbone.ts ===
@@ -32,11 +32,11 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInVarAssignment_moduleA.ts ===
-import Backbone = require("aliasUsageInVarAssignment_backbone");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
 >Backbone : Symbol(Backbone, Decl(aliasUsageInVarAssignment_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInVarAssignment_moduleA.ts, 0, 64))
+>VisualizationModel : Symbol(VisualizationModel, Decl(aliasUsageInVarAssignment_moduleA.ts, 0, 66))
 >Backbone.Model : Symbol(Backbone.Model, Decl(aliasUsageInVarAssignment_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(aliasUsageInVarAssignment_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(aliasUsageInVarAssignment_backbone.ts, 0, 0))
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.types b/tests/baselines/reference/aliasUsageInVarAssignment.types
index 6a23293ea7c..cf636a15240 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.types
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/aliasUsageInVarAssignment_main.ts ===
-import Backbone = require("aliasUsageInVarAssignment_backbone");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("aliasUsageInVarAssignment_moduleA");
+import moduleA = require("./aliasUsageInVarAssignment_moduleA");
 >moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
@@ -32,7 +32,7 @@ export class Model {
 }
 
 === tests/cases/compiler/aliasUsageInVarAssignment_moduleA.ts ===
-import Backbone = require("aliasUsageInVarAssignment_backbone");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js
index c93acb43fa6..9893eae6e1c 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.js
+++ b/tests/baselines/reference/aliasUsedAsNameValue.js
@@ -9,8 +9,8 @@ export function b(a: any): any { return null; }
 //// [aliasUsedAsNameValue_2.ts]
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
-import mod = require("aliasUsedAsNameValue_0");
-import b = require("aliasUsedAsNameValue_1");
+import mod = require("./aliasUsedAsNameValue_0");
+import b = require("./aliasUsedAsNameValue_1");
  
 export var a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
@@ -25,8 +25,8 @@ exports.b = b;
 //// [aliasUsedAsNameValue_2.js]
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
-var mod = require("aliasUsedAsNameValue_0");
-var b = require("aliasUsedAsNameValue_1");
+var mod = require("./aliasUsedAsNameValue_0");
+var b = require("./aliasUsedAsNameValue_1");
 exports.a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
     b.b(mod);
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.symbols b/tests/baselines/reference/aliasUsedAsNameValue.symbols
index a816e2b2c63..314780eba7c 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.symbols
+++ b/tests/baselines/reference/aliasUsedAsNameValue.symbols
@@ -1,11 +1,11 @@
 === tests/cases/compiler/aliasUsedAsNameValue_2.ts ===
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
-import mod = require("aliasUsedAsNameValue_0");
+import mod = require("./aliasUsedAsNameValue_0");
 >mod : Symbol(mod, Decl(aliasUsedAsNameValue_2.ts, 0, 0))
 
-import b = require("aliasUsedAsNameValue_1");
->b : Symbol(b, Decl(aliasUsedAsNameValue_2.ts, 2, 47))
+import b = require("./aliasUsedAsNameValue_1");
+>b : Symbol(b, Decl(aliasUsedAsNameValue_2.ts, 2, 49))
  
 export var a = function () {
 >a : Symbol(a, Decl(aliasUsedAsNameValue_2.ts, 5, 10))
@@ -13,7 +13,7 @@ export var a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
     b.b(mod);
 >b.b : Symbol(b.b, Decl(aliasUsedAsNameValue_1.ts, 0, 0))
->b : Symbol(b, Decl(aliasUsedAsNameValue_2.ts, 2, 47))
+>b : Symbol(b, Decl(aliasUsedAsNameValue_2.ts, 2, 49))
 >b : Symbol(b.b, Decl(aliasUsedAsNameValue_1.ts, 0, 0))
 >mod : Symbol(mod, Decl(aliasUsedAsNameValue_2.ts, 0, 0))
 }
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.types b/tests/baselines/reference/aliasUsedAsNameValue.types
index 9c519786c76..86e1eeee9f5 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.types
+++ b/tests/baselines/reference/aliasUsedAsNameValue.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/aliasUsedAsNameValue_2.ts ===
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
-import mod = require("aliasUsedAsNameValue_0");
+import mod = require("./aliasUsedAsNameValue_0");
 >mod : typeof mod
 
-import b = require("aliasUsedAsNameValue_1");
+import b = require("./aliasUsedAsNameValue_1");
 >b : typeof b
  
 export var a = function () {
diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.errors.txt b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.errors.txt
index a2532be9344..1a9d7d26168 100644
--- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.errors.txt
+++ b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.ts
 
 
 ==== tests/cases/compiler/aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.ts (1 errors) ====
-    import moduleA = require("aliasWithInterfaceExportAssignmentUsedInVarInitializer_0");
+    import moduleA = require("./aliasWithInterfaceExportAssignmentUsedInVarInitializer_0");
     var d = b.q3;
             ~
 !!! error TS2304: Cannot find name 'b'.
diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
index bd76945438f..19534b279c0 100644
--- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
+++ b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
@@ -7,7 +7,7 @@ interface c {
 export = c;
 
 //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.ts]
-import moduleA = require("aliasWithInterfaceExportAssignmentUsedInVarInitializer_0");
+import moduleA = require("./aliasWithInterfaceExportAssignmentUsedInVarInitializer_0");
 var d = b.q3;
 
 //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_0.js]
diff --git a/tests/baselines/reference/arrayOfExportedClass.js b/tests/baselines/reference/arrayOfExportedClass.js
index 7fde4aa6775..c3f81aca7b0 100644
--- a/tests/baselines/reference/arrayOfExportedClass.js
+++ b/tests/baselines/reference/arrayOfExportedClass.js
@@ -9,7 +9,7 @@ export = Car;
 
 //// [arrayOfExportedClass_1.ts]
 ///<reference path='arrayOfExportedClass_0.ts'/>
-import Car = require('arrayOfExportedClass_0');
+import Car = require('./arrayOfExportedClass_0');
 
 class Road {
 
diff --git a/tests/baselines/reference/arrayOfExportedClass.symbols b/tests/baselines/reference/arrayOfExportedClass.symbols
index 3d0905a1e2d..bdcaf98eb0d 100644
--- a/tests/baselines/reference/arrayOfExportedClass.symbols
+++ b/tests/baselines/reference/arrayOfExportedClass.symbols
@@ -1,10 +1,10 @@
 === tests/cases/compiler/arrayOfExportedClass_1.ts ===
 ///<reference path='arrayOfExportedClass_0.ts'/>
-import Car = require('arrayOfExportedClass_0');
+import Car = require('./arrayOfExportedClass_0');
 >Car : Symbol(Car, Decl(arrayOfExportedClass_1.ts, 0, 0))
 
 class Road {
->Road : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 47))
+>Road : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 49))
 
     public cars: Car[];
 >cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
@@ -17,14 +17,14 @@ class Road {
 
         this.cars = cars;
 >this.cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
->this : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 47))
+>this : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 49))
 >cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 3, 12))
 >cars : Symbol(cars, Decl(arrayOfExportedClass_1.ts, 7, 19))
     }
 }
 
 export = Road;
->Road : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 47))
+>Road : Symbol(Road, Decl(arrayOfExportedClass_1.ts, 1, 49))
 
 === tests/cases/compiler/arrayOfExportedClass_0.ts ===
 class Car {
diff --git a/tests/baselines/reference/arrayOfExportedClass.types b/tests/baselines/reference/arrayOfExportedClass.types
index 3d542b88d80..1e41e82e448 100644
--- a/tests/baselines/reference/arrayOfExportedClass.types
+++ b/tests/baselines/reference/arrayOfExportedClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrayOfExportedClass_1.ts ===
 ///<reference path='arrayOfExportedClass_0.ts'/>
-import Car = require('arrayOfExportedClass_0');
+import Car = require('./arrayOfExportedClass_0');
 >Car : typeof Car
 
 class Road {
diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js
index 077a92d7450..ec751b0329a 100644
--- a/tests/baselines/reference/chainedImportAlias.js
+++ b/tests/baselines/reference/chainedImportAlias.js
@@ -6,7 +6,7 @@ export module m {
 }
 
 //// [chainedImportAlias_file1.ts]
-import x = require('chainedImportAlias_file0');
+import x = require('./chainedImportAlias_file0');
 import y = x;
 y.m.foo();
 
@@ -18,6 +18,6 @@ var m;
     m.foo = foo;
 })(m = exports.m || (exports.m = {}));
 //// [chainedImportAlias_file1.js]
-var x = require('chainedImportAlias_file0');
+var x = require('./chainedImportAlias_file0');
 var y = x;
 y.m.foo();
diff --git a/tests/baselines/reference/chainedImportAlias.symbols b/tests/baselines/reference/chainedImportAlias.symbols
index 3aebb4502f8..0f374305aeb 100644
--- a/tests/baselines/reference/chainedImportAlias.symbols
+++ b/tests/baselines/reference/chainedImportAlias.symbols
@@ -1,15 +1,15 @@
 === tests/cases/compiler/chainedImportAlias_file1.ts ===
-import x = require('chainedImportAlias_file0');
+import x = require('./chainedImportAlias_file0');
 >x : Symbol(x, Decl(chainedImportAlias_file1.ts, 0, 0))
 
 import y = x;
->y : Symbol(y, Decl(chainedImportAlias_file1.ts, 0, 47))
+>y : Symbol(y, Decl(chainedImportAlias_file1.ts, 0, 49))
 >x : Symbol(x, Decl(chainedImportAlias_file0.ts, 0, 0))
 
 y.m.foo();
 >y.m.foo : Symbol(x.m.foo, Decl(chainedImportAlias_file0.ts, 0, 17))
 >y.m : Symbol(x.m, Decl(chainedImportAlias_file0.ts, 0, 0))
->y : Symbol(y, Decl(chainedImportAlias_file1.ts, 0, 47))
+>y : Symbol(y, Decl(chainedImportAlias_file1.ts, 0, 49))
 >m : Symbol(x.m, Decl(chainedImportAlias_file0.ts, 0, 0))
 >foo : Symbol(x.m.foo, Decl(chainedImportAlias_file0.ts, 0, 17))
 
diff --git a/tests/baselines/reference/chainedImportAlias.types b/tests/baselines/reference/chainedImportAlias.types
index 1435776fff2..db06c833d0b 100644
--- a/tests/baselines/reference/chainedImportAlias.types
+++ b/tests/baselines/reference/chainedImportAlias.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/chainedImportAlias_file1.ts ===
-import x = require('chainedImportAlias_file0');
+import x = require('./chainedImportAlias_file0');
 >x : typeof x
 
 import y = x;
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
index 283e07ebc7f..2acf93296de 100644
--- a/tests/baselines/reference/commentsExternalModules3.js
+++ b/tests/baselines/reference/commentsExternalModules3.js
@@ -54,7 +54,7 @@ var myvar2 = new m4.m2.c();
 
 //// [commentsExternalModules_1.ts]
 /**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0"); // trailing comment 1
+import extMod = require("./commentsExternalModules2_0"); // trailing comment 1
 extMod.m1.fooExport();
 export var newVar = new extMod.m1.m2.c();
 extMod.m4.fooExport();
@@ -124,7 +124,7 @@ m4.fooExport();
 var myvar2 = new m4.m2.c();
 //// [commentsExternalModules_1.js]
 /**This is on import declaration*/
-var extMod = require("commentsExternalModules2_0"); // trailing comment 1
+var extMod = require("./commentsExternalModules2_0"); // trailing comment 1
 extMod.m1.fooExport();
 exports.newVar = new extMod.m1.m2.c();
 extMod.m4.fooExport();
@@ -165,6 +165,6 @@ export declare module m4 {
 }
 //// [commentsExternalModules_1.d.ts]
 /**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0");
+import extMod = require("./commentsExternalModules2_0");
 export declare var newVar: extMod.m1.m2.c;
 export declare var newVar2: extMod.m4.m2.c;
diff --git a/tests/baselines/reference/commentsExternalModules3.symbols b/tests/baselines/reference/commentsExternalModules3.symbols
index cfd01db377d..4cab3b0d28a 100644
--- a/tests/baselines/reference/commentsExternalModules3.symbols
+++ b/tests/baselines/reference/commentsExternalModules3.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/commentsExternalModules_1.ts ===
 /**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0"); // trailing comment 1
+import extMod = require("./commentsExternalModules2_0"); // trailing comment 1
 >extMod : Symbol(extMod, Decl(commentsExternalModules_1.ts, 0, 0))
 
 extMod.m1.fooExport();
diff --git a/tests/baselines/reference/commentsExternalModules3.types b/tests/baselines/reference/commentsExternalModules3.types
index 556b5d11d35..2898784b7ea 100644
--- a/tests/baselines/reference/commentsExternalModules3.types
+++ b/tests/baselines/reference/commentsExternalModules3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/commentsExternalModules_1.ts ===
 /**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0"); // trailing comment 1
+import extMod = require("./commentsExternalModules2_0"); // trailing comment 1
 >extMod : typeof extMod
 
 extMod.m1.fooExport();
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
index 7814e9641ba..2355d7bbc7a 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
@@ -6,7 +6,7 @@ export class Foo { }
 
 //// [declFileAliasUseBeforeDeclaration_test.ts]
 export function bar(a: foo.Foo) { }
-import foo = require("declFileAliasUseBeforeDeclaration_foo");
+import foo = require("./declFileAliasUseBeforeDeclaration_foo");
 
 //// [declFileAliasUseBeforeDeclaration_foo.js]
 var Foo = (function () {
@@ -25,4 +25,4 @@ export declare class Foo {
 }
 //// [declFileAliasUseBeforeDeclaration_test.d.ts]
 export declare function bar(a: foo.Foo): void;
-import foo = require("declFileAliasUseBeforeDeclaration_foo");
+import foo = require("./declFileAliasUseBeforeDeclaration_foo");
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.symbols b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.symbols
index ee7795ae455..ba74b6cdfb7 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.symbols
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.symbols
@@ -5,7 +5,7 @@ export function bar(a: foo.Foo) { }
 >foo : Symbol(foo, Decl(declFileAliasUseBeforeDeclaration_test.ts, 0, 35))
 >Foo : Symbol(foo.Foo, Decl(declFileAliasUseBeforeDeclaration_foo.ts, 0, 0))
 
-import foo = require("declFileAliasUseBeforeDeclaration_foo");
+import foo = require("./declFileAliasUseBeforeDeclaration_foo");
 >foo : Symbol(foo, Decl(declFileAliasUseBeforeDeclaration_test.ts, 0, 35))
 
 === tests/cases/compiler/declFileAliasUseBeforeDeclaration_foo.ts ===
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.types b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.types
index c21d98d90d5..544efded5ee 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.types
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.types
@@ -5,7 +5,7 @@ export function bar(a: foo.Foo) { }
 >foo : any
 >Foo : foo.Foo
 
-import foo = require("declFileAliasUseBeforeDeclaration_foo");
+import foo = require("./declFileAliasUseBeforeDeclaration_foo");
 >foo : typeof foo
 
 === tests/cases/compiler/declFileAliasUseBeforeDeclaration_foo.ts ===
diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js
index af7cfa46b73..88967c4c2a4 100644
--- a/tests/baselines/reference/declFileForExportedImport.js
+++ b/tests/baselines/reference/declFileForExportedImport.js
@@ -5,7 +5,7 @@ export var x: number;
 
 //// [declFileForExportedImport_1.ts]
 ///<reference path='declFileForExportedImport_0.ts'/>
-export import a = require('declFileForExportedImport_0');
+export import a = require('./declFileForExportedImport_0');
 var y = a.x;
 
 export import b = a;
@@ -14,7 +14,7 @@ var z = b.x;
 //// [declFileForExportedImport_0.js]
 //// [declFileForExportedImport_1.js]
 ///<reference path='declFileForExportedImport_0.ts'/>
-exports.a = require('declFileForExportedImport_0');
+exports.a = require('./declFileForExportedImport_0');
 var y = exports.a.x;
 exports.b = exports.a;
 var z = exports.b.x;
@@ -24,5 +24,5 @@ var z = exports.b.x;
 export declare var x: number;
 //// [declFileForExportedImport_1.d.ts]
 /// <reference path="declFileForExportedImport_0.d.ts" />
-export import a = require('declFileForExportedImport_0');
+export import a = require('./declFileForExportedImport_0');
 export import b = a;
diff --git a/tests/baselines/reference/declFileForExportedImport.symbols b/tests/baselines/reference/declFileForExportedImport.symbols
index fb7b7cd343f..fe14836199c 100644
--- a/tests/baselines/reference/declFileForExportedImport.symbols
+++ b/tests/baselines/reference/declFileForExportedImport.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declFileForExportedImport_1.ts ===
 ///<reference path='declFileForExportedImport_0.ts'/>
-export import a = require('declFileForExportedImport_0');
+export import a = require('./declFileForExportedImport_0');
 >a : Symbol(a, Decl(declFileForExportedImport_1.ts, 0, 0))
 
 var y = a.x;
diff --git a/tests/baselines/reference/declFileForExportedImport.types b/tests/baselines/reference/declFileForExportedImport.types
index 987f82bf5a0..0ff8c2f454b 100644
--- a/tests/baselines/reference/declFileForExportedImport.types
+++ b/tests/baselines/reference/declFileForExportedImport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declFileForExportedImport_1.ts ===
 ///<reference path='declFileForExportedImport_0.ts'/>
-export import a = require('declFileForExportedImport_0');
+export import a = require('./declFileForExportedImport_0');
 >a : typeof a
 
 var y = a.x;
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
index 145d4ad3ff2..b070b67ad18 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
@@ -21,7 +21,7 @@ export = m2;
 
 //// [declFileImportModuleWithExportAssignment_1.ts]
 /**This is on import declaration*/
-import a1 = require("declFileImportModuleWithExportAssignment_0");
+import a1 = require("./declFileImportModuleWithExportAssignment_0");
 export var a = a1;
 a.test1(null, null, null);
 
@@ -31,7 +31,7 @@ var m2;
 module.exports = m2;
 //// [declFileImportModuleWithExportAssignment_1.js]
 /**This is on import declaration*/
-var a1 = require("declFileImportModuleWithExportAssignment_0");
+var a1 = require("./declFileImportModuleWithExportAssignment_0");
 exports.a = a1;
 exports.a.test1(null, null, null);
 
@@ -54,7 +54,7 @@ declare var m2: {
 export = m2;
 //// [declFileImportModuleWithExportAssignment_1.d.ts]
 /**This is on import declaration*/
-import a1 = require("declFileImportModuleWithExportAssignment_0");
+import a1 = require("./declFileImportModuleWithExportAssignment_0");
 export declare var a: {
     (): a1.connectExport;
     test1: a1.connectModule;
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols b/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols
index 62d9d599939..a33e0fef758 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declFileImportModuleWithExportAssignment_1.ts ===
 /**This is on import declaration*/
-import a1 = require("declFileImportModuleWithExportAssignment_0");
+import a1 = require("./declFileImportModuleWithExportAssignment_0");
 >a1 : Symbol(a1, Decl(declFileImportModuleWithExportAssignment_1.ts, 0, 0))
 
 export var a = a1;
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
index d3082311c1d..123b7b56d4f 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declFileImportModuleWithExportAssignment_1.ts ===
 /**This is on import declaration*/
-import a1 = require("declFileImportModuleWithExportAssignment_0");
+import a1 = require("./declFileImportModuleWithExportAssignment_0");
 >a1 : { (): a1.connectExport; test1: a1.connectModule; test2(): a1.connectModule; }
 
 export var a = a1;
diff --git a/tests/baselines/reference/declarationEmit_exportAssignment.js b/tests/baselines/reference/declarationEmit_exportAssignment.js
index 54f3eb5fd0e..d761e2c45eb 100644
--- a/tests/baselines/reference/declarationEmit_exportAssignment.js
+++ b/tests/baselines/reference/declarationEmit_exportAssignment.js
@@ -7,7 +7,7 @@ export function bar() { }
 export interface Buzz { }
 
 //// [index.ts]
-import {foo} from "utils";
+import {foo} from "./utils";
 export = foo;
 
 //// [utils.js]
@@ -16,7 +16,7 @@ exports.foo = foo;
 function bar() { }
 exports.bar = bar;
 //// [index.js]
-var utils_1 = require("utils");
+var utils_1 = require("./utils");
 module.exports = utils_1.foo;
 
 
@@ -26,5 +26,5 @@ export declare function bar(): void;
 export interface Buzz {
 }
 //// [index.d.ts]
-import { foo } from "utils";
+import { foo } from "./utils";
 export = foo;
diff --git a/tests/baselines/reference/declarationEmit_exportAssignment.symbols b/tests/baselines/reference/declarationEmit_exportAssignment.symbols
index b443ba6e797..d2131d27a8f 100644
--- a/tests/baselines/reference/declarationEmit_exportAssignment.symbols
+++ b/tests/baselines/reference/declarationEmit_exportAssignment.symbols
@@ -10,7 +10,7 @@ export interface Buzz { }
 >Buzz : Symbol(Buzz, Decl(utils.ts, 2, 25))
 
 === tests/cases/compiler/index.ts ===
-import {foo} from "utils";
+import {foo} from "./utils";
 >foo : Symbol(foo, Decl(index.ts, 0, 8))
 
 export = foo;
diff --git a/tests/baselines/reference/declarationEmit_exportAssignment.types b/tests/baselines/reference/declarationEmit_exportAssignment.types
index 81c56da432f..763441b8a90 100644
--- a/tests/baselines/reference/declarationEmit_exportAssignment.types
+++ b/tests/baselines/reference/declarationEmit_exportAssignment.types
@@ -10,7 +10,7 @@ export interface Buzz { }
 >Buzz : Buzz
 
 === tests/cases/compiler/index.ts ===
-import {foo} from "utils";
+import {foo} from "./utils";
 >foo : () => void
 
 export = foo;
diff --git a/tests/baselines/reference/declarationEmit_exportDeclaration.js b/tests/baselines/reference/declarationEmit_exportDeclaration.js
index f05639dc18f..e2cb15b408c 100644
--- a/tests/baselines/reference/declarationEmit_exportDeclaration.js
+++ b/tests/baselines/reference/declarationEmit_exportDeclaration.js
@@ -7,7 +7,7 @@ export function bar() { }
 export interface Buzz { }
 
 //// [index.ts]
-import {foo, bar, Buzz} from "utils";
+import {foo, bar, Buzz} from "./utils";
 
 foo();
 let obj: Buzz;
@@ -19,7 +19,7 @@ exports.foo = foo;
 function bar() { }
 exports.bar = bar;
 //// [index.js]
-var utils_1 = require("utils");
+var utils_1 = require("./utils");
 exports.bar = utils_1.bar;
 utils_1.foo();
 var obj;
@@ -31,5 +31,5 @@ export declare function bar(): void;
 export interface Buzz {
 }
 //// [index.d.ts]
-import { bar } from "utils";
+import { bar } from "./utils";
 export { bar };
diff --git a/tests/baselines/reference/declarationEmit_exportDeclaration.symbols b/tests/baselines/reference/declarationEmit_exportDeclaration.symbols
index 5cd8c5fee99..40d6bafdee5 100644
--- a/tests/baselines/reference/declarationEmit_exportDeclaration.symbols
+++ b/tests/baselines/reference/declarationEmit_exportDeclaration.symbols
@@ -10,7 +10,7 @@ export interface Buzz { }
 >Buzz : Symbol(Buzz, Decl(utils.ts, 2, 25))
 
 === tests/cases/compiler/index.ts ===
-import {foo, bar, Buzz} from "utils";
+import {foo, bar, Buzz} from "./utils";
 >foo : Symbol(foo, Decl(index.ts, 0, 8))
 >bar : Symbol(bar, Decl(index.ts, 0, 12))
 >Buzz : Symbol(Buzz, Decl(index.ts, 0, 17))
diff --git a/tests/baselines/reference/declarationEmit_exportDeclaration.types b/tests/baselines/reference/declarationEmit_exportDeclaration.types
index 058ee863c61..25a8f1d29bd 100644
--- a/tests/baselines/reference/declarationEmit_exportDeclaration.types
+++ b/tests/baselines/reference/declarationEmit_exportDeclaration.types
@@ -10,7 +10,7 @@ export interface Buzz { }
 >Buzz : Buzz
 
 === tests/cases/compiler/index.ts ===
-import {foo, bar, Buzz} from "utils";
+import {foo, bar, Buzz} from "./utils";
 >foo : () => void
 >bar : () => void
 >Buzz : any
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmit_nameConflicts.js
index ae517bb7460..857fbee764d 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.js
@@ -5,7 +5,7 @@ module f { export class c { } }
 export = f;
 
 //// [declarationEmit_nameConflicts_0.ts]
-import im = require('declarationEmit_nameConflicts_1');
+import im = require('./declarationEmit_nameConflicts_1');
 export module M {
     export function f() { }
     export class C { }
@@ -61,7 +61,7 @@ var f;
 })(f || (f = {}));
 module.exports = f;
 //// [declarationEmit_nameConflicts_0.js]
-var im = require('declarationEmit_nameConflicts_1');
+var im = require('./declarationEmit_nameConflicts_1');
 var M;
 (function (M) {
     function f() { }
@@ -138,7 +138,7 @@ declare module f {
 }
 export = f;
 //// [declarationEmit_nameConflicts_0.d.ts]
-import im = require('declarationEmit_nameConflicts_1');
+import im = require('./declarationEmit_nameConflicts_1');
 export declare module M {
     function f(): void;
     class C {
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.symbols b/tests/baselines/reference/declarationEmit_nameConflicts.symbols
index a626ed05b15..1c5bb35b756 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts.symbols
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.symbols
@@ -1,9 +1,9 @@
 === tests/cases/compiler/declarationEmit_nameConflicts_0.ts ===
-import im = require('declarationEmit_nameConflicts_1');
+import im = require('./declarationEmit_nameConflicts_1');
 >im : Symbol(im, Decl(declarationEmit_nameConflicts_0.ts, 0, 0))
 
 export module M {
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 
     export function f() { }
 >f : Symbol(f, Decl(declarationEmit_nameConflicts_0.ts, 1, 17))
@@ -23,12 +23,12 @@ export module M {
 
     export import a = M.f;
 >a : Symbol(a, Decl(declarationEmit_nameConflicts_0.ts, 7, 5))
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >f : Symbol(f, Decl(declarationEmit_nameConflicts_0.ts, 1, 17))
 
     export import b = M.C;
 >b : Symbol(b, Decl(declarationEmit_nameConflicts_0.ts, 9, 26))
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >C : Symbol(C, Decl(declarationEmit_nameConflicts_0.ts, 2, 27))
 
     export import c = N;
@@ -41,7 +41,7 @@ export module M {
 }
 
 export module M.P {
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >P : Symbol(P, Decl(declarationEmit_nameConflicts_0.ts, 15, 16))
 
     export function f() { }
@@ -61,45 +61,45 @@ export module M.P {
     }
     export import im = M.P.f;
 >im : Symbol(im, Decl(declarationEmit_nameConflicts_0.ts, 21, 5))
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >P : Symbol(P, Decl(declarationEmit_nameConflicts_0.ts, 15, 16))
 >f : Symbol(f, Decl(declarationEmit_nameConflicts_0.ts, 15, 19))
 
     export var a = M.a; // emitted incorrectly as typeof f
 >a : Symbol(a, Decl(declarationEmit_nameConflicts_0.ts, 23, 14))
 >M.a : Symbol(a, Decl(declarationEmit_nameConflicts_0.ts, 7, 5))
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >a : Symbol(a, Decl(declarationEmit_nameConflicts_0.ts, 7, 5))
 
     export var b = M.b; // ok
 >b : Symbol(b, Decl(declarationEmit_nameConflicts_0.ts, 24, 14))
 >M.b : Symbol(b, Decl(declarationEmit_nameConflicts_0.ts, 9, 26))
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >b : Symbol(b, Decl(declarationEmit_nameConflicts_0.ts, 9, 26))
 
     export var c = M.c; // ok
 >c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 25, 14))
 >M.c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26))
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26))
 
     export var g = M.c.g; // ok
 >g : Symbol(g, Decl(declarationEmit_nameConflicts_0.ts, 26, 14))
 >M.c.g : Symbol(c.g, Decl(declarationEmit_nameConflicts_0.ts, 4, 21))
 >M.c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26))
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26))
 >g : Symbol(c.g, Decl(declarationEmit_nameConflicts_0.ts, 4, 21))
 
     export var d = M.d; // emitted incorrectly as typeof im
 >d : Symbol(d, Decl(declarationEmit_nameConflicts_0.ts, 27, 14))
 >M.d : Symbol(d, Decl(declarationEmit_nameConflicts_0.ts, 11, 24))
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >d : Symbol(d, Decl(declarationEmit_nameConflicts_0.ts, 11, 24))
 }
 
 export module M.Q {
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >Q : Symbol(Q, Decl(declarationEmit_nameConflicts_0.ts, 30, 16))
 
     export function f() { }
@@ -120,14 +120,14 @@ export module M.Q {
     export interface b extends M.b { } // ok
 >b : Symbol(b, Decl(declarationEmit_nameConflicts_0.ts, 36, 5))
 >M.b : Symbol(b, Decl(declarationEmit_nameConflicts_0.ts, 9, 26))
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >b : Symbol(b, Decl(declarationEmit_nameConflicts_0.ts, 9, 26))
 
     export interface I extends M.c.I { } // ok
 >I : Symbol(I, Decl(declarationEmit_nameConflicts_0.ts, 37, 38))
 >M.c.I : Symbol(M.c.I, Decl(declarationEmit_nameConflicts_0.ts, 5, 32))
 >M.c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26))
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26))
 >I : Symbol(M.c.I, Decl(declarationEmit_nameConflicts_0.ts, 5, 32))
 
@@ -138,7 +138,7 @@ export module M.Q {
 >I : Symbol(I, Decl(declarationEmit_nameConflicts_0.ts, 39, 21))
 >M.c.I : Symbol(M.c.I, Decl(declarationEmit_nameConflicts_0.ts, 5, 32))
 >M.c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26))
->M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 55), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
+>M : Symbol(M, Decl(declarationEmit_nameConflicts_0.ts, 0, 57), Decl(declarationEmit_nameConflicts_0.ts, 13, 1), Decl(declarationEmit_nameConflicts_0.ts, 28, 1))
 >c : Symbol(c, Decl(declarationEmit_nameConflicts_0.ts, 10, 26))
 >I : Symbol(M.c.I, Decl(declarationEmit_nameConflicts_0.ts, 5, 32))
     }
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.types b/tests/baselines/reference/declarationEmit_nameConflicts.types
index dacd657706d..6ea650946c5 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/declarationEmit_nameConflicts_0.ts ===
-import im = require('declarationEmit_nameConflicts_1');
+import im = require('./declarationEmit_nameConflicts_1');
 >im : typeof im
 
 export module M {
diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.errors.txt b/tests/baselines/reference/defaultExportsCannotMerge01.errors.txt
index be08d976eeb..15c60e32d9f 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge01.errors.txt
+++ b/tests/baselines/reference/defaultExportsCannotMerge01.errors.txt
@@ -1,9 +1,6 @@
 tests/cases/conformance/es6/modules/m1.ts(2,25): error TS2652: Merged declaration 'Decl' cannot include a default export declaration. Consider adding a separate 'export default Decl' declaration instead.
 tests/cases/conformance/es6/modules/m1.ts(11,18): error TS2652: Merged declaration 'Decl' cannot include a default export declaration. Consider adding a separate 'export default Decl' declaration instead.
-tests/cases/conformance/es6/modules/m2.ts(5,8): error TS2304: Cannot find name 'Entity'.
-tests/cases/conformance/es6/modules/m2.ts(6,8): error TS2503: Cannot find namespace 'Entity'.
-tests/cases/conformance/es6/modules/m2.ts(8,8): error TS2339: Property 'x' does not exist on type '() => number'.
-tests/cases/conformance/es6/modules/m2.ts(9,8): error TS2339: Property 'y' does not exist on type '() => number'.
+tests/cases/conformance/es6/modules/m2.ts(1,20): error TS2307: Cannot find module 'm1'.
 
 
 ==== tests/cases/conformance/es6/modules/m1.ts (2 errors) ====
@@ -29,21 +26,15 @@ tests/cases/conformance/es6/modules/m2.ts(9,8): error TS2339: Property 'y' does
         }
     }
     
-==== tests/cases/conformance/es6/modules/m2.ts (4 errors) ====
+==== tests/cases/conformance/es6/modules/m2.ts (1 errors) ====
     import Entity from "m1"
+                       ~~~~
+!!! error TS2307: Cannot find module 'm1'.
     
     Entity();
     
     var x: Entity;
-           ~~~~~~
-!!! error TS2304: Cannot find name 'Entity'.
     var y: Entity.I;
-           ~~~~~~
-!!! error TS2503: Cannot find namespace 'Entity'.
     
     Entity.x;
-           ~
-!!! error TS2339: Property 'x' does not exist on type '() => number'.
-    Entity.y;
-           ~
-!!! error TS2339: Property 'y' does not exist on type '() => number'.
\ No newline at end of file
+    Entity.y;
\ No newline at end of file
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.errors.txt b/tests/baselines/reference/defaultExportsCannotMerge02.errors.txt
index ad9b85c7e94..30bab504c7e 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.errors.txt
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.errors.txt
@@ -1,9 +1,6 @@
 tests/cases/conformance/es6/modules/m1.ts(2,22): error TS2652: Merged declaration 'Decl' cannot include a default export declaration. Consider adding a separate 'export default Decl' declaration instead.
 tests/cases/conformance/es6/modules/m1.ts(5,18): error TS2652: Merged declaration 'Decl' cannot include a default export declaration. Consider adding a separate 'export default Decl' declaration instead.
-tests/cases/conformance/es6/modules/m2.ts(3,1): error TS2348: Value of type 'typeof Decl' is not callable. Did you mean to include 'new'?
-tests/cases/conformance/es6/modules/m2.ts(6,8): error TS2503: Cannot find namespace 'Entity'.
-tests/cases/conformance/es6/modules/m2.ts(8,13): error TS2339: Property 'p1' does not exist on type 'Decl'.
-tests/cases/conformance/es6/modules/m2.ts(8,20): error TS2339: Property 'p2' does not exist on type 'Decl'.
+tests/cases/conformance/es6/modules/m2.ts(1,20): error TS2307: Cannot find module 'm1'.
 
 
 ==== tests/cases/conformance/es6/modules/m1.ts (2 errors) ====
@@ -25,20 +22,14 @@ tests/cases/conformance/es6/modules/m2.ts(8,20): error TS2339: Property 'p2' doe
         }
     }
     
-==== tests/cases/conformance/es6/modules/m2.ts (4 errors) ====
+==== tests/cases/conformance/es6/modules/m2.ts (1 errors) ====
     import Entity from "m1"
+                       ~~~~
+!!! error TS2307: Cannot find module 'm1'.
     
     Entity();
-    ~~~~~~~~
-!!! error TS2348: Value of type 'typeof Decl' is not callable. Did you mean to include 'new'?
     
     var x: Entity;
     var y: Entity.I;
-           ~~~~~~
-!!! error TS2503: Cannot find namespace 'Entity'.
     var z = new Entity();
-    var sum = z.p1 + z.p2
-                ~~
-!!! error TS2339: Property 'p1' does not exist on type 'Decl'.
-                       ~~
-!!! error TS2339: Property 'p2' does not exist on type 'Decl'.
\ No newline at end of file
+    var sum = z.p1 + z.p2
\ No newline at end of file
diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.errors.txt b/tests/baselines/reference/defaultExportsCannotMerge03.errors.txt
index b1d405671e3..11e9c63b893 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.errors.txt
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.errors.txt
@@ -1,10 +1,7 @@
 tests/cases/conformance/es6/modules/m1.ts(2,22): error TS2652: Merged declaration 'Decl' cannot include a default export declaration. Consider adding a separate 'export default Decl' declaration instead.
 tests/cases/conformance/es6/modules/m1.ts(5,11): error TS2518: Only an ambient class can be merged with an interface.
 tests/cases/conformance/es6/modules/m1.ts(5,11): error TS2652: Merged declaration 'Decl' cannot include a default export declaration. Consider adding a separate 'export default Decl' declaration instead.
-tests/cases/conformance/es6/modules/m2.ts(3,1): error TS2348: Value of type 'typeof Decl' is not callable. Did you mean to include 'new'?
-tests/cases/conformance/es6/modules/m2.ts(6,8): error TS2503: Cannot find namespace 'Entity'.
-tests/cases/conformance/es6/modules/m2.ts(8,13): error TS2339: Property 'p1' does not exist on type 'Decl'.
-tests/cases/conformance/es6/modules/m2.ts(8,20): error TS2339: Property 'p2' does not exist on type 'Decl'.
+tests/cases/conformance/es6/modules/m2.ts(1,20): error TS2307: Cannot find module 'm1'.
 
 
 ==== tests/cases/conformance/es6/modules/m1.ts (3 errors) ====
@@ -28,20 +25,14 @@ tests/cases/conformance/es6/modules/m2.ts(8,20): error TS2339: Property 'p2' doe
         }
     }
     
-==== tests/cases/conformance/es6/modules/m2.ts (4 errors) ====
+==== tests/cases/conformance/es6/modules/m2.ts (1 errors) ====
     import Entity from "m1"
+                       ~~~~
+!!! error TS2307: Cannot find module 'm1'.
     
     Entity();
-    ~~~~~~~~
-!!! error TS2348: Value of type 'typeof Decl' is not callable. Did you mean to include 'new'?
     
     var x: Entity;
     var y: Entity.I;
-           ~~~~~~
-!!! error TS2503: Cannot find namespace 'Entity'.
     var z = new Entity();
-    var sum = z.p1 + z.p2
-                ~~
-!!! error TS2339: Property 'p1' does not exist on type 'Decl'.
-                       ~~
-!!! error TS2339: Property 'p2' does not exist on type 'Decl'.
\ No newline at end of file
+    var sum = z.p1 + z.p2
\ No newline at end of file
diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js
index 3c61789a1a7..e07ee6fa54a 100644
--- a/tests/baselines/reference/elidingImportNames.js
+++ b/tests/baselines/reference/elidingImportNames.js
@@ -2,10 +2,10 @@
 
 //// [elidingImportNames_test.ts]
 
-import a = require('elidingImportNames_main'); // alias used in typeof
+import a = require('./elidingImportNames_main'); // alias used in typeof
 var b = a;
 var x: typeof a;
-import a2 = require('elidingImportNames_main1'); // alias not used in typeof
+import a2 = require('./elidingImportNames_main1'); // alias not used in typeof
 var b2 = a2;
 
 
@@ -20,8 +20,8 @@ exports.main = 10;
 //// [elidingImportNames_main1.js]
 exports.main = 10;
 //// [elidingImportNames_test.js]
-var a = require('elidingImportNames_main'); // alias used in typeof
+var a = require('./elidingImportNames_main'); // alias used in typeof
 var b = a;
 var x;
-var a2 = require('elidingImportNames_main1'); // alias not used in typeof
+var a2 = require('./elidingImportNames_main1'); // alias not used in typeof
 var b2 = a2;
diff --git a/tests/baselines/reference/elidingImportNames.symbols b/tests/baselines/reference/elidingImportNames.symbols
index 02646b5c3e2..d9cdcd61ffe 100644
--- a/tests/baselines/reference/elidingImportNames.symbols
+++ b/tests/baselines/reference/elidingImportNames.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/elidingImportNames_test.ts ===
 
-import a = require('elidingImportNames_main'); // alias used in typeof
+import a = require('./elidingImportNames_main'); // alias used in typeof
 >a : Symbol(a, Decl(elidingImportNames_test.ts, 0, 0))
 
 var b = a;
@@ -11,7 +11,7 @@ var x: typeof a;
 >x : Symbol(x, Decl(elidingImportNames_test.ts, 3, 3))
 >a : Symbol(a, Decl(elidingImportNames_test.ts, 0, 0))
 
-import a2 = require('elidingImportNames_main1'); // alias not used in typeof
+import a2 = require('./elidingImportNames_main1'); // alias not used in typeof
 >a2 : Symbol(a2, Decl(elidingImportNames_test.ts, 3, 16))
 
 var b2 = a2;
diff --git a/tests/baselines/reference/elidingImportNames.types b/tests/baselines/reference/elidingImportNames.types
index 65bd16a6d97..947cd38f6d4 100644
--- a/tests/baselines/reference/elidingImportNames.types
+++ b/tests/baselines/reference/elidingImportNames.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/elidingImportNames_test.ts ===
 
-import a = require('elidingImportNames_main'); // alias used in typeof
+import a = require('./elidingImportNames_main'); // alias used in typeof
 >a : typeof a
 
 var b = a;
@@ -11,7 +11,7 @@ var x: typeof a;
 >x : typeof a
 >a : typeof a
 
-import a2 = require('elidingImportNames_main1'); // alias not used in typeof
+import a2 = require('./elidingImportNames_main1'); // alias not used in typeof
 >a2 : typeof a2
 
 var b2 = a2;
diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js
index ed2a1f3926a..af04d9522b0 100644
--- a/tests/baselines/reference/enumFromExternalModule.js
+++ b/tests/baselines/reference/enumFromExternalModule.js
@@ -5,7 +5,7 @@ export enum Mode { Open }
 
 //// [enumFromExternalModule_1.ts]
 ///<reference path='enumFromExternalModule_0.ts'/>
-import f = require('enumFromExternalModule_0');
+import f = require('./enumFromExternalModule_0');
 
 var x = f.Mode.Open;
 
@@ -17,5 +17,5 @@ var x = f.Mode.Open;
 var Mode = exports.Mode;
 //// [enumFromExternalModule_1.js]
 ///<reference path='enumFromExternalModule_0.ts'/>
-var f = require('enumFromExternalModule_0');
+var f = require('./enumFromExternalModule_0');
 var x = f.Mode.Open;
diff --git a/tests/baselines/reference/enumFromExternalModule.symbols b/tests/baselines/reference/enumFromExternalModule.symbols
index 90ff7cd7aac..3f2b1de5293 100644
--- a/tests/baselines/reference/enumFromExternalModule.symbols
+++ b/tests/baselines/reference/enumFromExternalModule.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/enumFromExternalModule_1.ts ===
 ///<reference path='enumFromExternalModule_0.ts'/>
-import f = require('enumFromExternalModule_0');
+import f = require('./enumFromExternalModule_0');
 >f : Symbol(f, Decl(enumFromExternalModule_1.ts, 0, 0))
 
 var x = f.Mode.Open;
diff --git a/tests/baselines/reference/enumFromExternalModule.types b/tests/baselines/reference/enumFromExternalModule.types
index 554ac17ec67..05555572aa7 100644
--- a/tests/baselines/reference/enumFromExternalModule.types
+++ b/tests/baselines/reference/enumFromExternalModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/enumFromExternalModule_1.ts ===
 ///<reference path='enumFromExternalModule_0.ts'/>
-import f = require('enumFromExternalModule_0');
+import f = require('./enumFromExternalModule_0');
 >f : typeof f
 
 var x = f.Mode.Open;
diff --git a/tests/baselines/reference/errorsOnImportedSymbol.errors.txt b/tests/baselines/reference/errorsOnImportedSymbol.errors.txt
index ec108d48881..19839e4e544 100644
--- a/tests/baselines/reference/errorsOnImportedSymbol.errors.txt
+++ b/tests/baselines/reference/errorsOnImportedSymbol.errors.txt
@@ -3,7 +3,7 @@ tests/cases/compiler/errorsOnImportedSymbol_1.ts(3,9): error TS2304: Cannot find
 
 
 ==== tests/cases/compiler/errorsOnImportedSymbol_1.ts (2 errors) ====
-    import Sammy = require("errorsOnImportedSymbol_0");
+    import Sammy = require("./errorsOnImportedSymbol_0");
     var x = new Sammy.Sammy();
                 ~~~~~
 !!! error TS2304: Cannot find name 'Sammy'.
diff --git a/tests/baselines/reference/errorsOnImportedSymbol.js b/tests/baselines/reference/errorsOnImportedSymbol.js
index 6a001bcd0f1..2c991ecd821 100644
--- a/tests/baselines/reference/errorsOnImportedSymbol.js
+++ b/tests/baselines/reference/errorsOnImportedSymbol.js
@@ -9,7 +9,7 @@ interface Sammy {
 export = Sammy;
 
 //// [errorsOnImportedSymbol_1.ts]
-import Sammy = require("errorsOnImportedSymbol_0");
+import Sammy = require("./errorsOnImportedSymbol_0");
 var x = new Sammy.Sammy();
 var y = Sammy.Sammy(); 
 
diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js
index 1be3fa1f1b2..73689019ed4 100644
--- a/tests/baselines/reference/es6ExportAllInEs5.js
+++ b/tests/baselines/reference/es6ExportAllInEs5.js
@@ -14,7 +14,7 @@ export module uninstantiated {
 }
 
 //// [client.ts]
-export * from "server";
+export * from "./server";
 
 //// [server.js]
 var c = (function () {
@@ -32,7 +32,7 @@ exports.x = 10;
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-__export(require("server"));
+__export(require("./server"));
 
 
 //// [server.d.ts]
@@ -47,4 +47,4 @@ export declare var x: number;
 export declare module uninstantiated {
 }
 //// [client.d.ts]
-export * from "server";
+export * from "./server";
diff --git a/tests/baselines/reference/es6ExportAllInEs5.symbols b/tests/baselines/reference/es6ExportAllInEs5.symbols
index c2a575f5e5c..26d47f63af3 100644
--- a/tests/baselines/reference/es6ExportAllInEs5.symbols
+++ b/tests/baselines/reference/es6ExportAllInEs5.symbols
@@ -20,5 +20,5 @@ export module uninstantiated {
 }
 
 === tests/cases/compiler/client.ts ===
-export * from "server";
+export * from "./server";
 No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ExportAllInEs5.types b/tests/baselines/reference/es6ExportAllInEs5.types
index 876ff152e2c..68187384602 100644
--- a/tests/baselines/reference/es6ExportAllInEs5.types
+++ b/tests/baselines/reference/es6ExportAllInEs5.types
@@ -22,5 +22,5 @@ export module uninstantiated {
 }
 
 === tests/cases/compiler/client.ts ===
-export * from "server";
+export * from "./server";
 No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
index 6250e0ce326..63ac2c04b3e 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
@@ -14,11 +14,11 @@ export module uninstantiated {
 }
 
 //// [client.ts]
-export { c } from "server";
-export { c as c2 } from "server";
-export { i, m as instantiatedModule } from "server";
-export { uninstantiated } from "server";
-export { x } from "server";
+export { c } from "./server";
+export { c as c2 } from "./server";
+export { i, m as instantiatedModule } from "./server";
+export { uninstantiated } from "./server";
+export { x } from "./server";
 
 //// [server.js]
 var c = (function () {
@@ -33,13 +33,13 @@ var m;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
 //// [client.js]
-var server_1 = require("server");
+var server_1 = require("./server");
 exports.c = server_1.c;
-var server_2 = require("server");
+var server_2 = require("./server");
 exports.c2 = server_2.c;
-var server_3 = require("server");
+var server_3 = require("./server");
 exports.instantiatedModule = server_3.m;
-var server_4 = require("server");
+var server_4 = require("./server");
 exports.x = server_4.x;
 
 
@@ -55,8 +55,8 @@ export declare var x: number;
 export declare module uninstantiated {
 }
 //// [client.d.ts]
-export { c } from "server";
-export { c as c2 } from "server";
-export { i, m as instantiatedModule } from "server";
-export { uninstantiated } from "server";
-export { x } from "server";
+export { c } from "./server";
+export { c as c2 } from "./server";
+export { i, m as instantiatedModule } from "./server";
+export { uninstantiated } from "./server";
+export { x } from "./server";
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols
index 731a0fdcc30..c8e279e65bf 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.symbols
@@ -20,21 +20,21 @@ export module uninstantiated {
 }
 
 === tests/cases/compiler/client.ts ===
-export { c } from "server";
+export { c } from "./server";
 >c : Symbol(c, Decl(client.ts, 0, 8))
 
-export { c as c2 } from "server";
+export { c as c2 } from "./server";
 >c : Symbol(c2, Decl(client.ts, 1, 8))
 >c2 : Symbol(c2, Decl(client.ts, 1, 8))
 
-export { i, m as instantiatedModule } from "server";
+export { i, m as instantiatedModule } from "./server";
 >i : Symbol(i, Decl(client.ts, 2, 8))
 >m : Symbol(instantiatedModule, Decl(client.ts, 2, 11))
 >instantiatedModule : Symbol(instantiatedModule, Decl(client.ts, 2, 11))
 
-export { uninstantiated } from "server";
+export { uninstantiated } from "./server";
 >uninstantiated : Symbol(uninstantiated, Decl(client.ts, 3, 8))
 
-export { x } from "server";
+export { x } from "./server";
 >x : Symbol(x, Decl(client.ts, 4, 8))
 
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types
index 6b621f4c777..4bd93b39031 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.types
@@ -22,21 +22,21 @@ export module uninstantiated {
 }
 
 === tests/cases/compiler/client.ts ===
-export { c } from "server";
+export { c } from "./server";
 >c : typeof c
 
-export { c as c2 } from "server";
+export { c as c2 } from "./server";
 >c : typeof c
 >c2 : typeof c
 
-export { i, m as instantiatedModule } from "server";
+export { i, m as instantiatedModule } from "./server";
 >i : any
 >m : typeof m
 >instantiatedModule : typeof m
 
-export { uninstantiated } from "server";
+export { uninstantiated } from "./server";
 >uninstantiated : any
 
-export { x } from "server";
+export { x } from "./server";
 >x : number
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js
index a5e8d509da1..5593d762f85 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js
@@ -6,9 +6,9 @@ class c { }
 export default c;
 
 //// [client.ts]
-import defaultBinding from "server";
+import defaultBinding from "./server";
 export var x = new defaultBinding();
-import defaultBinding2 from "server"; // elide this import since defaultBinding2 is not used
+import defaultBinding2 from "./server"; // elide this import since defaultBinding2 is not used
 
 
 //// [server.js]
@@ -20,7 +20,7 @@ var c = (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = c;
 //// [client.js]
-var server_1 = require("server");
+var server_1 = require("./server");
 exports.x = new server_1.default();
 
 
@@ -29,5 +29,5 @@ declare class c {
 }
 export default c;
 //// [client.d.ts]
-import defaultBinding from "server";
+import defaultBinding from "./server";
 export declare var x: defaultBinding;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.symbols b/tests/baselines/reference/es6ImportDefaultBindingDts.symbols
index 1ca93aa6641..f25be3eacad 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.symbols
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.symbols
@@ -7,13 +7,13 @@ export default c;
 >c : Symbol(c, Decl(server.ts, 0, 0))
 
 === tests/cases/compiler/client.ts ===
-import defaultBinding from "server";
+import defaultBinding from "./server";
 >defaultBinding : Symbol(defaultBinding, Decl(client.ts, 0, 6))
 
 export var x = new defaultBinding();
 >x : Symbol(x, Decl(client.ts, 1, 10))
 >defaultBinding : Symbol(defaultBinding, Decl(client.ts, 0, 6))
 
-import defaultBinding2 from "server"; // elide this import since defaultBinding2 is not used
+import defaultBinding2 from "./server"; // elide this import since defaultBinding2 is not used
 >defaultBinding2 : Symbol(defaultBinding2, Decl(client.ts, 2, 6))
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.types b/tests/baselines/reference/es6ImportDefaultBindingDts.types
index 65754d80680..8543c6845b2 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.types
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.types
@@ -7,7 +7,7 @@ export default c;
 >c : c
 
 === tests/cases/compiler/client.ts ===
-import defaultBinding from "server";
+import defaultBinding from "./server";
 >defaultBinding : typeof defaultBinding
 
 export var x = new defaultBinding();
@@ -15,6 +15,6 @@ export var x = new defaultBinding();
 >new defaultBinding() : defaultBinding
 >defaultBinding : typeof defaultBinding
 
-import defaultBinding2 from "server"; // elide this import since defaultBinding2 is not used
+import defaultBinding2 from "./server"; // elide this import since defaultBinding2 is not used
 >defaultBinding2 : typeof defaultBinding
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt
index 2688d4af06f..b0b7465477b 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.errors.txt
@@ -10,16 +10,16 @@ error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' w
     export default {};
     
 ==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport_1.ts (0 errors) ====
-    import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
-    import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+    import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
+    import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
     var x1: number = a;
-    import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+    import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
     var x1: number = b;
-    import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+    import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
     var x1: number = x;
     var x1: number = y;
-    import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+    import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
     var x1: number = z;
-    import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+    import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
     var x1: number = m;
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
index 641941db9e5..554fecf9116 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
@@ -8,17 +8,17 @@ export var m = a;
 export default {};
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport_1.ts]
-import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
-import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1: number = a;
-import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1: number = b;
-import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1: number = x;
 var x1: number = y;
-import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1: number = z;
-import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1: number = m;
 
 
@@ -28,16 +28,16 @@ export var x = a;
 export var m = a;
 export default {};
 //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js]
-import { a } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import { a } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1 = a;
-import { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1 = b;
-import { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1 = x;
 var x1 = y;
-import { x as z } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import { x as z } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1 = z;
-import { m } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import { m } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1 = m;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt
index 5809e0874dc..c62ecb70c58 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.errors.txt
@@ -12,27 +12,27 @@ tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts(1
     export default a;
     
 ==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts (6 errors) ====
-    import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+    import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
     var x: number = defaultBinding1;
-    import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+    import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
                               ~
 !!! error TS2305: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'.
     var x: number = defaultBinding2;
-    import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+    import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
                               ~
 !!! error TS2305: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'.
     var x: number = defaultBinding3;
-    import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+    import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
                               ~
 !!! error TS2305: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'.
                                  ~
 !!! error TS2305: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'a'.
     var x: number = defaultBinding4;
-    import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+    import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
                               ~
 !!! error TS2305: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'x'.
     var x: number = defaultBinding5;
-    import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+    import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
                               ~
 !!! error TS2305: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"' has no exported member 'm'.
     var x: number = defaultBinding6;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
index 7090b7a0663..7eda76622de 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
@@ -6,17 +6,17 @@ var a = 10;
 export default a;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts]
-import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding1;
-import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding2;
-import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding3;
-import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding4;
-import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding5;
-import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding6;
 
 
@@ -25,17 +25,17 @@ var a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js]
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt
index aa9e0cb3af3..76c424a74d4 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.errors.txt
@@ -18,23 +18,23 @@ tests/cases/compiler/client.ts(11,34): error TS2305: Module '"tests/cases/compil
     export default a;
     
 ==== tests/cases/compiler/client.ts (12 errors) ====
-    export import defaultBinding1, { } from "server";
+    export import defaultBinding1, { } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var x1: number = defaultBinding1;
-    export import defaultBinding2, { a } from "server";
+    export import defaultBinding2, { a } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
                                      ~
 !!! error TS2305: Module '"tests/cases/compiler/server"' has no exported member 'a'.
     export var x1: number = defaultBinding2;
-    export import defaultBinding3, { a as b } from "server";
+    export import defaultBinding3, { a as b } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
                                      ~
 !!! error TS2305: Module '"tests/cases/compiler/server"' has no exported member 'a'.
     export var x1: number = defaultBinding3;
-    export import defaultBinding4, { x, a as y } from "server";
+    export import defaultBinding4, { x, a as y } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
                                      ~
@@ -42,13 +42,13 @@ tests/cases/compiler/client.ts(11,34): error TS2305: Module '"tests/cases/compil
                                         ~
 !!! error TS2305: Module '"tests/cases/compiler/server"' has no exported member 'a'.
     export var x1: number = defaultBinding4;
-    export import defaultBinding5, { x as z,  } from "server";
+    export import defaultBinding5, { x as z,  } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
                                      ~
 !!! error TS2305: Module '"tests/cases/compiler/server"' has no exported member 'x'.
     export var x1: number = defaultBinding5;
-    export import defaultBinding6, { m,  } from "server";
+    export import defaultBinding6, { m,  } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
                                      ~
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
index 2b0e3ebbeb5..b83571066f0 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
@@ -6,17 +6,17 @@ var a = 10;
 export default a;
 
 //// [client.ts]
-export import defaultBinding1, { } from "server";
+export import defaultBinding1, { } from "./server";
 export var x1: number = defaultBinding1;
-export import defaultBinding2, { a } from "server";
+export import defaultBinding2, { a } from "./server";
 export var x1: number = defaultBinding2;
-export import defaultBinding3, { a as b } from "server";
+export import defaultBinding3, { a as b } from "./server";
 export var x1: number = defaultBinding3;
-export import defaultBinding4, { x, a as y } from "server";
+export import defaultBinding4, { x, a as y } from "./server";
 export var x1: number = defaultBinding4;
-export import defaultBinding5, { x as z,  } from "server";
+export import defaultBinding5, { x as z,  } from "./server";
 export var x1: number = defaultBinding5;
-export import defaultBinding6, { m,  } from "server";
+export import defaultBinding6, { m,  } from "./server";
 export var x1: number = defaultBinding6;
 
 
@@ -25,17 +25,17 @@ var a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [client.js]
-var server_1 = require("server");
+var server_1 = require("./server");
 exports.x1 = server_1.default;
-var server_2 = require("server");
+var server_2 = require("./server");
 exports.x1 = server_2.default;
-var server_3 = require("server");
+var server_3 = require("./server");
 exports.x1 = server_3.default;
-var server_4 = require("server");
+var server_4 = require("./server");
 exports.x1 = server_4.default;
-var server_5 = require("server");
+var server_5 = require("./server");
 exports.x1 = server_5.default;
-var server_6 = require("server");
+var server_6 = require("./server");
 exports.x1 = server_6.default;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.errors.txt
index 451543d78f5..47e0cb347f3 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.errors.txt
@@ -16,27 +16,27 @@ tests/cases/compiler/client.ts(11,8): error TS1192: Module '"tests/cases/compile
     export class x11 { }
     
 ==== tests/cases/compiler/client.ts (6 errors) ====
-    import defaultBinding1, { } from "server";
+    import defaultBinding1, { } from "./server";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
-    import defaultBinding2, { a } from "server";
+    import defaultBinding2, { a } from "./server";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
     export var x1 = new a();
-    import defaultBinding3, { a11 as b } from "server";
+    import defaultBinding3, { a11 as b } from "./server";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
     export var x2 = new b();
-    import defaultBinding4, { x, a12 as y } from "server";
+    import defaultBinding4, { x, a12 as y } from "./server";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
     export var x4 = new x();
     export var x5 = new y();
-    import defaultBinding5, { x11 as z,  } from "server";
+    import defaultBinding5, { x11 as z,  } from "./server";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
     export var x3 = new z();
-    import defaultBinding6, { m,  } from "server";
+    import defaultBinding6, { m,  } from "./server";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
     export var x6 = new m();
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
index 8cf9ab1ffb1..9314190e786 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
@@ -10,17 +10,17 @@ export class a12 { }
 export class x11 { }
 
 //// [client.ts]
-import defaultBinding1, { } from "server";
-import defaultBinding2, { a } from "server";
+import defaultBinding1, { } from "./server";
+import defaultBinding2, { a } from "./server";
 export var x1 = new a();
-import defaultBinding3, { a11 as b } from "server";
+import defaultBinding3, { a11 as b } from "./server";
 export var x2 = new b();
-import defaultBinding4, { x, a12 as y } from "server";
+import defaultBinding4, { x, a12 as y } from "./server";
 export var x4 = new x();
 export var x5 = new y();
-import defaultBinding5, { x11 as z,  } from "server";
+import defaultBinding5, { x11 as z,  } from "./server";
 export var x3 = new z();
-import defaultBinding6, { m,  } from "server";
+import defaultBinding6, { m,  } from "./server";
 export var x6 = new m();
 
 
@@ -62,16 +62,16 @@ var x11 = (function () {
 })();
 exports.x11 = x11;
 //// [client.js]
-var server_1 = require("server");
+var server_1 = require("./server");
 exports.x1 = new server_1.a();
-var server_2 = require("server");
+var server_2 = require("./server");
 exports.x2 = new server_2.a11();
-var server_3 = require("server");
+var server_3 = require("./server");
 exports.x4 = new server_3.x();
 exports.x5 = new server_3.a12();
-var server_4 = require("server");
+var server_4 = require("./server");
 exports.x3 = new server_4.x11();
-var server_5 = require("server");
+var server_5 = require("./server");
 exports.x6 = new server_5.m();
 
 
@@ -89,14 +89,14 @@ export declare class a12 {
 export declare class x11 {
 }
 //// [client.d.ts]
-import { a } from "server";
+import { a } from "./server";
 export declare var x1: a;
-import { a11 as b } from "server";
+import { a11 as b } from "./server";
 export declare var x2: b;
-import { x, a12 as y } from "server";
+import { x, a12 as y } from "./server";
 export declare var x4: x;
 export declare var x5: y;
-import { x11 as z } from "server";
+import { x11 as z } from "./server";
 export declare var x3: z;
-import { m } from "server";
+import { m } from "./server";
 export declare var x6: m;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt
index 0e259f142b6..e939398632c 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.errors.txt
@@ -12,27 +12,27 @@ tests/cases/compiler/client.ts(11,27): error TS2305: Module '"tests/cases/compil
     export default a;
     
 ==== tests/cases/compiler/client.ts (6 errors) ====
-    import defaultBinding1, { } from "server";
+    import defaultBinding1, { } from "./server";
     export var x1 = new defaultBinding1();
-    import defaultBinding2, { a } from "server";
+    import defaultBinding2, { a } from "./server";
                               ~
 !!! error TS2305: Module '"tests/cases/compiler/server"' has no exported member 'a'.
     export var x2 = new defaultBinding2();
-    import defaultBinding3, { a as b } from "server";
+    import defaultBinding3, { a as b } from "./server";
                               ~
 !!! error TS2305: Module '"tests/cases/compiler/server"' has no exported member 'a'.
     export var x3 = new defaultBinding3();
-    import defaultBinding4, { x, a as y } from "server";
+    import defaultBinding4, { x, a as y } from "./server";
                               ~
 !!! error TS2305: Module '"tests/cases/compiler/server"' has no exported member 'x'.
                                  ~
 !!! error TS2305: Module '"tests/cases/compiler/server"' has no exported member 'a'.
     export var x4 = new defaultBinding4();
-    import defaultBinding5, { x as z,  } from "server";
+    import defaultBinding5, { x as z,  } from "./server";
                               ~
 !!! error TS2305: Module '"tests/cases/compiler/server"' has no exported member 'x'.
     export var x5 = new defaultBinding5();
-    import defaultBinding6, { m,  } from "server";
+    import defaultBinding6, { m,  } from "./server";
                               ~
 !!! error TS2305: Module '"tests/cases/compiler/server"' has no exported member 'm'.
     export var x6 = new defaultBinding6();
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
index dad034c618c..71d35fd85a1 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
@@ -6,17 +6,17 @@ class a { }
 export default a;
 
 //// [client.ts]
-import defaultBinding1, { } from "server";
+import defaultBinding1, { } from "./server";
 export var x1 = new defaultBinding1();
-import defaultBinding2, { a } from "server";
+import defaultBinding2, { a } from "./server";
 export var x2 = new defaultBinding2();
-import defaultBinding3, { a as b } from "server";
+import defaultBinding3, { a as b } from "./server";
 export var x3 = new defaultBinding3();
-import defaultBinding4, { x, a as y } from "server";
+import defaultBinding4, { x, a as y } from "./server";
 export var x4 = new defaultBinding4();
-import defaultBinding5, { x as z,  } from "server";
+import defaultBinding5, { x as z,  } from "./server";
 export var x5 = new defaultBinding5();
-import defaultBinding6, { m,  } from "server";
+import defaultBinding6, { m,  } from "./server";
 export var x6 = new defaultBinding6();
 
 //// [server.js]
@@ -28,17 +28,17 @@ var a = (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [client.js]
-var server_1 = require("server");
+var server_1 = require("./server");
 exports.x1 = new server_1.default();
-var server_2 = require("server");
+var server_2 = require("./server");
 exports.x2 = new server_2.default();
-var server_3 = require("server");
+var server_3 = require("./server");
 exports.x3 = new server_3.default();
-var server_4 = require("server");
+var server_4 = require("./server");
 exports.x4 = new server_4.default();
-var server_5 = require("server");
+var server_5 = require("./server");
 exports.x5 = new server_5.default();
-var server_6 = require("server");
+var server_6 = require("./server");
 exports.x6 = new server_6.default();
 
 
@@ -47,7 +47,7 @@ declare class a {
 }
 export default a;
 //// [client.d.ts]
-import defaultBinding1 from "server";
+import defaultBinding1 from "./server";
 export declare var x1: defaultBinding1;
 export declare var x2: defaultBinding1;
 export declare var x3: defaultBinding1;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.errors.txt
index c1c28416ec7..7c5080241f1 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.errors.txt
@@ -13,27 +13,27 @@ tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts(11
     export var m = a;
     
 ==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts (6 errors) ====
-    import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+    import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
-    import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+    import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
     var x1: number = a;
-    import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+    import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
     var x1: number = b;
-    import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+    import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
     var x1: number = x;
     var x1: number = y;
-    import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+    import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
     var x1: number = z;
-    import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+    import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
            ~~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5_0"' has no default export.
     var x1: number = m;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
index 1c65fadbe1d..9674f8c12f4 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
@@ -7,17 +7,17 @@ export var x = a;
 export var m = a;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts]
-import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
-import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
 var x1: number = a;
-import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
 var x1: number = b;
-import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
 var x1: number = x;
 var x1: number = y;
-import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
 var x1: number = z;
-import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
 var x1: number = m;
 
 
@@ -26,16 +26,16 @@ exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js]
-var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1.a;
-var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2.a;
-var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3.x;
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3.a;
-var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4.x;
-var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
index 4a987110224..ada6e423e73 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
@@ -6,7 +6,7 @@ var a = 10;
 export default a;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts]
-import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
+import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
 var x: number = defaultBinding;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
@@ -14,7 +14,7 @@ var a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
-var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1;
+var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1;
 var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.symbols
index d4a9c289e60..4262dd3c61b 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.symbols
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.symbols
@@ -7,7 +7,7 @@ export default a;
 >a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.ts, 1, 3))
 
 === tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts ===
-import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
+import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
 >defaultBinding : Symbol(defaultBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts, 0, 6))
 >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts, 0, 22))
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.types b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.types
index 4a05b57e304..4f9c618f10c 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.types
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.types
@@ -8,7 +8,7 @@ export default a;
 >a : number
 
 === tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts ===
-import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
+import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
 >defaultBinding : number
 >nameSpaceBinding : typeof nameSpaceBinding
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.errors.txt
index 19fa0383d52..1fc12619017 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/client.ts(1,8): error TS1192: Module '"tests/cases/compiler
     export class a { }
     
 ==== tests/cases/compiler/client.ts (1 errors) ====
-    import defaultBinding, * as nameSpaceBinding  from "server";
+    import defaultBinding, * as nameSpaceBinding  from "./server";
            ~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/server"' has no default export.
     export var x = new nameSpaceBinding.a();
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
index 31ef01c464c..93918f6171a 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
@@ -5,7 +5,7 @@
 export class a { }
 
 //// [client.ts]
-import defaultBinding, * as nameSpaceBinding  from "server";
+import defaultBinding, * as nameSpaceBinding  from "./server";
 export var x = new nameSpaceBinding.a();
 
 //// [server.js]
@@ -16,7 +16,7 @@ var a = (function () {
 })();
 exports.a = a;
 //// [client.js]
-var server_1 = require("server"), nameSpaceBinding = server_1;
+var server_1 = require("./server"), nameSpaceBinding = server_1;
 exports.x = new nameSpaceBinding.a();
 
 
@@ -24,5 +24,5 @@ exports.x = new nameSpaceBinding.a();
 export declare class a {
 }
 //// [client.d.ts]
-import * as nameSpaceBinding from "server";
+import * as nameSpaceBinding from "./server";
 export declare var x: nameSpaceBinding.a;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.errors.txt
index dbbbf67118e..f14af87315c 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.
     export var a = 10;
     
 ==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts (1 errors) ====
-    import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
+    import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
            ~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"' has no default export.
     var x: number = nameSpaceBinding.a;
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
index 4a49d3c2d6f..49717c588b7 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
@@ -5,13 +5,13 @@
 export var a = 10;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts]
-import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
+import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
 var x: number = nameSpaceBinding.a;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 exports.a = 10;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
-var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1;
+var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"), nameSpaceBinding = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1;
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.errors.txt
index 3da1cf3fda8..d0eee527356 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.errors.txt
@@ -7,7 +7,7 @@ tests/cases/compiler/client.ts(1,15): error TS1192: Module '"tests/cases/compile
     export var a = 10;
     
 ==== tests/cases/compiler/client.ts (2 errors) ====
-    export import defaultBinding, * as nameSpaceBinding  from "server";
+    export import defaultBinding, * as nameSpaceBinding  from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
                   ~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
index df233fe18a5..dec9b8cfebe 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
@@ -5,13 +5,13 @@
 export var a = 10;
 
 //// [client.ts]
-export import defaultBinding, * as nameSpaceBinding  from "server";
+export import defaultBinding, * as nameSpaceBinding  from "./server";
 export var x: number = nameSpaceBinding.a;
 
 //// [server.js]
 exports.a = 10;
 //// [client.js]
-var server_1 = require("server"), nameSpaceBinding = server_1;
+var server_1 = require("./server"), nameSpaceBinding = server_1;
 exports.x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingInEs5.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingInEs5.errors.txt
index 109b322f4bb..18f634d7b73 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingInEs5.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingInEs5.errors.txt
@@ -7,6 +7,6 @@ tests/cases/compiler/es6ImportDefaultBindingInEs5_1.ts(1,8): error TS1192: Modul
     export = a;
     
 ==== tests/cases/compiler/es6ImportDefaultBindingInEs5_1.ts (1 errors) ====
-    import defaultBinding from "es6ImportDefaultBindingInEs5_0";
+    import defaultBinding from "./es6ImportDefaultBindingInEs5_0";
            ~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingInEs5_0"' has no default export.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js
index 0b703f829ca..34323b2752b 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingInEs5.js
@@ -6,7 +6,7 @@ var a = 10;
 export = a;
 
 //// [es6ImportDefaultBindingInEs5_1.ts]
-import defaultBinding from "es6ImportDefaultBindingInEs5_0";
+import defaultBinding from "./es6ImportDefaultBindingInEs5_0";
 
 //// [es6ImportDefaultBindingInEs5_0.js]
 var a = 10;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.errors.txt
index cd0550609c7..8b67ddfeac3 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.errors.txt
@@ -9,18 +9,18 @@ tests/cases/compiler/es6ImportDefaultBindingMergeErrors_1.ts(8,8): error TS2300:
     export default a;
     
 ==== tests/cases/compiler/es6ImportDefaultBindingMergeErrors_1.ts (3 errors) ====
-    import defaultBinding from "es6ImportDefaultBindingMergeErrors_0";
+    import defaultBinding from "./es6ImportDefaultBindingMergeErrors_0";
     interface defaultBinding { // This is ok
     }
     var x = defaultBinding;
-    import defaultBinding2 from "es6ImportDefaultBindingMergeErrors_0"; // Should be error
+    import defaultBinding2 from "./es6ImportDefaultBindingMergeErrors_0"; // Should be error
            ~~~~~~~~~~~~~~~
 !!! error TS2440: Import declaration conflicts with local declaration of 'defaultBinding2'
     var defaultBinding2 = "hello world"; 
-    import defaultBinding3 from "es6ImportDefaultBindingMergeErrors_0"; // Should be error
+    import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // Should be error
            ~~~~~~~~~~~~~~~
 !!! error TS2300: Duplicate identifier 'defaultBinding3'.
-    import defaultBinding3 from "es6ImportDefaultBindingMergeErrors_0"; // SHould be error
+    import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould be error
            ~~~~~~~~~~~~~~~
 !!! error TS2300: Duplicate identifier 'defaultBinding3'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
index 10b8bec03c7..fb80fdd3e4f 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
@@ -6,14 +6,14 @@ var a = 10;
 export default a;
 
 //// [es6ImportDefaultBindingMergeErrors_1.ts]
-import defaultBinding from "es6ImportDefaultBindingMergeErrors_0";
+import defaultBinding from "./es6ImportDefaultBindingMergeErrors_0";
 interface defaultBinding { // This is ok
 }
 var x = defaultBinding;
-import defaultBinding2 from "es6ImportDefaultBindingMergeErrors_0"; // Should be error
+import defaultBinding2 from "./es6ImportDefaultBindingMergeErrors_0"; // Should be error
 var defaultBinding2 = "hello world"; 
-import defaultBinding3 from "es6ImportDefaultBindingMergeErrors_0"; // Should be error
-import defaultBinding3 from "es6ImportDefaultBindingMergeErrors_0"; // SHould be error
+import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // Should be error
+import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould be error
 
 
 //// [es6ImportDefaultBindingMergeErrors_0.js]
@@ -21,6 +21,6 @@ var a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [es6ImportDefaultBindingMergeErrors_1.js]
-var es6ImportDefaultBindingMergeErrors_0_1 = require("es6ImportDefaultBindingMergeErrors_0");
+var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0");
 var x = es6ImportDefaultBindingMergeErrors_0_1.default;
 var defaultBinding2 = "hello world";
diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.errors.txt
index a37a71e7378..9d0e46ceb97 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.errors.txt
@@ -6,7 +6,7 @@ tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_1.ts(1,8): error T
     export var a = 10;
     
 ==== tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_1.ts (1 errors) ====
-    import defaultBinding from "es6ImportDefaultBindingNoDefaultProperty_0";
+    import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0";
            ~~~~~~~~~~~~~~
 !!! error TS1192: Module '"tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty_0"' has no default export.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
index f824dbf71d5..1c9ec4eeae5 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
@@ -5,7 +5,7 @@
 export var a = 10;
 
 //// [es6ImportDefaultBindingNoDefaultProperty_1.ts]
-import defaultBinding from "es6ImportDefaultBindingNoDefaultProperty_0";
+import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0";
 
 
 //// [es6ImportDefaultBindingNoDefaultProperty_0.js]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.errors.txt b/tests/baselines/reference/es6ImportNameSpaceImport.errors.txt
index 00a6dcb2cfd..67616662ca8 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.errors.txt
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.errors.txt
@@ -7,7 +7,7 @@ error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' w
     export var a = 10;
     
 ==== tests/cases/compiler/es6ImportNameSpaceImport_1.ts (0 errors) ====
-    import * as nameSpaceBinding from "es6ImportNameSpaceImport_0";
+    import * as nameSpaceBinding from "./es6ImportNameSpaceImport_0";
     var x = nameSpaceBinding.a;
-    import * as nameSpaceBinding2 from "es6ImportNameSpaceImport_0"; // elide this
+    import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js
index 653feeb22b7..7498b8ee9e8 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.js
@@ -5,15 +5,15 @@
 export var a = 10;
 
 //// [es6ImportNameSpaceImport_1.ts]
-import * as nameSpaceBinding from "es6ImportNameSpaceImport_0";
+import * as nameSpaceBinding from "./es6ImportNameSpaceImport_0";
 var x = nameSpaceBinding.a;
-import * as nameSpaceBinding2 from "es6ImportNameSpaceImport_0"; // elide this
+import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this
 
 
 //// [es6ImportNameSpaceImport_0.js]
 export var a = 10;
 //// [es6ImportNameSpaceImport_1.js]
-import * as nameSpaceBinding from "es6ImportNameSpaceImport_0";
+import * as nameSpaceBinding from "./es6ImportNameSpaceImport_0";
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
index 91e927428a1..dfdfe2602a3 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
@@ -5,9 +5,9 @@
 export class c { };  
 
 //// [client.ts]
-import * as nameSpaceBinding from "server";
+import * as nameSpaceBinding from "./server";
 export var x = new nameSpaceBinding.c();
-import * as nameSpaceBinding2 from "server"; // unreferenced
+import * as nameSpaceBinding2 from "./server"; // unreferenced
 
 //// [server.js]
 var c = (function () {
@@ -18,7 +18,7 @@ var c = (function () {
 exports.c = c;
 ;
 //// [client.js]
-var nameSpaceBinding = require("server");
+var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.c();
 
 
@@ -26,5 +26,5 @@ exports.x = new nameSpaceBinding.c();
 export declare class c {
 }
 //// [client.d.ts]
-import * as nameSpaceBinding from "server";
+import * as nameSpaceBinding from "./server";
 export declare var x: nameSpaceBinding.c;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.symbols b/tests/baselines/reference/es6ImportNameSpaceImportDts.symbols
index 8104cbcce50..5f6fea374be 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.symbols
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.symbols
@@ -4,7 +4,7 @@ export class c { };
 >c : Symbol(c, Decl(server.ts, 0, 0))
 
 === tests/cases/compiler/client.ts ===
-import * as nameSpaceBinding from "server";
+import * as nameSpaceBinding from "./server";
 >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(client.ts, 0, 6))
 
 export var x = new nameSpaceBinding.c();
@@ -13,6 +13,6 @@ export var x = new nameSpaceBinding.c();
 >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(client.ts, 0, 6))
 >c : Symbol(nameSpaceBinding.c, Decl(server.ts, 0, 0))
 
-import * as nameSpaceBinding2 from "server"; // unreferenced
+import * as nameSpaceBinding2 from "./server"; // unreferenced
 >nameSpaceBinding2 : Symbol(nameSpaceBinding2, Decl(client.ts, 2, 6))
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.types b/tests/baselines/reference/es6ImportNameSpaceImportDts.types
index 345d593b143..e49f3ace57a 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.types
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.types
@@ -4,7 +4,7 @@ export class c { };
 >c : c
 
 === tests/cases/compiler/client.ts ===
-import * as nameSpaceBinding from "server";
+import * as nameSpaceBinding from "./server";
 >nameSpaceBinding : typeof nameSpaceBinding
 
 export var x = new nameSpaceBinding.c();
@@ -14,6 +14,6 @@ export var x = new nameSpaceBinding.c();
 >nameSpaceBinding : typeof nameSpaceBinding
 >c : typeof nameSpaceBinding.c
 
-import * as nameSpaceBinding2 from "server"; // unreferenced
+import * as nameSpaceBinding2 from "./server"; // unreferenced
 >nameSpaceBinding2 : typeof nameSpaceBinding
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
index 50a03972cc2..dfc90c3e9af 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
@@ -5,15 +5,15 @@
 export var a = 10;  
 
 //// [es6ImportNameSpaceImportInEs5_1.ts]
-import * as nameSpaceBinding from "es6ImportNameSpaceImportInEs5_0";
+import * as nameSpaceBinding from "./es6ImportNameSpaceImportInEs5_0";
 var x = nameSpaceBinding.a;
-import * as nameSpaceBinding2 from "es6ImportNameSpaceImportInEs5_0"; // elide this
+import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide this
 
 
 //// [es6ImportNameSpaceImportInEs5_0.js]
 exports.a = 10;
 //// [es6ImportNameSpaceImportInEs5_1.js]
-var nameSpaceBinding = require("es6ImportNameSpaceImportInEs5_0");
+var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0");
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.symbols b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.symbols
index 119787de817..7be619dcc7e 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.symbols
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.symbols
@@ -4,7 +4,7 @@ export var a = 10;
 >a : Symbol(a, Decl(es6ImportNameSpaceImportInEs5_0.ts, 1, 10))
 
 === tests/cases/compiler/es6ImportNameSpaceImportInEs5_1.ts ===
-import * as nameSpaceBinding from "es6ImportNameSpaceImportInEs5_0";
+import * as nameSpaceBinding from "./es6ImportNameSpaceImportInEs5_0";
 >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(es6ImportNameSpaceImportInEs5_1.ts, 0, 6))
 
 var x = nameSpaceBinding.a;
@@ -13,6 +13,6 @@ var x = nameSpaceBinding.a;
 >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(es6ImportNameSpaceImportInEs5_1.ts, 0, 6))
 >a : Symbol(nameSpaceBinding.a, Decl(es6ImportNameSpaceImportInEs5_0.ts, 1, 10))
 
-import * as nameSpaceBinding2 from "es6ImportNameSpaceImportInEs5_0"; // elide this
+import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide this
 >nameSpaceBinding2 : Symbol(nameSpaceBinding2, Decl(es6ImportNameSpaceImportInEs5_1.ts, 2, 6))
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.types b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.types
index 01531cd233d..13631060813 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.types
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.types
@@ -5,7 +5,7 @@ export var a = 10;
 >10 : number
 
 === tests/cases/compiler/es6ImportNameSpaceImportInEs5_1.ts ===
-import * as nameSpaceBinding from "es6ImportNameSpaceImportInEs5_0";
+import * as nameSpaceBinding from "./es6ImportNameSpaceImportInEs5_0";
 >nameSpaceBinding : typeof nameSpaceBinding
 
 var x = nameSpaceBinding.a;
@@ -14,6 +14,6 @@ var x = nameSpaceBinding.a;
 >nameSpaceBinding : typeof nameSpaceBinding
 >a : number
 
-import * as nameSpaceBinding2 from "es6ImportNameSpaceImportInEs5_0"; // elide this
+import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide this
 >nameSpaceBinding2 : typeof nameSpaceBinding
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.errors.txt b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.errors.txt
index 98a68870833..b8b22ce3ed1 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.errors.txt
+++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.errors.txt
@@ -8,17 +8,17 @@ tests/cases/compiler/es6ImportNameSpaceImportMergeErrors_1.ts(7,8): error TS2440
     export var a = 10;
     
 ==== tests/cases/compiler/es6ImportNameSpaceImportMergeErrors_1.ts (3 errors) ====
-    import * as nameSpaceBinding from "es6ImportNameSpaceImportMergeErrors_0"; 
+    import * as nameSpaceBinding from "./es6ImportNameSpaceImportMergeErrors_0"; 
     interface nameSpaceBinding { } // this should be ok
     
-    import * as nameSpaceBinding1 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error
+    import * as nameSpaceBinding1 from "./es6ImportNameSpaceImportMergeErrors_0"; // should be error
                 ~~~~~~~~~~~~~~~~~
 !!! error TS2300: Duplicate identifier 'nameSpaceBinding1'.
-    import * as nameSpaceBinding1 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error
+    import * as nameSpaceBinding1 from "./es6ImportNameSpaceImportMergeErrors_0"; // should be error
                 ~~~~~~~~~~~~~~~~~
 !!! error TS2300: Duplicate identifier 'nameSpaceBinding1'.
     
-    import * as nameSpaceBinding3 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error
+    import * as nameSpaceBinding3 from "./es6ImportNameSpaceImportMergeErrors_0"; // should be error
            ~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2440: Import declaration conflicts with local declaration of 'nameSpaceBinding3'
     var nameSpaceBinding3 = 10;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
index 3c8461fba2b..b94640349c0 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
@@ -5,13 +5,13 @@
 export var a = 10;
 
 //// [es6ImportNameSpaceImportMergeErrors_1.ts]
-import * as nameSpaceBinding from "es6ImportNameSpaceImportMergeErrors_0"; 
+import * as nameSpaceBinding from "./es6ImportNameSpaceImportMergeErrors_0"; 
 interface nameSpaceBinding { } // this should be ok
 
-import * as nameSpaceBinding1 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error
-import * as nameSpaceBinding1 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error
+import * as nameSpaceBinding1 from "./es6ImportNameSpaceImportMergeErrors_0"; // should be error
+import * as nameSpaceBinding1 from "./es6ImportNameSpaceImportMergeErrors_0"; // should be error
 
-import * as nameSpaceBinding3 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error
+import * as nameSpaceBinding3 from "./es6ImportNameSpaceImportMergeErrors_0"; // should be error
 var nameSpaceBinding3 = 10;
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
index 3d6dab17785..efa3a04bc9a 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
@@ -6,7 +6,7 @@ var a = 10;
 export = a;
 
 //// [es6ImportNameSpaceImportNoNamedExports_1.ts]
-import * as nameSpaceBinding from "es6ImportNameSpaceImportNoNamedExports_0"; // error
+import * as nameSpaceBinding from "./es6ImportNameSpaceImportNoNamedExports_0"; // error
 
 //// [es6ImportNameSpaceImportNoNamedExports_0.js]
 var a = 10;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.symbols b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.symbols
index 6a443d1fa00..8767c1a4add 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.symbols
+++ b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.symbols
@@ -7,6 +7,6 @@ export = a;
 >a : Symbol(a, Decl(es6ImportNameSpaceImportNoNamedExports_0.ts, 1, 3))
 
 === tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports_1.ts ===
-import * as nameSpaceBinding from "es6ImportNameSpaceImportNoNamedExports_0"; // error
+import * as nameSpaceBinding from "./es6ImportNameSpaceImportNoNamedExports_0"; // error
 >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(es6ImportNameSpaceImportNoNamedExports_1.ts, 0, 6))
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.types b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.types
index 2cc4844dd42..4aaf33d5930 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.types
+++ b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.types
@@ -8,6 +8,6 @@ export = a;
 >a : number
 
 === tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports_1.ts ===
-import * as nameSpaceBinding from "es6ImportNameSpaceImportNoNamedExports_0"; // error
+import * as nameSpaceBinding from "./es6ImportNameSpaceImportNoNamedExports_0"; // error
 >nameSpaceBinding : number
 
diff --git a/tests/baselines/reference/es6ImportNamedImport.errors.txt b/tests/baselines/reference/es6ImportNamedImport.errors.txt
index 12dcf331967..efcda1f5368 100644
--- a/tests/baselines/reference/es6ImportNamedImport.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImport.errors.txt
@@ -14,31 +14,31 @@ error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' w
     export var aaaa = 10;
     
 ==== tests/cases/compiler/es6ImportNamedImport_1.ts (0 errors) ====
-    import { } from "es6ImportNamedImport_0";
-    import { a } from "es6ImportNamedImport_0";
+    import { } from "./es6ImportNamedImport_0";
+    import { a } from "./es6ImportNamedImport_0";
     var xxxx = a;
-    import { a as b } from "es6ImportNamedImport_0";
+    import { a as b } from "./es6ImportNamedImport_0";
     var xxxx = b;
-    import { x, a as y } from "es6ImportNamedImport_0";
+    import { x, a as y } from "./es6ImportNamedImport_0";
     var xxxx = x;
     var xxxx = y;
-    import { x as z,  } from "es6ImportNamedImport_0";
+    import { x as z,  } from "./es6ImportNamedImport_0";
     var xxxx = z;
-    import { m,  } from "es6ImportNamedImport_0";
+    import { m,  } from "./es6ImportNamedImport_0";
     var xxxx = m;
-    import { a1, x1 } from "es6ImportNamedImport_0";
+    import { a1, x1 } from "./es6ImportNamedImport_0";
     var xxxx = a1;
     var xxxx = x1;
-    import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0";
+    import { a1 as a11, x1 as x11 } from "./es6ImportNamedImport_0";
     var xxxx = a11;
     var xxxx = x11;
-    import { z1 } from "es6ImportNamedImport_0";
+    import { z1 } from "./es6ImportNamedImport_0";
     var z111 = z1;
-    import { z2 as z3 } from "es6ImportNamedImport_0";
+    import { z2 as z3 } from "./es6ImportNamedImport_0";
     var z2 = z3; // z2 shouldn't give redeclare error
     
     // These are elided
-    import { aaaa } from "es6ImportNamedImport_0";
+    import { aaaa } from "./es6ImportNamedImport_0";
     // These are elided
-    import { aaaa as bbbb } from "es6ImportNamedImport_0";
+    import { aaaa as bbbb } from "./es6ImportNamedImport_0";
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js
index 9606c59351b..6edb6ccb7cd 100644
--- a/tests/baselines/reference/es6ImportNamedImport.js
+++ b/tests/baselines/reference/es6ImportNamedImport.js
@@ -12,33 +12,33 @@ export var z2 = 10;
 export var aaaa = 10;
 
 //// [es6ImportNamedImport_1.ts]
-import { } from "es6ImportNamedImport_0";
-import { a } from "es6ImportNamedImport_0";
+import { } from "./es6ImportNamedImport_0";
+import { a } from "./es6ImportNamedImport_0";
 var xxxx = a;
-import { a as b } from "es6ImportNamedImport_0";
+import { a as b } from "./es6ImportNamedImport_0";
 var xxxx = b;
-import { x, a as y } from "es6ImportNamedImport_0";
+import { x, a as y } from "./es6ImportNamedImport_0";
 var xxxx = x;
 var xxxx = y;
-import { x as z,  } from "es6ImportNamedImport_0";
+import { x as z,  } from "./es6ImportNamedImport_0";
 var xxxx = z;
-import { m,  } from "es6ImportNamedImport_0";
+import { m,  } from "./es6ImportNamedImport_0";
 var xxxx = m;
-import { a1, x1 } from "es6ImportNamedImport_0";
+import { a1, x1 } from "./es6ImportNamedImport_0";
 var xxxx = a1;
 var xxxx = x1;
-import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0";
+import { a1 as a11, x1 as x11 } from "./es6ImportNamedImport_0";
 var xxxx = a11;
 var xxxx = x11;
-import { z1 } from "es6ImportNamedImport_0";
+import { z1 } from "./es6ImportNamedImport_0";
 var z111 = z1;
-import { z2 as z3 } from "es6ImportNamedImport_0";
+import { z2 as z3 } from "./es6ImportNamedImport_0";
 var z2 = z3; // z2 shouldn't give redeclare error
 
 // These are elided
-import { aaaa } from "es6ImportNamedImport_0";
+import { aaaa } from "./es6ImportNamedImport_0";
 // These are elided
-import { aaaa as bbbb } from "es6ImportNamedImport_0";
+import { aaaa as bbbb } from "./es6ImportNamedImport_0";
 
 
 //// [es6ImportNamedImport_0.js]
@@ -51,26 +51,26 @@ export var z1 = 10;
 export var z2 = 10;
 export var aaaa = 10;
 //// [es6ImportNamedImport_1.js]
-import { a } from "es6ImportNamedImport_0";
+import { a } from "./es6ImportNamedImport_0";
 var xxxx = a;
-import { a as b } from "es6ImportNamedImport_0";
+import { a as b } from "./es6ImportNamedImport_0";
 var xxxx = b;
-import { x, a as y } from "es6ImportNamedImport_0";
+import { x, a as y } from "./es6ImportNamedImport_0";
 var xxxx = x;
 var xxxx = y;
-import { x as z } from "es6ImportNamedImport_0";
+import { x as z } from "./es6ImportNamedImport_0";
 var xxxx = z;
-import { m } from "es6ImportNamedImport_0";
+import { m } from "./es6ImportNamedImport_0";
 var xxxx = m;
-import { a1, x1 } from "es6ImportNamedImport_0";
+import { a1, x1 } from "./es6ImportNamedImport_0";
 var xxxx = a1;
 var xxxx = x1;
-import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0";
+import { a1 as a11, x1 as x11 } from "./es6ImportNamedImport_0";
 var xxxx = a11;
 var xxxx = x11;
-import { z1 } from "es6ImportNamedImport_0";
+import { z1 } from "./es6ImportNamedImport_0";
 var z111 = z1;
-import { z2 as z3 } from "es6ImportNamedImport_0";
+import { z2 as z3 } from "./es6ImportNamedImport_0";
 var z2 = z3; // z2 shouldn't give redeclare error
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js
index a72632a737e..59b47635ba9 100644
--- a/tests/baselines/reference/es6ImportNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportNamedImportDts.js
@@ -18,32 +18,32 @@ export class aaaa { }
 export class aaaa1 { }
 
 //// [client.ts]
-import { } from "server";
-import { a } from "server";
+import { } from "./server";
+import { a } from "./server";
 export var xxxx = new a();
-import { a11 as b } from "server";
+import { a11 as b } from "./server";
 export var xxxx1 = new b();
-import { x, a12 as y } from "server";
+import { x, a12 as y } from "./server";
 export var xxxx2 = new x();
 export var xxxx3 = new y();
-import { x11 as z,  } from "server";
+import { x11 as z,  } from "./server";
 export var xxxx4 = new z();
-import { m,  } from "server";
+import { m,  } from "./server";
 export var xxxx5 = new m();
-import { a1, x1 } from "server";
+import { a1, x1 } from "./server";
 export var xxxx6 = new a1();
 export var xxxx7 = new x1();
-import { a111 as a11, x111 as x11 } from "server";
+import { a111 as a11, x111 as x11 } from "./server";
 export var xxxx8 = new a11();
 export var xxxx9 = new x11();
-import { z1 } from "server";
+import { z1 } from "./server";
 export var z111 = new z1();
-import { z2 as z3 } from "server";
+import { z2 as z3 } from "./server";
 export var z2 = new z3(); // z2 shouldn't give redeclare error
 
 // not referenced
-import { aaaa } from "server";
-import { aaaa1 as bbbb } from "server";
+import { aaaa } from "./server";
+import { aaaa1 as bbbb } from "./server";
 
 
 //// [server.js]
@@ -132,26 +132,26 @@ var aaaa1 = (function () {
 })();
 exports.aaaa1 = aaaa1;
 //// [client.js]
-var server_1 = require("server");
+var server_1 = require("./server");
 exports.xxxx = new server_1.a();
-var server_2 = require("server");
+var server_2 = require("./server");
 exports.xxxx1 = new server_2.a11();
-var server_3 = require("server");
+var server_3 = require("./server");
 exports.xxxx2 = new server_3.x();
 exports.xxxx3 = new server_3.a12();
-var server_4 = require("server");
+var server_4 = require("./server");
 exports.xxxx4 = new server_4.x11();
-var server_5 = require("server");
+var server_5 = require("./server");
 exports.xxxx5 = new server_5.m();
-var server_6 = require("server");
+var server_6 = require("./server");
 exports.xxxx6 = new server_6.a1();
 exports.xxxx7 = new server_6.x1();
-var server_7 = require("server");
+var server_7 = require("./server");
 exports.xxxx8 = new server_7.a111();
 exports.xxxx9 = new server_7.x111();
-var server_8 = require("server");
+var server_8 = require("./server");
 exports.z111 = new server_8.z1();
-var server_9 = require("server");
+var server_9 = require("./server");
 exports.z2 = new server_9.z2(); // z2 shouldn't give redeclare error
 
 
@@ -185,24 +185,24 @@ export declare class aaaa {
 export declare class aaaa1 {
 }
 //// [client.d.ts]
-import { a } from "server";
+import { a } from "./server";
 export declare var xxxx: a;
-import { a11 as b } from "server";
+import { a11 as b } from "./server";
 export declare var xxxx1: b;
-import { x, a12 as y } from "server";
+import { x, a12 as y } from "./server";
 export declare var xxxx2: x;
 export declare var xxxx3: y;
-import { x11 as z } from "server";
+import { x11 as z } from "./server";
 export declare var xxxx4: z;
-import { m } from "server";
+import { m } from "./server";
 export declare var xxxx5: m;
-import { a1, x1 } from "server";
+import { a1, x1 } from "./server";
 export declare var xxxx6: a1;
 export declare var xxxx7: x1;
-import { a111 as a11, x111 as x11 } from "server";
+import { a111 as a11, x111 as x11 } from "./server";
 export declare var xxxx8: a11;
 export declare var xxxx9: x11;
-import { z1 } from "server";
+import { z1 } from "./server";
 export declare var z111: z1;
-import { z2 as z3 } from "server";
+import { z2 as z3 } from "./server";
 export declare var z2: z3;
diff --git a/tests/baselines/reference/es6ImportNamedImportDts.symbols b/tests/baselines/reference/es6ImportNamedImportDts.symbols
index 2e3b2735b3d..dab2e13d0f6 100644
--- a/tests/baselines/reference/es6ImportNamedImportDts.symbols
+++ b/tests/baselines/reference/es6ImportNamedImportDts.symbols
@@ -43,15 +43,15 @@ export class aaaa1 { }
 >aaaa1 : Symbol(aaaa1, Decl(server.ts, 13, 21))
 
 === tests/cases/compiler/client.ts ===
-import { } from "server";
-import { a } from "server";
+import { } from "./server";
+import { a } from "./server";
 >a : Symbol(a, Decl(client.ts, 1, 8))
 
 export var xxxx = new a();
 >xxxx : Symbol(xxxx, Decl(client.ts, 2, 10))
 >a : Symbol(a, Decl(client.ts, 1, 8))
 
-import { a11 as b } from "server";
+import { a11 as b } from "./server";
 >a11 : Symbol(b, Decl(client.ts, 3, 8))
 >b : Symbol(b, Decl(client.ts, 3, 8))
 
@@ -59,7 +59,7 @@ export var xxxx1 = new b();
 >xxxx1 : Symbol(xxxx1, Decl(client.ts, 4, 10))
 >b : Symbol(b, Decl(client.ts, 3, 8))
 
-import { x, a12 as y } from "server";
+import { x, a12 as y } from "./server";
 >x : Symbol(x, Decl(client.ts, 5, 8))
 >a12 : Symbol(y, Decl(client.ts, 5, 11))
 >y : Symbol(y, Decl(client.ts, 5, 11))
@@ -72,7 +72,7 @@ export var xxxx3 = new y();
 >xxxx3 : Symbol(xxxx3, Decl(client.ts, 7, 10))
 >y : Symbol(y, Decl(client.ts, 5, 11))
 
-import { x11 as z,  } from "server";
+import { x11 as z,  } from "./server";
 >x11 : Symbol(z, Decl(client.ts, 8, 8))
 >z : Symbol(z, Decl(client.ts, 8, 8))
 
@@ -80,14 +80,14 @@ export var xxxx4 = new z();
 >xxxx4 : Symbol(xxxx4, Decl(client.ts, 9, 10))
 >z : Symbol(z, Decl(client.ts, 8, 8))
 
-import { m,  } from "server";
+import { m,  } from "./server";
 >m : Symbol(m, Decl(client.ts, 10, 8))
 
 export var xxxx5 = new m();
 >xxxx5 : Symbol(xxxx5, Decl(client.ts, 11, 10))
 >m : Symbol(m, Decl(client.ts, 10, 8))
 
-import { a1, x1 } from "server";
+import { a1, x1 } from "./server";
 >a1 : Symbol(a1, Decl(client.ts, 12, 8))
 >x1 : Symbol(x1, Decl(client.ts, 12, 12))
 
@@ -99,7 +99,7 @@ export var xxxx7 = new x1();
 >xxxx7 : Symbol(xxxx7, Decl(client.ts, 14, 10))
 >x1 : Symbol(x1, Decl(client.ts, 12, 12))
 
-import { a111 as a11, x111 as x11 } from "server";
+import { a111 as a11, x111 as x11 } from "./server";
 >a111 : Symbol(a11, Decl(client.ts, 15, 8))
 >a11 : Symbol(a11, Decl(client.ts, 15, 8))
 >x111 : Symbol(x11, Decl(client.ts, 15, 21))
@@ -113,14 +113,14 @@ export var xxxx9 = new x11();
 >xxxx9 : Symbol(xxxx9, Decl(client.ts, 17, 10))
 >x11 : Symbol(x11, Decl(client.ts, 15, 21))
 
-import { z1 } from "server";
+import { z1 } from "./server";
 >z1 : Symbol(z1, Decl(client.ts, 18, 8))
 
 export var z111 = new z1();
 >z111 : Symbol(z111, Decl(client.ts, 19, 10))
 >z1 : Symbol(z1, Decl(client.ts, 18, 8))
 
-import { z2 as z3 } from "server";
+import { z2 as z3 } from "./server";
 >z2 : Symbol(z3, Decl(client.ts, 20, 8))
 >z3 : Symbol(z3, Decl(client.ts, 20, 8))
 
@@ -129,10 +129,10 @@ export var z2 = new z3(); // z2 shouldn't give redeclare error
 >z3 : Symbol(z3, Decl(client.ts, 20, 8))
 
 // not referenced
-import { aaaa } from "server";
+import { aaaa } from "./server";
 >aaaa : Symbol(aaaa, Decl(client.ts, 24, 8))
 
-import { aaaa1 as bbbb } from "server";
+import { aaaa1 as bbbb } from "./server";
 >aaaa1 : Symbol(bbbb, Decl(client.ts, 25, 8))
 >bbbb : Symbol(bbbb, Decl(client.ts, 25, 8))
 
diff --git a/tests/baselines/reference/es6ImportNamedImportDts.types b/tests/baselines/reference/es6ImportNamedImportDts.types
index 93bd55716a5..9aba1012117 100644
--- a/tests/baselines/reference/es6ImportNamedImportDts.types
+++ b/tests/baselines/reference/es6ImportNamedImportDts.types
@@ -43,8 +43,8 @@ export class aaaa1 { }
 >aaaa1 : aaaa1
 
 === tests/cases/compiler/client.ts ===
-import { } from "server";
-import { a } from "server";
+import { } from "./server";
+import { a } from "./server";
 >a : typeof a
 
 export var xxxx = new a();
@@ -52,7 +52,7 @@ export var xxxx = new a();
 >new a() : a
 >a : typeof a
 
-import { a11 as b } from "server";
+import { a11 as b } from "./server";
 >a11 : typeof b
 >b : typeof b
 
@@ -61,7 +61,7 @@ export var xxxx1 = new b();
 >new b() : b
 >b : typeof b
 
-import { x, a12 as y } from "server";
+import { x, a12 as y } from "./server";
 >x : typeof x
 >a12 : typeof y
 >y : typeof y
@@ -76,7 +76,7 @@ export var xxxx3 = new y();
 >new y() : y
 >y : typeof y
 
-import { x11 as z,  } from "server";
+import { x11 as z,  } from "./server";
 >x11 : typeof z
 >z : typeof z
 
@@ -85,7 +85,7 @@ export var xxxx4 = new z();
 >new z() : z
 >z : typeof z
 
-import { m,  } from "server";
+import { m,  } from "./server";
 >m : typeof m
 
 export var xxxx5 = new m();
@@ -93,7 +93,7 @@ export var xxxx5 = new m();
 >new m() : m
 >m : typeof m
 
-import { a1, x1 } from "server";
+import { a1, x1 } from "./server";
 >a1 : typeof a1
 >x1 : typeof x1
 
@@ -107,7 +107,7 @@ export var xxxx7 = new x1();
 >new x1() : x1
 >x1 : typeof x1
 
-import { a111 as a11, x111 as x11 } from "server";
+import { a111 as a11, x111 as x11 } from "./server";
 >a111 : typeof a11
 >a11 : typeof a11
 >x111 : typeof x11
@@ -123,7 +123,7 @@ export var xxxx9 = new x11();
 >new x11() : x11
 >x11 : typeof x11
 
-import { z1 } from "server";
+import { z1 } from "./server";
 >z1 : typeof z1
 
 export var z111 = new z1();
@@ -131,7 +131,7 @@ export var z111 = new z1();
 >new z1() : z1
 >z1 : typeof z1
 
-import { z2 as z3 } from "server";
+import { z2 as z3 } from "./server";
 >z2 : typeof z3
 >z3 : typeof z3
 
@@ -141,10 +141,10 @@ export var z2 = new z3(); // z2 shouldn't give redeclare error
 >z3 : typeof z3
 
 // not referenced
-import { aaaa } from "server";
+import { aaaa } from "./server";
 >aaaa : typeof aaaa
 
-import { aaaa1 as bbbb } from "server";
+import { aaaa1 as bbbb } from "./server";
 >aaaa1 : typeof bbbb
 >bbbb : typeof bbbb
 
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js
index 9992508c00b..ce2cbea3d3d 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js
@@ -12,33 +12,33 @@ export var z2 = 10;
 export var aaaa = 10;
 
 //// [es6ImportNamedImportInEs5_1.ts]
-import { } from "es6ImportNamedImportInEs5_0";
-import { a } from "es6ImportNamedImportInEs5_0";
+import { } from "./es6ImportNamedImportInEs5_0";
+import { a } from "./es6ImportNamedImportInEs5_0";
 var xxxx = a;
-import { a as b } from "es6ImportNamedImportInEs5_0";
+import { a as b } from "./es6ImportNamedImportInEs5_0";
 var xxxx = b;
-import { x, a as y } from "es6ImportNamedImportInEs5_0";
+import { x, a as y } from "./es6ImportNamedImportInEs5_0";
 var xxxx = x;
 var xxxx = y;
-import { x as z,  } from "es6ImportNamedImportInEs5_0";
+import { x as z,  } from "./es6ImportNamedImportInEs5_0";
 var xxxx = z;
-import { m,  } from "es6ImportNamedImportInEs5_0";
+import { m,  } from "./es6ImportNamedImportInEs5_0";
 var xxxx = m;
-import { a1, x1 } from "es6ImportNamedImportInEs5_0";
+import { a1, x1 } from "./es6ImportNamedImportInEs5_0";
 var xxxx = a1;
 var xxxx = x1;
-import { a1 as a11, x1 as x11 } from "es6ImportNamedImportInEs5_0";
+import { a1 as a11, x1 as x11 } from "./es6ImportNamedImportInEs5_0";
 var xxxx = a11;
 var xxxx = x11;
-import { z1 } from "es6ImportNamedImportInEs5_0";
+import { z1 } from "./es6ImportNamedImportInEs5_0";
 var z111 = z1;
-import { z2 as z3 } from "es6ImportNamedImportInEs5_0";
+import { z2 as z3 } from "./es6ImportNamedImportInEs5_0";
 var z2 = z3; // z2 shouldn't give redeclare error
 
 // These are elided
-import { aaaa } from "es6ImportNamedImportInEs5_0";
+import { aaaa } from "./es6ImportNamedImportInEs5_0";
 // These are elided
-import { aaaa as bbbb } from "es6ImportNamedImportInEs5_0";
+import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0";
 
 
 //// [es6ImportNamedImportInEs5_0.js]
@@ -51,26 +51,26 @@ exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
 //// [es6ImportNamedImportInEs5_1.js]
-var es6ImportNamedImportInEs5_0_1 = require("es6ImportNamedImportInEs5_0");
+var es6ImportNamedImportInEs5_0_1 = require("./es6ImportNamedImportInEs5_0");
 var xxxx = es6ImportNamedImportInEs5_0_1.a;
-var es6ImportNamedImportInEs5_0_2 = require("es6ImportNamedImportInEs5_0");
+var es6ImportNamedImportInEs5_0_2 = require("./es6ImportNamedImportInEs5_0");
 var xxxx = es6ImportNamedImportInEs5_0_2.a;
-var es6ImportNamedImportInEs5_0_3 = require("es6ImportNamedImportInEs5_0");
+var es6ImportNamedImportInEs5_0_3 = require("./es6ImportNamedImportInEs5_0");
 var xxxx = es6ImportNamedImportInEs5_0_3.x;
 var xxxx = es6ImportNamedImportInEs5_0_3.a;
-var es6ImportNamedImportInEs5_0_4 = require("es6ImportNamedImportInEs5_0");
+var es6ImportNamedImportInEs5_0_4 = require("./es6ImportNamedImportInEs5_0");
 var xxxx = es6ImportNamedImportInEs5_0_4.x;
-var es6ImportNamedImportInEs5_0_5 = require("es6ImportNamedImportInEs5_0");
+var es6ImportNamedImportInEs5_0_5 = require("./es6ImportNamedImportInEs5_0");
 var xxxx = es6ImportNamedImportInEs5_0_5.m;
-var es6ImportNamedImportInEs5_0_6 = require("es6ImportNamedImportInEs5_0");
+var es6ImportNamedImportInEs5_0_6 = require("./es6ImportNamedImportInEs5_0");
 var xxxx = es6ImportNamedImportInEs5_0_6.a1;
 var xxxx = es6ImportNamedImportInEs5_0_6.x1;
-var es6ImportNamedImportInEs5_0_7 = require("es6ImportNamedImportInEs5_0");
+var es6ImportNamedImportInEs5_0_7 = require("./es6ImportNamedImportInEs5_0");
 var xxxx = es6ImportNamedImportInEs5_0_7.a1;
 var xxxx = es6ImportNamedImportInEs5_0_7.x1;
-var es6ImportNamedImportInEs5_0_8 = require("es6ImportNamedImportInEs5_0");
+var es6ImportNamedImportInEs5_0_8 = require("./es6ImportNamedImportInEs5_0");
 var z111 = es6ImportNamedImportInEs5_0_8.z1;
-var es6ImportNamedImportInEs5_0_9 = require("es6ImportNamedImportInEs5_0");
+var es6ImportNamedImportInEs5_0_9 = require("./es6ImportNamedImportInEs5_0");
 var z2 = es6ImportNamedImportInEs5_0_9.z2; // z2 shouldn't give redeclare error
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.symbols b/tests/baselines/reference/es6ImportNamedImportInEs5.symbols
index 546487514ce..f9e949e7efb 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.symbols
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.symbols
@@ -27,15 +27,15 @@ export var aaaa = 10;
 >aaaa : Symbol(aaaa, Decl(es6ImportNamedImportInEs5_0.ts, 8, 10))
 
 === tests/cases/compiler/es6ImportNamedImportInEs5_1.ts ===
-import { } from "es6ImportNamedImportInEs5_0";
-import { a } from "es6ImportNamedImportInEs5_0";
+import { } from "./es6ImportNamedImportInEs5_0";
+import { a } from "./es6ImportNamedImportInEs5_0";
 >a : Symbol(a, Decl(es6ImportNamedImportInEs5_1.ts, 1, 8))
 
 var xxxx = a;
 >xxxx : Symbol(xxxx, Decl(es6ImportNamedImportInEs5_1.ts, 2, 3), Decl(es6ImportNamedImportInEs5_1.ts, 4, 3), Decl(es6ImportNamedImportInEs5_1.ts, 6, 3), Decl(es6ImportNamedImportInEs5_1.ts, 7, 3), Decl(es6ImportNamedImportInEs5_1.ts, 9, 3), Decl(es6ImportNamedImportInEs5_1.ts, 11, 3), Decl(es6ImportNamedImportInEs5_1.ts, 13, 3), Decl(es6ImportNamedImportInEs5_1.ts, 14, 3), Decl(es6ImportNamedImportInEs5_1.ts, 16, 3), Decl(es6ImportNamedImportInEs5_1.ts, 17, 3))
 >a : Symbol(a, Decl(es6ImportNamedImportInEs5_1.ts, 1, 8))
 
-import { a as b } from "es6ImportNamedImportInEs5_0";
+import { a as b } from "./es6ImportNamedImportInEs5_0";
 >a : Symbol(b, Decl(es6ImportNamedImportInEs5_1.ts, 3, 8))
 >b : Symbol(b, Decl(es6ImportNamedImportInEs5_1.ts, 3, 8))
 
@@ -43,7 +43,7 @@ var xxxx = b;
 >xxxx : Symbol(xxxx, Decl(es6ImportNamedImportInEs5_1.ts, 2, 3), Decl(es6ImportNamedImportInEs5_1.ts, 4, 3), Decl(es6ImportNamedImportInEs5_1.ts, 6, 3), Decl(es6ImportNamedImportInEs5_1.ts, 7, 3), Decl(es6ImportNamedImportInEs5_1.ts, 9, 3), Decl(es6ImportNamedImportInEs5_1.ts, 11, 3), Decl(es6ImportNamedImportInEs5_1.ts, 13, 3), Decl(es6ImportNamedImportInEs5_1.ts, 14, 3), Decl(es6ImportNamedImportInEs5_1.ts, 16, 3), Decl(es6ImportNamedImportInEs5_1.ts, 17, 3))
 >b : Symbol(b, Decl(es6ImportNamedImportInEs5_1.ts, 3, 8))
 
-import { x, a as y } from "es6ImportNamedImportInEs5_0";
+import { x, a as y } from "./es6ImportNamedImportInEs5_0";
 >x : Symbol(x, Decl(es6ImportNamedImportInEs5_1.ts, 5, 8))
 >a : Symbol(y, Decl(es6ImportNamedImportInEs5_1.ts, 5, 11))
 >y : Symbol(y, Decl(es6ImportNamedImportInEs5_1.ts, 5, 11))
@@ -56,7 +56,7 @@ var xxxx = y;
 >xxxx : Symbol(xxxx, Decl(es6ImportNamedImportInEs5_1.ts, 2, 3), Decl(es6ImportNamedImportInEs5_1.ts, 4, 3), Decl(es6ImportNamedImportInEs5_1.ts, 6, 3), Decl(es6ImportNamedImportInEs5_1.ts, 7, 3), Decl(es6ImportNamedImportInEs5_1.ts, 9, 3), Decl(es6ImportNamedImportInEs5_1.ts, 11, 3), Decl(es6ImportNamedImportInEs5_1.ts, 13, 3), Decl(es6ImportNamedImportInEs5_1.ts, 14, 3), Decl(es6ImportNamedImportInEs5_1.ts, 16, 3), Decl(es6ImportNamedImportInEs5_1.ts, 17, 3))
 >y : Symbol(y, Decl(es6ImportNamedImportInEs5_1.ts, 5, 11))
 
-import { x as z,  } from "es6ImportNamedImportInEs5_0";
+import { x as z,  } from "./es6ImportNamedImportInEs5_0";
 >x : Symbol(z, Decl(es6ImportNamedImportInEs5_1.ts, 8, 8))
 >z : Symbol(z, Decl(es6ImportNamedImportInEs5_1.ts, 8, 8))
 
@@ -64,14 +64,14 @@ var xxxx = z;
 >xxxx : Symbol(xxxx, Decl(es6ImportNamedImportInEs5_1.ts, 2, 3), Decl(es6ImportNamedImportInEs5_1.ts, 4, 3), Decl(es6ImportNamedImportInEs5_1.ts, 6, 3), Decl(es6ImportNamedImportInEs5_1.ts, 7, 3), Decl(es6ImportNamedImportInEs5_1.ts, 9, 3), Decl(es6ImportNamedImportInEs5_1.ts, 11, 3), Decl(es6ImportNamedImportInEs5_1.ts, 13, 3), Decl(es6ImportNamedImportInEs5_1.ts, 14, 3), Decl(es6ImportNamedImportInEs5_1.ts, 16, 3), Decl(es6ImportNamedImportInEs5_1.ts, 17, 3))
 >z : Symbol(z, Decl(es6ImportNamedImportInEs5_1.ts, 8, 8))
 
-import { m,  } from "es6ImportNamedImportInEs5_0";
+import { m,  } from "./es6ImportNamedImportInEs5_0";
 >m : Symbol(m, Decl(es6ImportNamedImportInEs5_1.ts, 10, 8))
 
 var xxxx = m;
 >xxxx : Symbol(xxxx, Decl(es6ImportNamedImportInEs5_1.ts, 2, 3), Decl(es6ImportNamedImportInEs5_1.ts, 4, 3), Decl(es6ImportNamedImportInEs5_1.ts, 6, 3), Decl(es6ImportNamedImportInEs5_1.ts, 7, 3), Decl(es6ImportNamedImportInEs5_1.ts, 9, 3), Decl(es6ImportNamedImportInEs5_1.ts, 11, 3), Decl(es6ImportNamedImportInEs5_1.ts, 13, 3), Decl(es6ImportNamedImportInEs5_1.ts, 14, 3), Decl(es6ImportNamedImportInEs5_1.ts, 16, 3), Decl(es6ImportNamedImportInEs5_1.ts, 17, 3))
 >m : Symbol(m, Decl(es6ImportNamedImportInEs5_1.ts, 10, 8))
 
-import { a1, x1 } from "es6ImportNamedImportInEs5_0";
+import { a1, x1 } from "./es6ImportNamedImportInEs5_0";
 >a1 : Symbol(a1, Decl(es6ImportNamedImportInEs5_1.ts, 12, 8))
 >x1 : Symbol(x1, Decl(es6ImportNamedImportInEs5_1.ts, 12, 12))
 
@@ -83,7 +83,7 @@ var xxxx = x1;
 >xxxx : Symbol(xxxx, Decl(es6ImportNamedImportInEs5_1.ts, 2, 3), Decl(es6ImportNamedImportInEs5_1.ts, 4, 3), Decl(es6ImportNamedImportInEs5_1.ts, 6, 3), Decl(es6ImportNamedImportInEs5_1.ts, 7, 3), Decl(es6ImportNamedImportInEs5_1.ts, 9, 3), Decl(es6ImportNamedImportInEs5_1.ts, 11, 3), Decl(es6ImportNamedImportInEs5_1.ts, 13, 3), Decl(es6ImportNamedImportInEs5_1.ts, 14, 3), Decl(es6ImportNamedImportInEs5_1.ts, 16, 3), Decl(es6ImportNamedImportInEs5_1.ts, 17, 3))
 >x1 : Symbol(x1, Decl(es6ImportNamedImportInEs5_1.ts, 12, 12))
 
-import { a1 as a11, x1 as x11 } from "es6ImportNamedImportInEs5_0";
+import { a1 as a11, x1 as x11 } from "./es6ImportNamedImportInEs5_0";
 >a1 : Symbol(a11, Decl(es6ImportNamedImportInEs5_1.ts, 15, 8))
 >a11 : Symbol(a11, Decl(es6ImportNamedImportInEs5_1.ts, 15, 8))
 >x1 : Symbol(x11, Decl(es6ImportNamedImportInEs5_1.ts, 15, 19))
@@ -97,14 +97,14 @@ var xxxx = x11;
 >xxxx : Symbol(xxxx, Decl(es6ImportNamedImportInEs5_1.ts, 2, 3), Decl(es6ImportNamedImportInEs5_1.ts, 4, 3), Decl(es6ImportNamedImportInEs5_1.ts, 6, 3), Decl(es6ImportNamedImportInEs5_1.ts, 7, 3), Decl(es6ImportNamedImportInEs5_1.ts, 9, 3), Decl(es6ImportNamedImportInEs5_1.ts, 11, 3), Decl(es6ImportNamedImportInEs5_1.ts, 13, 3), Decl(es6ImportNamedImportInEs5_1.ts, 14, 3), Decl(es6ImportNamedImportInEs5_1.ts, 16, 3), Decl(es6ImportNamedImportInEs5_1.ts, 17, 3))
 >x11 : Symbol(x11, Decl(es6ImportNamedImportInEs5_1.ts, 15, 19))
 
-import { z1 } from "es6ImportNamedImportInEs5_0";
+import { z1 } from "./es6ImportNamedImportInEs5_0";
 >z1 : Symbol(z1, Decl(es6ImportNamedImportInEs5_1.ts, 18, 8))
 
 var z111 = z1;
 >z111 : Symbol(z111, Decl(es6ImportNamedImportInEs5_1.ts, 19, 3))
 >z1 : Symbol(z1, Decl(es6ImportNamedImportInEs5_1.ts, 18, 8))
 
-import { z2 as z3 } from "es6ImportNamedImportInEs5_0";
+import { z2 as z3 } from "./es6ImportNamedImportInEs5_0";
 >z2 : Symbol(z3, Decl(es6ImportNamedImportInEs5_1.ts, 20, 8))
 >z3 : Symbol(z3, Decl(es6ImportNamedImportInEs5_1.ts, 20, 8))
 
@@ -113,11 +113,11 @@ var z2 = z3; // z2 shouldn't give redeclare error
 >z3 : Symbol(z3, Decl(es6ImportNamedImportInEs5_1.ts, 20, 8))
 
 // These are elided
-import { aaaa } from "es6ImportNamedImportInEs5_0";
+import { aaaa } from "./es6ImportNamedImportInEs5_0";
 >aaaa : Symbol(aaaa, Decl(es6ImportNamedImportInEs5_1.ts, 24, 8))
 
 // These are elided
-import { aaaa as bbbb } from "es6ImportNamedImportInEs5_0";
+import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0";
 >aaaa : Symbol(bbbb, Decl(es6ImportNamedImportInEs5_1.ts, 26, 8))
 >bbbb : Symbol(bbbb, Decl(es6ImportNamedImportInEs5_1.ts, 26, 8))
 
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.types b/tests/baselines/reference/es6ImportNamedImportInEs5.types
index 95f784c5eac..1d55b4bf51e 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.types
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.types
@@ -33,15 +33,15 @@ export var aaaa = 10;
 >10 : number
 
 === tests/cases/compiler/es6ImportNamedImportInEs5_1.ts ===
-import { } from "es6ImportNamedImportInEs5_0";
-import { a } from "es6ImportNamedImportInEs5_0";
+import { } from "./es6ImportNamedImportInEs5_0";
+import { a } from "./es6ImportNamedImportInEs5_0";
 >a : number
 
 var xxxx = a;
 >xxxx : number
 >a : number
 
-import { a as b } from "es6ImportNamedImportInEs5_0";
+import { a as b } from "./es6ImportNamedImportInEs5_0";
 >a : number
 >b : number
 
@@ -49,7 +49,7 @@ var xxxx = b;
 >xxxx : number
 >b : number
 
-import { x, a as y } from "es6ImportNamedImportInEs5_0";
+import { x, a as y } from "./es6ImportNamedImportInEs5_0";
 >x : number
 >a : number
 >y : number
@@ -62,7 +62,7 @@ var xxxx = y;
 >xxxx : number
 >y : number
 
-import { x as z,  } from "es6ImportNamedImportInEs5_0";
+import { x as z,  } from "./es6ImportNamedImportInEs5_0";
 >x : number
 >z : number
 
@@ -70,14 +70,14 @@ var xxxx = z;
 >xxxx : number
 >z : number
 
-import { m,  } from "es6ImportNamedImportInEs5_0";
+import { m,  } from "./es6ImportNamedImportInEs5_0";
 >m : number
 
 var xxxx = m;
 >xxxx : number
 >m : number
 
-import { a1, x1 } from "es6ImportNamedImportInEs5_0";
+import { a1, x1 } from "./es6ImportNamedImportInEs5_0";
 >a1 : number
 >x1 : number
 
@@ -89,7 +89,7 @@ var xxxx = x1;
 >xxxx : number
 >x1 : number
 
-import { a1 as a11, x1 as x11 } from "es6ImportNamedImportInEs5_0";
+import { a1 as a11, x1 as x11 } from "./es6ImportNamedImportInEs5_0";
 >a1 : number
 >a11 : number
 >x1 : number
@@ -103,14 +103,14 @@ var xxxx = x11;
 >xxxx : number
 >x11 : number
 
-import { z1 } from "es6ImportNamedImportInEs5_0";
+import { z1 } from "./es6ImportNamedImportInEs5_0";
 >z1 : number
 
 var z111 = z1;
 >z111 : number
 >z1 : number
 
-import { z2 as z3 } from "es6ImportNamedImportInEs5_0";
+import { z2 as z3 } from "./es6ImportNamedImportInEs5_0";
 >z2 : number
 >z3 : number
 
@@ -119,11 +119,11 @@ var z2 = z3; // z2 shouldn't give redeclare error
 >z3 : number
 
 // These are elided
-import { aaaa } from "es6ImportNamedImportInEs5_0";
+import { aaaa } from "./es6ImportNamedImportInEs5_0";
 >aaaa : number
 
 // These are elided
-import { aaaa as bbbb } from "es6ImportNamedImportInEs5_0";
+import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0";
 >aaaa : number
 >bbbb : number
 
diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt
index 970c51973b2..fec4d182158 100644
--- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.errors.txt
@@ -8,7 +8,7 @@ tests/cases/compiler/es6ImportNamedImportInExportAssignment_1.ts(2,1): error TS1
     export var a = 10;
     
 ==== tests/cases/compiler/es6ImportNamedImportInExportAssignment_1.ts (1 errors) ====
-    import { a } from "es6ImportNamedImportInExportAssignment_0";
+    import { a } from "./es6ImportNamedImportInExportAssignment_0";
     export = a;
     ~~~~~~~~~~~
 !!! error TS1203: Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
index eab345e4e7f..44ac0d188b3 100644
--- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
@@ -5,17 +5,17 @@
 export var a = 10;
 
 //// [es6ImportNamedImportInExportAssignment_1.ts]
-import { a } from "es6ImportNamedImportInExportAssignment_0";
+import { a } from "./es6ImportNamedImportInExportAssignment_0";
 export = a;
 
 //// [es6ImportNamedImportInExportAssignment_0.js]
 export var a = 10;
 //// [es6ImportNamedImportInExportAssignment_1.js]
-import { a } from "es6ImportNamedImportInExportAssignment_0";
+import { a } from "./es6ImportNamedImportInExportAssignment_0";
 
 
 //// [es6ImportNamedImportInExportAssignment_0.d.ts]
 export declare var a: number;
 //// [es6ImportNamedImportInExportAssignment_1.d.ts]
-import { a } from "es6ImportNamedImportInExportAssignment_0";
+import { a } from "./es6ImportNamedImportInExportAssignment_0";
 export = a;
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
index f457e31f53c..418cd76c907 100644
--- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
@@ -8,7 +8,7 @@ export module a {
 }
 
 //// [es6ImportNamedImportInIndirectExportAssignment_1.ts]
-import { a } from "es6ImportNamedImportInIndirectExportAssignment_0";
+import { a } from "./es6ImportNamedImportInIndirectExportAssignment_0";
 import x = a;
 export = x;
 
@@ -23,7 +23,7 @@ var a;
     a.c = c;
 })(a = exports.a || (exports.a = {}));
 //// [es6ImportNamedImportInIndirectExportAssignment_1.js]
-var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("es6ImportNamedImportInIndirectExportAssignment_0");
+var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("./es6ImportNamedImportInIndirectExportAssignment_0");
 var x = es6ImportNamedImportInIndirectExportAssignment_0_1.a;
 module.exports = x;
 
@@ -34,6 +34,6 @@ export declare module a {
     }
 }
 //// [es6ImportNamedImportInIndirectExportAssignment_1.d.ts]
-import { a } from "es6ImportNamedImportInIndirectExportAssignment_0";
+import { a } from "./es6ImportNamedImportInIndirectExportAssignment_0";
 import x = a;
 export = x;
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols
index 2598735d6d8..24eab96f54b 100644
--- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols
@@ -9,13 +9,13 @@ export module a {
 }
 
 === tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment_1.ts ===
-import { a } from "es6ImportNamedImportInIndirectExportAssignment_0";
+import { a } from "./es6ImportNamedImportInIndirectExportAssignment_0";
 >a : Symbol(a, Decl(es6ImportNamedImportInIndirectExportAssignment_1.ts, 0, 8))
 
 import x = a;
->x : Symbol(x, Decl(es6ImportNamedImportInIndirectExportAssignment_1.ts, 0, 69))
+>x : Symbol(x, Decl(es6ImportNamedImportInIndirectExportAssignment_1.ts, 0, 71))
 >a : Symbol(a, Decl(es6ImportNamedImportInIndirectExportAssignment_0.ts, 0, 0))
 
 export = x;
->x : Symbol(x, Decl(es6ImportNamedImportInIndirectExportAssignment_1.ts, 0, 69))
+>x : Symbol(x, Decl(es6ImportNamedImportInIndirectExportAssignment_1.ts, 0, 71))
 
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types
index 36792ece82e..d4dd62aacb2 100644
--- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.types
@@ -9,7 +9,7 @@ export module a {
 }
 
 === tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment_1.ts ===
-import { a } from "es6ImportNamedImportInIndirectExportAssignment_0";
+import { a } from "./es6ImportNamedImportInIndirectExportAssignment_0";
 >a : typeof a
 
 import x = a;
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt b/tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt
index b9461b6caca..4fca12ee8e1 100644
--- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.errors.txt
@@ -12,22 +12,22 @@ tests/cases/compiler/es6ImportNamedImportMergeErrors_1.ts(10,16): error TS2300:
     export var z1 = a;
     
 ==== tests/cases/compiler/es6ImportNamedImportMergeErrors_1.ts (4 errors) ====
-    import { a } from "es6ImportNamedImportMergeErrors_0";
+    import { a } from "./es6ImportNamedImportMergeErrors_0";
     interface a { } // shouldnt be error
-    import { x as x1 } from "es6ImportNamedImportMergeErrors_0";
+    import { x as x1 } from "./es6ImportNamedImportMergeErrors_0";
     interface x1 { } // shouldnt be error
-    import { x } from "es6ImportNamedImportMergeErrors_0"; // should be error
+    import { x } from "./es6ImportNamedImportMergeErrors_0"; // should be error
              ~
 !!! error TS2440: Import declaration conflicts with local declaration of 'x'
     var x = 10; 
-    import { x as x44 } from "es6ImportNamedImportMergeErrors_0"; // should be error
+    import { x as x44 } from "./es6ImportNamedImportMergeErrors_0"; // should be error
              ~~~~~~~~
 !!! error TS2440: Import declaration conflicts with local declaration of 'x44'
     var x44 = 10; 
-    import { z } from "es6ImportNamedImportMergeErrors_0"; // should be error
+    import { z } from "./es6ImportNamedImportMergeErrors_0"; // should be error
              ~
 !!! error TS2300: Duplicate identifier 'z'.
-    import { z1 as z } from "es6ImportNamedImportMergeErrors_0"; // should be error
+    import { z1 as z } from "./es6ImportNamedImportMergeErrors_0"; // should be error
                    ~
 !!! error TS2300: Duplicate identifier 'z'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
index fad411f557d..63bf1127a53 100644
--- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
@@ -8,16 +8,16 @@ export var z = a;
 export var z1 = a;
 
 //// [es6ImportNamedImportMergeErrors_1.ts]
-import { a } from "es6ImportNamedImportMergeErrors_0";
+import { a } from "./es6ImportNamedImportMergeErrors_0";
 interface a { } // shouldnt be error
-import { x as x1 } from "es6ImportNamedImportMergeErrors_0";
+import { x as x1 } from "./es6ImportNamedImportMergeErrors_0";
 interface x1 { } // shouldnt be error
-import { x } from "es6ImportNamedImportMergeErrors_0"; // should be error
+import { x } from "./es6ImportNamedImportMergeErrors_0"; // should be error
 var x = 10; 
-import { x as x44 } from "es6ImportNamedImportMergeErrors_0"; // should be error
+import { x as x44 } from "./es6ImportNamedImportMergeErrors_0"; // should be error
 var x44 = 10; 
-import { z } from "es6ImportNamedImportMergeErrors_0"; // should be error
-import { z1 as z } from "es6ImportNamedImportMergeErrors_0"; // should be error
+import { z } from "./es6ImportNamedImportMergeErrors_0"; // should be error
+import { z1 as z } from "./es6ImportNamedImportMergeErrors_0"; // should be error
 
 
 //// [es6ImportNamedImportMergeErrors_0.js]
diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.errors.txt b/tests/baselines/reference/es6ImportNamedImportNoExportMember.errors.txt
index 57a77410cb2..47a836fd422 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.errors.txt
@@ -8,9 +8,9 @@ tests/cases/compiler/es6ImportNamedImport_1.ts(2,10): error TS2305: Module '"tes
     export var x = a;
     
 ==== tests/cases/compiler/es6ImportNamedImport_1.ts (2 errors) ====
-    import { a1 } from "es6ImportNamedImportNoExportMember_0";
+    import { a1 } from "./es6ImportNamedImportNoExportMember_0";
              ~~
 !!! error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoExportMember_0"' has no exported member 'a1'.
-    import { x1 as x } from "es6ImportNamedImportNoExportMember_0";
+    import { x1 as x } from "./es6ImportNamedImportNoExportMember_0";
              ~~
 !!! error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoExportMember_0"' has no exported member 'x1'.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
index da473fa42a3..ba607b4626f 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
+++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
@@ -6,8 +6,8 @@ export var a = 10;
 export var x = a;
 
 //// [es6ImportNamedImport_1.ts]
-import { a1 } from "es6ImportNamedImportNoExportMember_0";
-import { x1 as x } from "es6ImportNamedImportNoExportMember_0";
+import { a1 } from "./es6ImportNamedImportNoExportMember_0";
+import { x1 as x } from "./es6ImportNamedImportNoExportMember_0";
 
 //// [es6ImportNamedImportNoExportMember_0.js]
 exports.a = 10;
diff --git a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt
index a5abd986ee8..e2cacba59e8 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt
@@ -8,9 +8,9 @@ tests/cases/compiler/es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2305
     export = a;
     
 ==== tests/cases/compiler/es6ImportNamedImportNoNamedExports_1.ts (2 errors) ====
-    import { a } from "es6ImportNamedImportNoNamedExports_0";
+    import { a } from "./es6ImportNamedImportNoNamedExports_0";
              ~
 !!! error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoNamedExports_0"' has no exported member 'a'.
-    import { a as x } from "es6ImportNamedImportNoNamedExports_0";
+    import { a as x } from "./es6ImportNamedImportNoNamedExports_0";
              ~
 !!! error TS2305: Module '"tests/cases/compiler/es6ImportNamedImportNoNamedExports_0"' has no exported member 'a'.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
index 524860827e6..273f9a3fc3a 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
+++ b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.js
@@ -6,8 +6,8 @@ var a = 10;
 export = a;
 
 //// [es6ImportNamedImportNoNamedExports_1.ts]
-import { a } from "es6ImportNamedImportNoNamedExports_0";
-import { a as x } from "es6ImportNamedImportNoNamedExports_0";
+import { a } from "./es6ImportNamedImportNoNamedExports_0";
+import { a as x } from "./es6ImportNamedImportNoNamedExports_0";
 
 //// [es6ImportNamedImportNoNamedExports_0.js]
 var a = 10;
diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.errors.txt b/tests/baselines/reference/es6ImportNamedImportWithExport.errors.txt
index ff8fe604622..a5a4301683e 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithExport.errors.txt
+++ b/tests/baselines/reference/es6ImportNamedImportWithExport.errors.txt
@@ -24,54 +24,54 @@ tests/cases/compiler/client.ts(26,1): error TS1191: An import declaration cannot
     export var aaaa = 10;
     
 ==== tests/cases/compiler/client.ts (12 errors) ====
-    export import { } from "server";
+    export import { } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
-    export import { a } from "server";
+    export import { a } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var xxxx = a;
-    export import { a as b } from "server";
+    export import { a as b } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var xxxx = b;
-    export import { x, a as y } from "server";
+    export import { x, a as y } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var xxxx = x;
     export var xxxx = y;
-    export import { x as z,  } from "server";
+    export import { x as z,  } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var xxxx = z;
-    export import { m,  } from "server";
+    export import { m,  } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var xxxx = m;
-    export import { a1, x1 } from "server";
+    export import { a1, x1 } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var xxxx = a1;
     export var xxxx = x1;
-    export import { a1 as a11, x1 as x11 } from "server";
+    export import { a1 as a11, x1 as x11 } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var xxxx = a11;
     export var xxxx = x11;
-    export import { z1 } from "server";
+    export import { z1 } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var z111 = z1;
-    export import { z2 as z3 } from "server";
+    export import { z2 as z3 } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     export var z2 = z3; // z2 shouldn't give redeclare error
     
     // Non referenced imports
-    export import { aaaa } from "server";
+    export import { aaaa } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
-    export import { aaaa as bbbb } from "server";
+    export import { aaaa as bbbb } from "./server";
     ~~~~~~
 !!! error TS1191: An import declaration cannot have modifiers.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js
index 60ba6bf706b..5175554f0f9 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js
@@ -12,32 +12,32 @@ export var z2 = 10;
 export var aaaa = 10;
 
 //// [client.ts]
-export import { } from "server";
-export import { a } from "server";
+export import { } from "./server";
+export import { a } from "./server";
 export var xxxx = a;
-export import { a as b } from "server";
+export import { a as b } from "./server";
 export var xxxx = b;
-export import { x, a as y } from "server";
+export import { x, a as y } from "./server";
 export var xxxx = x;
 export var xxxx = y;
-export import { x as z,  } from "server";
+export import { x as z,  } from "./server";
 export var xxxx = z;
-export import { m,  } from "server";
+export import { m,  } from "./server";
 export var xxxx = m;
-export import { a1, x1 } from "server";
+export import { a1, x1 } from "./server";
 export var xxxx = a1;
 export var xxxx = x1;
-export import { a1 as a11, x1 as x11 } from "server";
+export import { a1 as a11, x1 as x11 } from "./server";
 export var xxxx = a11;
 export var xxxx = x11;
-export import { z1 } from "server";
+export import { z1 } from "./server";
 export var z111 = z1;
-export import { z2 as z3 } from "server";
+export import { z2 as z3 } from "./server";
 export var z2 = z3; // z2 shouldn't give redeclare error
 
 // Non referenced imports
-export import { aaaa } from "server";
-export import { aaaa as bbbb } from "server";
+export import { aaaa } from "./server";
+export import { aaaa as bbbb } from "./server";
 
 
 //// [server.js]
@@ -50,26 +50,26 @@ exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
 //// [client.js]
-var server_1 = require("server");
+var server_1 = require("./server");
 exports.xxxx = server_1.a;
-var server_2 = require("server");
+var server_2 = require("./server");
 exports.xxxx = server_2.a;
-var server_3 = require("server");
+var server_3 = require("./server");
 exports.xxxx = server_3.x;
 exports.xxxx = server_3.a;
-var server_4 = require("server");
+var server_4 = require("./server");
 exports.xxxx = server_4.x;
-var server_5 = require("server");
+var server_5 = require("./server");
 exports.xxxx = server_5.m;
-var server_6 = require("server");
+var server_6 = require("./server");
 exports.xxxx = server_6.a1;
 exports.xxxx = server_6.x1;
-var server_7 = require("server");
+var server_7 = require("./server");
 exports.xxxx = server_7.a1;
 exports.xxxx = server_7.x1;
-var server_8 = require("server");
+var server_8 = require("./server");
 exports.z111 = server_8.z1;
-var server_9 = require("server");
+var server_9 = require("./server");
 exports.z2 = server_9.z2; // z2 shouldn't give redeclare error
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
index dcf99c5359a..8593f4e6343 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
@@ -16,7 +16,7 @@ export class C2 implements I2 {
 }
 
 //// [client.ts]
-import { C, I, C2 } from "server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
+import { C, I, C2 } from "./server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
 export type cValInterface = I;
 export var cVal = new C();
 
@@ -36,7 +36,7 @@ var C2 = (function () {
 })();
 exports.C2 = C2;
 //// [client.js]
-var server_1 = require("server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
+var server_1 = require("./server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
 exports.cVal = new server_1.C();
 
 
@@ -54,6 +54,6 @@ export declare class C2 implements I2 {
     prop2: string;
 }
 //// [client.d.ts]
-import { C, I } from "server";
+import { C, I } from "./server";
 export declare type cValInterface = I;
 export declare var cVal: C;
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.symbols b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.symbols
index e294124c6f4..cff0406b220 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.symbols
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.symbols
@@ -28,13 +28,13 @@ export class C2 implements I2 {
 }
 
 === tests/cases/compiler/client.ts ===
-import { C, I, C2 } from "server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
+import { C, I, C2 } from "./server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
 >C : Symbol(C, Decl(client.ts, 0, 8))
 >I : Symbol(I, Decl(client.ts, 0, 11))
 >C2 : Symbol(C2, Decl(client.ts, 0, 14))
 
 export type cValInterface = I;
->cValInterface : Symbol(cValInterface, Decl(client.ts, 0, 34))
+>cValInterface : Symbol(cValInterface, Decl(client.ts, 0, 36))
 >I : Symbol(I, Decl(client.ts, 0, 11))
 
 export var cVal = new C();
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types
index 12e5271c8b0..a65a2978e1b 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.types
@@ -30,7 +30,7 @@ export class C2 implements I2 {
 }
 
 === tests/cases/compiler/client.ts ===
-import { C, I, C2 } from "server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
+import { C, I, C2 } from "./server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
 >C : typeof C
 >I : any
 >C2 : typeof C2
diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js
index 37fecdcc53f..d440fb9a8e5 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.js
+++ b/tests/baselines/reference/exportAssignClassAndModule.js
@@ -12,7 +12,7 @@ export = Foo;
 
 //// [exportAssignClassAndModule_1.ts]
 ///<reference path='exportAssignClassAndModule_0.ts'/>
-import Foo = require('exportAssignClassAndModule_0');
+import Foo = require('./exportAssignClassAndModule_0');
 
 var z: Foo.Bar;
 var zz: Foo;
diff --git a/tests/baselines/reference/exportAssignClassAndModule.symbols b/tests/baselines/reference/exportAssignClassAndModule.symbols
index 9f38ed80b1b..016e91f79a2 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.symbols
+++ b/tests/baselines/reference/exportAssignClassAndModule.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportAssignClassAndModule_1.ts ===
 ///<reference path='exportAssignClassAndModule_0.ts'/>
-import Foo = require('exportAssignClassAndModule_0');
+import Foo = require('./exportAssignClassAndModule_0');
 >Foo : Symbol(Foo, Decl(exportAssignClassAndModule_1.ts, 0, 0))
 
 var z: Foo.Bar;
diff --git a/tests/baselines/reference/exportAssignClassAndModule.types b/tests/baselines/reference/exportAssignClassAndModule.types
index aa1ede6b2d4..5517d32badc 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.types
+++ b/tests/baselines/reference/exportAssignClassAndModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportAssignClassAndModule_1.ts ===
 ///<reference path='exportAssignClassAndModule_0.ts'/>
-import Foo = require('exportAssignClassAndModule_0');
+import Foo = require('./exportAssignClassAndModule_0');
 >Foo : typeof Foo
 
 var z: Foo.Bar;
diff --git a/tests/baselines/reference/exportAssignmentEnum.js b/tests/baselines/reference/exportAssignmentEnum.js
index a484e43738f..06438fb2b53 100644
--- a/tests/baselines/reference/exportAssignmentEnum.js
+++ b/tests/baselines/reference/exportAssignmentEnum.js
@@ -10,7 +10,7 @@ enum E {
 export = E;
 
 //// [exportAssignmentEnum_B.ts]
-import EnumE = require("exportAssignmentEnum_A");
+import EnumE = require("./exportAssignmentEnum_A");
 
 var a = EnumE.A;
 var b = EnumE.B;
@@ -25,7 +25,7 @@ var E;
 })(E || (E = {}));
 module.exports = E;
 //// [exportAssignmentEnum_B.js]
-var EnumE = require("exportAssignmentEnum_A");
+var EnumE = require("./exportAssignmentEnum_A");
 var a = EnumE.A;
 var b = EnumE.B;
 var c = EnumE.C;
diff --git a/tests/baselines/reference/exportAssignmentEnum.symbols b/tests/baselines/reference/exportAssignmentEnum.symbols
index 07eb5f7b907..dea194b3508 100644
--- a/tests/baselines/reference/exportAssignmentEnum.symbols
+++ b/tests/baselines/reference/exportAssignmentEnum.symbols
@@ -1,5 +1,5 @@
 === tests/cases/compiler/exportAssignmentEnum_B.ts ===
-import EnumE = require("exportAssignmentEnum_A");
+import EnumE = require("./exportAssignmentEnum_A");
 >EnumE : Symbol(EnumE, Decl(exportAssignmentEnum_B.ts, 0, 0))
 
 var a = EnumE.A;
diff --git a/tests/baselines/reference/exportAssignmentEnum.types b/tests/baselines/reference/exportAssignmentEnum.types
index 9dfa34d3777..a186cf6f255 100644
--- a/tests/baselines/reference/exportAssignmentEnum.types
+++ b/tests/baselines/reference/exportAssignmentEnum.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/exportAssignmentEnum_B.ts ===
-import EnumE = require("exportAssignmentEnum_A");
+import EnumE = require("./exportAssignmentEnum_A");
 >EnumE : typeof EnumE
 
 var a = EnumE.A;
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.errors.txt b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.errors.txt
index f6736e468f0..b0bfac0adfd 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.errors.txt
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.errors.txt
@@ -4,7 +4,7 @@ tests/cases/compiler/exportAssignmentOfDeclaredExternalModule_1.ts(4,9): error T
 
 ==== tests/cases/compiler/exportAssignmentOfDeclaredExternalModule_1.ts (2 errors) ====
     ///<reference path='exportAssignmentOfDeclaredExternalModule_0.ts'/>
-    import Sammy = require('exportAssignmentOfDeclaredExternalModule_0');
+    import Sammy = require('./exportAssignmentOfDeclaredExternalModule_0');
     var x = new Sammy(); // error to use as constructor as there is not constructor symbol
                 ~~~~~
 !!! error TS2304: Cannot find name 'Sammy'.
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
index c8ba8324ad2..460707a3502 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
@@ -9,7 +9,7 @@ export = Sammy;
 
 //// [exportAssignmentOfDeclaredExternalModule_1.ts]
 ///<reference path='exportAssignmentOfDeclaredExternalModule_0.ts'/>
-import Sammy = require('exportAssignmentOfDeclaredExternalModule_0');
+import Sammy = require('./exportAssignmentOfDeclaredExternalModule_0');
 var x = new Sammy(); // error to use as constructor as there is not constructor symbol
 var y = Sammy(); // error to use interface name as call target
 var z: Sammy; // no error - z is of type interface Sammy from module 'M'
diff --git a/tests/baselines/reference/exportAssignmentVariable.js b/tests/baselines/reference/exportAssignmentVariable.js
index c20e6ec4f7b..8afbf222e6d 100644
--- a/tests/baselines/reference/exportAssignmentVariable.js
+++ b/tests/baselines/reference/exportAssignmentVariable.js
@@ -6,7 +6,7 @@ var x = 0;
 export = x;
 
 //// [exportAssignmentVariable_B.ts]
-import y = require("exportAssignmentVariable_A");
+import y = require("./exportAssignmentVariable_A");
 
 var n: number = y;
 
@@ -14,5 +14,5 @@ var n: number = y;
 var x = 0;
 module.exports = x;
 //// [exportAssignmentVariable_B.js]
-var y = require("exportAssignmentVariable_A");
+var y = require("./exportAssignmentVariable_A");
 var n = y;
diff --git a/tests/baselines/reference/exportAssignmentVariable.symbols b/tests/baselines/reference/exportAssignmentVariable.symbols
index b819678d080..919a96ded33 100644
--- a/tests/baselines/reference/exportAssignmentVariable.symbols
+++ b/tests/baselines/reference/exportAssignmentVariable.symbols
@@ -1,5 +1,5 @@
 === tests/cases/compiler/exportAssignmentVariable_B.ts ===
-import y = require("exportAssignmentVariable_A");
+import y = require("./exportAssignmentVariable_A");
 >y : Symbol(y, Decl(exportAssignmentVariable_B.ts, 0, 0))
 
 var n: number = y;
diff --git a/tests/baselines/reference/exportAssignmentVariable.types b/tests/baselines/reference/exportAssignmentVariable.types
index 71f0afdea68..7c6d9b45cce 100644
--- a/tests/baselines/reference/exportAssignmentVariable.types
+++ b/tests/baselines/reference/exportAssignmentVariable.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/exportAssignmentVariable_B.ts ===
-import y = require("exportAssignmentVariable_A");
+import y = require("./exportAssignmentVariable_A");
 >y : number
 
 var n: number = y;
diff --git a/tests/baselines/reference/exportEqualMemberMissing.errors.txt b/tests/baselines/reference/exportEqualMemberMissing.errors.txt
index 3e6e7a35a12..4cd142668b9 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.errors.txt
+++ b/tests/baselines/reference/exportEqualMemberMissing.errors.txt
@@ -3,7 +3,7 @@ tests/cases/compiler/exportEqualMemberMissing_1.ts(3,23): error TS2339: Property
 
 ==== tests/cases/compiler/exportEqualMemberMissing_1.ts (1 errors) ====
     ///<reference path='exportEqualMemberMissing_0.ts'/>
-    import connect = require('exportEqualMemberMissing_0');
+    import connect = require('./exportEqualMemberMissing_0');
     connect().use(connect.static('foo')); // Error	1	The property 'static' does not exist on value of type ''.
                           ~~~~~~
 !!! error TS2339: Property 'static' does not exist on type '{ (): connectExport; foo: Date; }'.
diff --git a/tests/baselines/reference/exportEqualMemberMissing.js b/tests/baselines/reference/exportEqualMemberMissing.js
index 583176f12f3..85972ce0945 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.js
+++ b/tests/baselines/reference/exportEqualMemberMissing.js
@@ -17,7 +17,7 @@ export = server;
 
 //// [exportEqualMemberMissing_1.ts]
 ///<reference path='exportEqualMemberMissing_0.ts'/>
-import connect = require('exportEqualMemberMissing_0');
+import connect = require('./exportEqualMemberMissing_0');
 connect().use(connect.static('foo')); // Error	1	The property 'static' does not exist on value of type ''.
 
 
@@ -26,5 +26,5 @@ var server;
 module.exports = server;
 //// [exportEqualMemberMissing_1.js]
 ///<reference path='exportEqualMemberMissing_0.ts'/>
-var connect = require('exportEqualMemberMissing_0');
+var connect = require('./exportEqualMemberMissing_0');
 connect().use(connect.static('foo')); // Error	1	The property 'static' does not exist on value of type ''.
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.errors.txt b/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
index c88ac3b3f19..9d781da2707 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
+++ b/tests/baselines/reference/exportStarFromEmptyModule.errors.txt
@@ -12,17 +12,17 @@ tests/cases/compiler/exportStarFromEmptyModule_module4.ts(4,5): error TS2339: Pr
     // empty
     
 ==== tests/cases/compiler/exportStarFromEmptyModule_module3.ts (1 errors) ====
-    export * from "exportStarFromEmptyModule_module2";
-                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    export * from "./exportStarFromEmptyModule_module2";
+                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2306: File 'exportStarFromEmptyModule_module2.ts' is not a module.
-    export * from "exportStarFromEmptyModule_module1";
+    export * from "./exportStarFromEmptyModule_module1";
     
     export class A {
         static q;
     }
     
 ==== tests/cases/compiler/exportStarFromEmptyModule_module4.ts (1 errors) ====
-    import * as X from "exportStarFromEmptyModule_module3";
+    import * as X from "./exportStarFromEmptyModule_module3";
     var s: X.A;
     X.A.q;
     X.A.r; // Error
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
index 9b486af4eae..d433e7b3682 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.js
+++ b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -10,15 +10,15 @@ export class A {
 // empty
 
 //// [exportStarFromEmptyModule_module3.ts]
-export * from "exportStarFromEmptyModule_module2";
-export * from "exportStarFromEmptyModule_module1";
+export * from "./exportStarFromEmptyModule_module2";
+export * from "./exportStarFromEmptyModule_module1";
 
 export class A {
     static q;
 }
 
 //// [exportStarFromEmptyModule_module4.ts]
-import * as X from "exportStarFromEmptyModule_module3";
+import * as X from "./exportStarFromEmptyModule_module3";
 var s: X.A;
 X.A.q;
 X.A.r; // Error
@@ -36,8 +36,8 @@ exports.A = A;
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-__export(require("exportStarFromEmptyModule_module2"));
-__export(require("exportStarFromEmptyModule_module1"));
+__export(require("./exportStarFromEmptyModule_module2"));
+__export(require("./exportStarFromEmptyModule_module1"));
 var A = (function () {
     function A() {
     }
@@ -45,7 +45,7 @@ var A = (function () {
 })();
 exports.A = A;
 //// [exportStarFromEmptyModule_module4.js]
-var X = require("exportStarFromEmptyModule_module3");
+var X = require("./exportStarFromEmptyModule_module3");
 var s;
 X.A.q;
 X.A.r; // Error
@@ -57,8 +57,8 @@ export declare class A {
 }
 //// [exportStarFromEmptyModule_module2.d.ts]
 //// [exportStarFromEmptyModule_module3.d.ts]
-export * from "exportStarFromEmptyModule_module2";
-export * from "exportStarFromEmptyModule_module1";
+export * from "./exportStarFromEmptyModule_module2";
+export * from "./exportStarFromEmptyModule_module1";
 export declare class A {
     static q: any;
 }
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
index 297a7527ec0..3c05ccc6866 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -6,21 +6,21 @@ export class Model {
 }
 
 //// [extendingClassFromAliasAndUsageInIndexer_moduleA.ts]
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 //// [extendingClassFromAliasAndUsageInIndexer_moduleB.ts]
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 export class VisualizationModel extends Backbone.Model {
     // different interesting stuff here
 }
 
 //// [extendingClassFromAliasAndUsageInIndexer_main.ts]
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
-import moduleA = require("extendingClassFromAliasAndUsageInIndexer_moduleA");
-import moduleB = require("extendingClassFromAliasAndUsageInIndexer_moduleB");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
+import moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA");
+import moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
@@ -45,7 +45,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -60,7 +60,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
     function VisualizationModel() {
@@ -70,8 +70,8 @@ var VisualizationModel = (function (_super) {
 })(Backbone.Model);
 exports.VisualizationModel = VisualizationModel;
 //// [extendingClassFromAliasAndUsageInIndexer_main.js]
-var moduleA = require("extendingClassFromAliasAndUsageInIndexer_moduleA");
-var moduleB = require("extendingClassFromAliasAndUsageInIndexer_moduleB");
+var moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA");
+var moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB");
 var moduleATyped = moduleA;
 var moduleMap = {
     "moduleA": moduleA,
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols
index 02d57509a55..33e0c226e67 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.symbols
@@ -1,15 +1,15 @@
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_main.ts ===
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 >Backbone : Symbol(Backbone, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 0, 0))
 
-import moduleA = require("extendingClassFromAliasAndUsageInIndexer_moduleA");
->moduleA : Symbol(moduleA, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 0, 79))
+import moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA");
+>moduleA : Symbol(moduleA, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 0, 81))
 
-import moduleB = require("extendingClassFromAliasAndUsageInIndexer_moduleB");
->moduleB : Symbol(moduleB, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 1, 77))
+import moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB");
+>moduleB : Symbol(moduleB, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 1, 79))
 
 interface IHasVisualizationModel {
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 2, 77))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 2, 79))
 
     VisualizationModel: typeof Backbone.Model;
 >VisualizationModel : Symbol(VisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 3, 34))
@@ -19,19 +19,19 @@ interface IHasVisualizationModel {
 }
 var moduleATyped: IHasVisualizationModel = moduleA;
 >moduleATyped : Symbol(moduleATyped, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 6, 3))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 2, 77))
->moduleA : Symbol(moduleA, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 0, 79))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 2, 79))
+>moduleA : Symbol(moduleA, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 0, 81))
 
 var moduleMap: { [key: string]: IHasVisualizationModel } = {
 >moduleMap : Symbol(moduleMap, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 7, 3))
 >key : Symbol(key, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 7, 18))
->IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 2, 77))
+>IHasVisualizationModel : Symbol(IHasVisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 2, 79))
 
     "moduleA": moduleA,
->moduleA : Symbol(moduleA, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 0, 79))
+>moduleA : Symbol(moduleA, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 0, 81))
 
     "moduleB": moduleB
->moduleB : Symbol(moduleB, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 1, 77))
+>moduleB : Symbol(moduleB, Decl(extendingClassFromAliasAndUsageInIndexer_main.ts, 1, 79))
 
 };
 var moduleName: string;
@@ -53,11 +53,11 @@ export class Model {
 }
 
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA.ts ===
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 >Backbone : Symbol(Backbone, Decl(extendingClassFromAliasAndUsageInIndexer_moduleA.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_moduleA.ts, 0, 79))
+>VisualizationModel : Symbol(VisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_moduleA.ts, 0, 81))
 >Backbone.Model : Symbol(Backbone.Model, Decl(extendingClassFromAliasAndUsageInIndexer_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(extendingClassFromAliasAndUsageInIndexer_moduleA.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(extendingClassFromAliasAndUsageInIndexer_backbone.ts, 0, 0))
@@ -66,11 +66,11 @@ export class VisualizationModel extends Backbone.Model {
 }
 
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleB.ts ===
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 >Backbone : Symbol(Backbone, Decl(extendingClassFromAliasAndUsageInIndexer_moduleB.ts, 0, 0))
 
 export class VisualizationModel extends Backbone.Model {
->VisualizationModel : Symbol(VisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_moduleB.ts, 0, 79))
+>VisualizationModel : Symbol(VisualizationModel, Decl(extendingClassFromAliasAndUsageInIndexer_moduleB.ts, 0, 81))
 >Backbone.Model : Symbol(Backbone.Model, Decl(extendingClassFromAliasAndUsageInIndexer_backbone.ts, 0, 0))
 >Backbone : Symbol(Backbone, Decl(extendingClassFromAliasAndUsageInIndexer_moduleB.ts, 0, 0))
 >Model : Symbol(Backbone.Model, Decl(extendingClassFromAliasAndUsageInIndexer_backbone.ts, 0, 0))
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
index b5323ae5c85..e1bfd195698 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_main.ts ===
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 >Backbone : typeof Backbone
 
-import moduleA = require("extendingClassFromAliasAndUsageInIndexer_moduleA");
+import moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA");
 >moduleA : typeof moduleA
 
-import moduleB = require("extendingClassFromAliasAndUsageInIndexer_moduleB");
+import moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB");
 >moduleB : typeof moduleB
 
 interface IHasVisualizationModel {
@@ -56,7 +56,7 @@ export class Model {
 }
 
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA.ts ===
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
@@ -69,7 +69,7 @@ export class VisualizationModel extends Backbone.Model {
 }
 
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleB.ts ===
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 >Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.errors.txt b/tests/baselines/reference/externalModuleExportingGenericClass.errors.txt
index c8712b20864..7825345a1b5 100644
--- a/tests/baselines/reference/externalModuleExportingGenericClass.errors.txt
+++ b/tests/baselines/reference/externalModuleExportingGenericClass.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/externalModuleExportingGenericClass_file1.ts(2,8): error TS
 
 
 ==== tests/cases/compiler/externalModuleExportingGenericClass_file1.ts (1 errors) ====
-    import a = require('externalModuleExportingGenericClass_file0');
+    import a = require('./externalModuleExportingGenericClass_file0');
     var v: a; // this should report error
            ~
 !!! error TS2314: Generic type 'C<T>' requires 1 type argument(s).
diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js
index 14f18ddfc04..5dc1e9bea1d 100644
--- a/tests/baselines/reference/externalModuleExportingGenericClass.js
+++ b/tests/baselines/reference/externalModuleExportingGenericClass.js
@@ -9,7 +9,7 @@ export = C;
 
 
 //// [externalModuleExportingGenericClass_file1.ts]
-import a = require('externalModuleExportingGenericClass_file0');
+import a = require('./externalModuleExportingGenericClass_file0');
 var v: a; // this should report error
 var v2: any = (new a()).foo;
 var v3: number = (new a<number>()).foo;
@@ -23,7 +23,7 @@ var C = (function () {
 })();
 module.exports = C;
 //// [externalModuleExportingGenericClass_file1.js]
-var a = require('externalModuleExportingGenericClass_file0');
+var a = require('./externalModuleExportingGenericClass_file0');
 var v; // this should report error
 var v2 = (new a()).foo;
 var v3 = (new a()).foo;
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.errors.txt b/tests/baselines/reference/externalModuleImmutableBindings.errors.txt
index 8ab07c26851..a6040c154f0 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.errors.txt
+++ b/tests/baselines/reference/externalModuleImmutableBindings.errors.txt
@@ -16,7 +16,7 @@ tests/cases/compiler/f2.ts(41,13): error TS2339: Property 'blah' does not exist
 ==== tests/cases/compiler/f2.ts (10 errors) ====
     
     // all mutations below are illegal and should be fixed
-    import * as stuff from 'f1';
+    import * as stuff from './f1';
     
     var n = 'baz';
     
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index 5e5ba6c2294..47d83ded80c 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -6,7 +6,7 @@ export var x = 1;
 //// [f2.ts]
 
 // all mutations below are illegal and should be fixed
-import * as stuff from 'f1';
+import * as stuff from './f1';
 
 var n = 'baz';
 
@@ -55,7 +55,7 @@ for ((stuff[n]) of []) {}
 exports.x = 1;
 //// [f2.js]
 // all mutations below are illegal and should be fixed
-var stuff = require('f1');
+var stuff = require('./f1');
 var n = 'baz';
 stuff.x = 0;
 stuff['x'] = 1;
diff --git a/tests/baselines/reference/importAsBaseClass.errors.txt b/tests/baselines/reference/importAsBaseClass.errors.txt
index 835fd143f70..8f23baad543 100644
--- a/tests/baselines/reference/importAsBaseClass.errors.txt
+++ b/tests/baselines/reference/importAsBaseClass.errors.txt
@@ -2,7 +2,7 @@ tests/cases/compiler/importAsBaseClass_1.ts(2,21): error TS2507: Type 'typeof "t
 
 
 ==== tests/cases/compiler/importAsBaseClass_1.ts (1 errors) ====
-    import Greeter = require("importAsBaseClass_0");
+    import Greeter = require("./importAsBaseClass_0");
     class Hello extends Greeter { }
                         ~~~~~~~
 !!! error TS2507: Type 'typeof "tests/cases/compiler/importAsBaseClass_0"' is not a constructor function type.
diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js
index b79905911b1..57d71af2cda 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -6,7 +6,7 @@ export class Greeter {
 }
 
 //// [importAsBaseClass_1.ts]
-import Greeter = require("importAsBaseClass_0");
+import Greeter = require("./importAsBaseClass_0");
 class Hello extends Greeter { }
 
 
@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var Greeter = require("importAsBaseClass_0");
+var Greeter = require("./importAsBaseClass_0");
 var Hello = (function (_super) {
     __extends(Hello, _super);
     function Hello() {
diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js
index fb2aa6e0d1f..4b2672c4135 100644
--- a/tests/baselines/reference/importDecl.js
+++ b/tests/baselines/reference/importDecl.js
@@ -29,7 +29,7 @@ export var x: d;
 export function foo(): d { return null; }
 
 //// [importDecl_require4.ts]
-import m4 = require("importDecl_require");
+import m4 = require("./importDecl_require");
 export function foo2(): m4.d { return null; }
 
 //// [importDecl_1.ts]
@@ -38,7 +38,7 @@ export function foo2(): m4.d { return null; }
 ///<reference path='importDecl_require2.ts'/>
 ///<reference path='importDecl_require3.ts'/>
 ///<reference path='importDecl_require4.ts'/>
-import m4 = require("importDecl_require"); // Emit used
+import m4 = require("./importDecl_require"); // Emit used
 export var x4 = m4.x;
 export var d4 = m4.d;
 export var f4 = m4.foo();
@@ -54,16 +54,16 @@ export module m1 {
 }
 
 //Emit global only usage
-import glo_m4 = require("importDecl_require1");
+import glo_m4 = require("./importDecl_require1");
 export var useGlo_m4_d4 = glo_m4.d;
 export var useGlo_m4_f4 = glo_m4.foo();
 
 //Emit even when used just in function type
-import fncOnly_m4 = require("importDecl_require2");
+import fncOnly_m4 = require("./importDecl_require2");
 export var useFncOnly_m4_f4 = fncOnly_m4.foo();
 
 // only used privately no need to emit
-import private_m4 = require("importDecl_require3");
+import private_m4 = require("./importDecl_require3");
 export module usePrivate_m4_m1 {
     var x3 = private_m4.x;
     var d3 = private_m4.d;
@@ -71,11 +71,11 @@ export module usePrivate_m4_m1 {
 }
 
 // Do not emit unused import
-import m5 = require("importDecl_require4");
+import m5 = require("./importDecl_require4");
 export var d = m5.foo2();
 
 // Do not emit multiple used import statements
-import multiImport_m4 = require("importDecl_require"); // Emit used
+import multiImport_m4 = require("./importDecl_require"); // Emit used
 export var useMultiImport_m4_x4 = multiImport_m4.x;
 export var useMultiImport_m4_d4 = multiImport_m4.d;
 export var useMultiImport_m4_f4 = multiImport_m4.foo();
@@ -127,7 +127,7 @@ exports.foo2 = foo2;
 ///<reference path='importDecl_require2.ts'/>
 ///<reference path='importDecl_require3.ts'/>
 ///<reference path='importDecl_require4.ts'/>
-var m4 = require("importDecl_require"); // Emit used
+var m4 = require("./importDecl_require"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
 exports.f4 = m4.foo();
@@ -141,14 +141,14 @@ var m1;
     var f3 = m4.foo();
 })(m1 = exports.m1 || (exports.m1 = {}));
 //Emit global only usage
-var glo_m4 = require("importDecl_require1");
+var glo_m4 = require("./importDecl_require1");
 exports.useGlo_m4_d4 = glo_m4.d;
 exports.useGlo_m4_f4 = glo_m4.foo();
 //Emit even when used just in function type
-var fncOnly_m4 = require("importDecl_require2");
+var fncOnly_m4 = require("./importDecl_require2");
 exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
 // only used privately no need to emit
-var private_m4 = require("importDecl_require3");
+var private_m4 = require("./importDecl_require3");
 var usePrivate_m4_m1;
 (function (usePrivate_m4_m1) {
     var x3 = private_m4.x;
@@ -156,10 +156,10 @@ var usePrivate_m4_m1;
     var f3 = private_m4.foo();
 })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
 // Do not emit unused import
-var m5 = require("importDecl_require4");
+var m5 = require("./importDecl_require4");
 exports.d = m5.foo2();
 // Do not emit multiple used import statements
-var multiImport_m4 = require("importDecl_require"); // Emit used
+var multiImport_m4 = require("./importDecl_require"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
@@ -189,7 +189,7 @@ export declare class d {
 export declare var x: d;
 export declare function foo(): d;
 //// [importDecl_require4.d.ts]
-import m4 = require("importDecl_require");
+import m4 = require("./importDecl_require");
 export declare function foo2(): m4.d;
 //// [importDecl_1.d.ts]
 /// <reference path="importDecl_require.d.ts" />
@@ -197,7 +197,7 @@ export declare function foo2(): m4.d;
 /// <reference path="importDecl_require2.d.ts" />
 /// <reference path="importDecl_require3.d.ts" />
 /// <reference path="importDecl_require4.d.ts" />
-import m4 = require("importDecl_require");
+import m4 = require("./importDecl_require");
 export declare var x4: m4.d;
 export declare var d4: typeof m4.d;
 export declare var f4: m4.d;
@@ -206,10 +206,10 @@ export declare module m1 {
     var d2: typeof m4.d;
     var f2: m4.d;
 }
-import glo_m4 = require("importDecl_require1");
+import glo_m4 = require("./importDecl_require1");
 export declare var useGlo_m4_d4: typeof glo_m4.d;
 export declare var useGlo_m4_f4: glo_m4.d;
-import fncOnly_m4 = require("importDecl_require2");
+import fncOnly_m4 = require("./importDecl_require2");
 export declare var useFncOnly_m4_f4: fncOnly_m4.d;
 export declare module usePrivate_m4_m1 {
 }
diff --git a/tests/baselines/reference/importDecl.symbols b/tests/baselines/reference/importDecl.symbols
index 2341101b672..32b9f3bb2a7 100644
--- a/tests/baselines/reference/importDecl.symbols
+++ b/tests/baselines/reference/importDecl.symbols
@@ -4,7 +4,7 @@
 ///<reference path='importDecl_require2.ts'/>
 ///<reference path='importDecl_require3.ts'/>
 ///<reference path='importDecl_require4.ts'/>
-import m4 = require("importDecl_require"); // Emit used
+import m4 = require("./importDecl_require"); // Emit used
 >m4 : Symbol(m4, Decl(importDecl_1.ts, 0, 0))
 
 export var x4 = m4.x;
@@ -66,7 +66,7 @@ export module m1 {
 }
 
 //Emit global only usage
-import glo_m4 = require("importDecl_require1");
+import glo_m4 = require("./importDecl_require1");
 >glo_m4 : Symbol(glo_m4, Decl(importDecl_1.ts, 18, 1))
 
 export var useGlo_m4_d4 = glo_m4.d;
@@ -82,7 +82,7 @@ export var useGlo_m4_f4 = glo_m4.foo();
 >foo : Symbol(glo_m4.foo, Decl(importDecl_require1.ts, 3, 9))
 
 //Emit even when used just in function type
-import fncOnly_m4 = require("importDecl_require2");
+import fncOnly_m4 = require("./importDecl_require2");
 >fncOnly_m4 : Symbol(fncOnly_m4, Decl(importDecl_1.ts, 23, 39))
 
 export var useFncOnly_m4_f4 = fncOnly_m4.foo();
@@ -92,11 +92,11 @@ export var useFncOnly_m4_f4 = fncOnly_m4.foo();
 >foo : Symbol(fncOnly_m4.foo, Decl(importDecl_require2.ts, 3, 16))
 
 // only used privately no need to emit
-import private_m4 = require("importDecl_require3");
+import private_m4 = require("./importDecl_require3");
 >private_m4 : Symbol(private_m4, Decl(importDecl_1.ts, 27, 47))
 
 export module usePrivate_m4_m1 {
->usePrivate_m4_m1 : Symbol(usePrivate_m4_m1, Decl(importDecl_1.ts, 30, 51))
+>usePrivate_m4_m1 : Symbol(usePrivate_m4_m1, Decl(importDecl_1.ts, 30, 53))
 
     var x3 = private_m4.x;
 >x3 : Symbol(x3, Decl(importDecl_1.ts, 32, 7))
@@ -118,17 +118,17 @@ export module usePrivate_m4_m1 {
 }
 
 // Do not emit unused import
-import m5 = require("importDecl_require4");
+import m5 = require("./importDecl_require4");
 >m5 : Symbol(m5, Decl(importDecl_1.ts, 35, 1))
 
 export var d = m5.foo2();
 >d : Symbol(d, Decl(importDecl_1.ts, 39, 10))
->m5.foo2 : Symbol(m5.foo2, Decl(importDecl_require4.ts, 0, 42))
+>m5.foo2 : Symbol(m5.foo2, Decl(importDecl_require4.ts, 0, 44))
 >m5 : Symbol(m5, Decl(importDecl_1.ts, 35, 1))
->foo2 : Symbol(m5.foo2, Decl(importDecl_require4.ts, 0, 42))
+>foo2 : Symbol(m5.foo2, Decl(importDecl_require4.ts, 0, 44))
 
 // Do not emit multiple used import statements
-import multiImport_m4 = require("importDecl_require"); // Emit used
+import multiImport_m4 = require("./importDecl_require"); // Emit used
 >multiImport_m4 : Symbol(multiImport_m4, Decl(importDecl_1.ts, 39, 25))
 
 export var useMultiImport_m4_x4 = multiImport_m4.x;
@@ -210,11 +210,11 @@ export function foo(): d { return null; }
 >d : Symbol(d, Decl(importDecl_require3.ts, 0, 0))
 
 === tests/cases/compiler/importDecl_require4.ts ===
-import m4 = require("importDecl_require");
+import m4 = require("./importDecl_require");
 >m4 : Symbol(m4, Decl(importDecl_require4.ts, 0, 0))
 
 export function foo2(): m4.d { return null; }
->foo2 : Symbol(foo2, Decl(importDecl_require4.ts, 0, 42))
+>foo2 : Symbol(foo2, Decl(importDecl_require4.ts, 0, 44))
 >m4 : Symbol(m4, Decl(importDecl_require4.ts, 0, 0))
 >d : Symbol(m4.d, Decl(importDecl_require.ts, 0, 0))
 
diff --git a/tests/baselines/reference/importDecl.types b/tests/baselines/reference/importDecl.types
index 58a56281bae..7bf4da78121 100644
--- a/tests/baselines/reference/importDecl.types
+++ b/tests/baselines/reference/importDecl.types
@@ -4,7 +4,7 @@
 ///<reference path='importDecl_require2.ts'/>
 ///<reference path='importDecl_require3.ts'/>
 ///<reference path='importDecl_require4.ts'/>
-import m4 = require("importDecl_require"); // Emit used
+import m4 = require("./importDecl_require"); // Emit used
 >m4 : typeof m4
 
 export var x4 = m4.x;
@@ -69,7 +69,7 @@ export module m1 {
 }
 
 //Emit global only usage
-import glo_m4 = require("importDecl_require1");
+import glo_m4 = require("./importDecl_require1");
 >glo_m4 : typeof glo_m4
 
 export var useGlo_m4_d4 = glo_m4.d;
@@ -86,7 +86,7 @@ export var useGlo_m4_f4 = glo_m4.foo();
 >foo : () => glo_m4.d
 
 //Emit even when used just in function type
-import fncOnly_m4 = require("importDecl_require2");
+import fncOnly_m4 = require("./importDecl_require2");
 >fncOnly_m4 : typeof fncOnly_m4
 
 export var useFncOnly_m4_f4 = fncOnly_m4.foo();
@@ -97,7 +97,7 @@ export var useFncOnly_m4_f4 = fncOnly_m4.foo();
 >foo : () => fncOnly_m4.d
 
 // only used privately no need to emit
-import private_m4 = require("importDecl_require3");
+import private_m4 = require("./importDecl_require3");
 >private_m4 : typeof private_m4
 
 export module usePrivate_m4_m1 {
@@ -124,7 +124,7 @@ export module usePrivate_m4_m1 {
 }
 
 // Do not emit unused import
-import m5 = require("importDecl_require4");
+import m5 = require("./importDecl_require4");
 >m5 : typeof m5
 
 export var d = m5.foo2();
@@ -135,7 +135,7 @@ export var d = m5.foo2();
 >foo2 : () => m4.d
 
 // Do not emit multiple used import statements
-import multiImport_m4 = require("importDecl_require"); // Emit used
+import multiImport_m4 = require("./importDecl_require"); // Emit used
 >multiImport_m4 : typeof m4
 
 export var useMultiImport_m4_x4 = multiImport_m4.x;
@@ -222,7 +222,7 @@ export function foo(): d { return null; }
 >null : null
 
 === tests/cases/compiler/importDecl_require4.ts ===
-import m4 = require("importDecl_require");
+import m4 = require("./importDecl_require");
 >m4 : typeof m4
 
 export function foo2(): m4.d { return null; }
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
index 70244f47381..51839c35df2 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
@@ -7,7 +7,7 @@ export class B {
 
 //// [importDeclarationUsedAsTypeQuery_1.ts]
 ///<reference path='importDeclarationUsedAsTypeQuery_require.ts'/>
-import a = require('importDeclarationUsedAsTypeQuery_require');
+import a = require('./importDeclarationUsedAsTypeQuery_require');
 export var x: typeof a;
 
 
@@ -27,5 +27,5 @@ export declare class B {
 }
 //// [importDeclarationUsedAsTypeQuery_1.d.ts]
 /// <reference path="importDeclarationUsedAsTypeQuery_require.d.ts" />
-import a = require('importDeclarationUsedAsTypeQuery_require');
+import a = require('./importDeclarationUsedAsTypeQuery_require');
 export declare var x: typeof a;
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.symbols b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.symbols
index 2664691972f..0cd2498e2af 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.symbols
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/importDeclarationUsedAsTypeQuery_1.ts ===
 ///<reference path='importDeclarationUsedAsTypeQuery_require.ts'/>
-import a = require('importDeclarationUsedAsTypeQuery_require');
+import a = require('./importDeclarationUsedAsTypeQuery_require');
 >a : Symbol(a, Decl(importDeclarationUsedAsTypeQuery_1.ts, 0, 0))
 
 export var x: typeof a;
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types
index 2f449c2aa87..5d4c8efc7d4 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/importDeclarationUsedAsTypeQuery_1.ts ===
 ///<reference path='importDeclarationUsedAsTypeQuery_require.ts'/>
-import a = require('importDeclarationUsedAsTypeQuery_require');
+import a = require('./importDeclarationUsedAsTypeQuery_require');
 >a : typeof a
 
 export var x: typeof a;
diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js
index e86b1a41456..129e7b44fd7 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -5,7 +5,7 @@ export class Super { foo: string; }
 
 //// [importUsedInExtendsList1_1.ts]
 ///<reference path='importUsedInExtendsList1_require.ts'/>
-import foo = require('importUsedInExtendsList1_require');
+import foo = require('./importUsedInExtendsList1_require');
 class Sub extends foo.Super { }
 var s: Sub;
 var r: string = s.foo;
@@ -25,7 +25,7 @@ var __extends = (this && this.__extends) || function (d, b) {
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
 ///<reference path='importUsedInExtendsList1_require.ts'/>
-var foo = require('importUsedInExtendsList1_require');
+var foo = require('./importUsedInExtendsList1_require');
 var Sub = (function (_super) {
     __extends(Sub, _super);
     function Sub() {
diff --git a/tests/baselines/reference/importUsedInExtendsList1.symbols b/tests/baselines/reference/importUsedInExtendsList1.symbols
index 1b3ac99ee9d..263b4f50ed8 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.symbols
+++ b/tests/baselines/reference/importUsedInExtendsList1.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/importUsedInExtendsList1_1.ts ===
 ///<reference path='importUsedInExtendsList1_require.ts'/>
-import foo = require('importUsedInExtendsList1_require');
+import foo = require('./importUsedInExtendsList1_require');
 >foo : Symbol(foo, Decl(importUsedInExtendsList1_1.ts, 0, 0))
 
 class Sub extends foo.Super { }
->Sub : Symbol(Sub, Decl(importUsedInExtendsList1_1.ts, 1, 57))
+>Sub : Symbol(Sub, Decl(importUsedInExtendsList1_1.ts, 1, 59))
 >foo.Super : Symbol(foo.Super, Decl(importUsedInExtendsList1_require.ts, 0, 0))
 >foo : Symbol(foo, Decl(importUsedInExtendsList1_1.ts, 0, 0))
 >Super : Symbol(foo.Super, Decl(importUsedInExtendsList1_require.ts, 0, 0))
 
 var s: Sub;
 >s : Symbol(s, Decl(importUsedInExtendsList1_1.ts, 3, 3))
->Sub : Symbol(Sub, Decl(importUsedInExtendsList1_1.ts, 1, 57))
+>Sub : Symbol(Sub, Decl(importUsedInExtendsList1_1.ts, 1, 59))
 
 var r: string = s.foo;
 >r : Symbol(r, Decl(importUsedInExtendsList1_1.ts, 4, 3))
diff --git a/tests/baselines/reference/importUsedInExtendsList1.types b/tests/baselines/reference/importUsedInExtendsList1.types
index 3c1b69f5a83..752f4764976 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.types
+++ b/tests/baselines/reference/importUsedInExtendsList1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/importUsedInExtendsList1_1.ts ===
 ///<reference path='importUsedInExtendsList1_require.ts'/>
-import foo = require('importUsedInExtendsList1_require');
+import foo = require('./importUsedInExtendsList1_require');
 >foo : typeof foo
 
 class Sub extends foo.Super { }
diff --git a/tests/baselines/reference/localAliasExportAssignment.js b/tests/baselines/reference/localAliasExportAssignment.js
index ce0f57d57cb..686ab4126a2 100644
--- a/tests/baselines/reference/localAliasExportAssignment.js
+++ b/tests/baselines/reference/localAliasExportAssignment.js
@@ -9,7 +9,7 @@ export = server;
 
 //// [localAliasExportAssignment_1.ts]
 ///<reference path='localAliasExportAssignment_0.ts'/>
-import connect = require('localAliasExportAssignment_0');
+import connect = require('./localAliasExportAssignment_0');
 
 connect();
 
@@ -21,5 +21,5 @@ var server;
 module.exports = server;
 //// [localAliasExportAssignment_1.js]
 ///<reference path='localAliasExportAssignment_0.ts'/>
-var connect = require('localAliasExportAssignment_0');
+var connect = require('./localAliasExportAssignment_0');
 connect();
diff --git a/tests/baselines/reference/localAliasExportAssignment.symbols b/tests/baselines/reference/localAliasExportAssignment.symbols
index 43c99941384..0c73dfd79de 100644
--- a/tests/baselines/reference/localAliasExportAssignment.symbols
+++ b/tests/baselines/reference/localAliasExportAssignment.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/localAliasExportAssignment_1.ts ===
 ///<reference path='localAliasExportAssignment_0.ts'/>
-import connect = require('localAliasExportAssignment_0');
+import connect = require('./localAliasExportAssignment_0');
 >connect : Symbol(connect, Decl(localAliasExportAssignment_1.ts, 0, 0))
 
 connect();
diff --git a/tests/baselines/reference/localAliasExportAssignment.types b/tests/baselines/reference/localAliasExportAssignment.types
index 5ea0d3085c1..f83b63fedb7 100644
--- a/tests/baselines/reference/localAliasExportAssignment.types
+++ b/tests/baselines/reference/localAliasExportAssignment.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/localAliasExportAssignment_1.ts ===
 ///<reference path='localAliasExportAssignment_0.ts'/>
-import connect = require('localAliasExportAssignment_0');
+import connect = require('./localAliasExportAssignment_0');
 >connect : () => any
 
 connect();
diff --git a/tests/baselines/reference/moduleInTypePosition1.errors.txt b/tests/baselines/reference/moduleInTypePosition1.errors.txt
index a5b5076e172..ff5fa2da4eb 100644
--- a/tests/baselines/reference/moduleInTypePosition1.errors.txt
+++ b/tests/baselines/reference/moduleInTypePosition1.errors.txt
@@ -3,7 +3,7 @@ tests/cases/compiler/moduleInTypePosition1_1.ts(3,14): error TS2304: Cannot find
 
 ==== tests/cases/compiler/moduleInTypePosition1_1.ts (1 errors) ====
     ///<reference path='moduleInTypePosition1_0.ts'/>
-    import WinJS = require('moduleInTypePosition1_0');
+    import WinJS = require('./moduleInTypePosition1_0');
     var x = (w1: WinJS) => { };
                  ~~~~~
 !!! error TS2304: Cannot find name 'WinJS'.
diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js
index 972bbae63d1..bcce5f74632 100644
--- a/tests/baselines/reference/moduleInTypePosition1.js
+++ b/tests/baselines/reference/moduleInTypePosition1.js
@@ -7,7 +7,7 @@ export class Promise {
 
 //// [moduleInTypePosition1_1.ts]
 ///<reference path='moduleInTypePosition1_0.ts'/>
-import WinJS = require('moduleInTypePosition1_0');
+import WinJS = require('./moduleInTypePosition1_0');
 var x = (w1: WinJS) => { };
 
 
diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js
index 06d81f7e984..5a03f3c848d 100644
--- a/tests/baselines/reference/multiImportExport.js
+++ b/tests/baselines/reference/multiImportExport.js
@@ -5,10 +5,10 @@ import Drawing = require('./Drawing');
 var addr = new Drawing.Math.Adder();
 
 //// [Drawing.ts]
-export import Math = require('Math/Math')
+export import Math = require('./Math/Math')
 
 //// [Math.ts]
-import Adder = require('Math/Adder');
+import Adder = require('./Adder');
 
 var Math = {
     Adder:Adder
@@ -35,13 +35,13 @@ var Adder = (function () {
 })();
 module.exports = Adder;
 //// [Math.js]
-var Adder = require('Math/Adder');
+var Adder = require('./Adder');
 var Math = {
     Adder: Adder
 };
 module.exports = Math;
 //// [Drawing.js]
-exports.Math = require('Math/Math');
+exports.Math = require('./Math/Math');
 //// [consumer.js]
 var Drawing = require('./Drawing');
 var addr = new Drawing.Math.Adder();
@@ -53,11 +53,11 @@ declare class Adder {
 }
 export = Adder;
 //// [Math.d.ts]
-import Adder = require('Math/Adder');
+import Adder = require('./Adder');
 declare var Math: {
     Adder: typeof Adder;
 };
 export = Math;
 //// [Drawing.d.ts]
-export import Math = require('Math/Math');
+export import Math = require('./Math/Math');
 //// [consumer.d.ts]
diff --git a/tests/baselines/reference/multiImportExport.symbols b/tests/baselines/reference/multiImportExport.symbols
index 6601571aabc..45b59752b2a 100644
--- a/tests/baselines/reference/multiImportExport.symbols
+++ b/tests/baselines/reference/multiImportExport.symbols
@@ -11,11 +11,11 @@ var addr = new Drawing.Math.Adder();
 >Adder : Symbol(Adder, Decl(Math.ts, 2, 12))
 
 === tests/cases/compiler/Drawing.ts ===
-export import Math = require('Math/Math')
+export import Math = require('./Math/Math')
 >Math : Symbol(Math, Decl(Drawing.ts, 0, 0))
 
 === tests/cases/compiler/Math/Math.ts ===
-import Adder = require('Math/Adder');
+import Adder = require('./Adder');
 >Adder : Symbol(Adder, Decl(Math.ts, 0, 0))
 
 var Math = {
diff --git a/tests/baselines/reference/multiImportExport.types b/tests/baselines/reference/multiImportExport.types
index aac60aaee90..4a94eef9865 100644
--- a/tests/baselines/reference/multiImportExport.types
+++ b/tests/baselines/reference/multiImportExport.types
@@ -12,11 +12,11 @@ var addr = new Drawing.Math.Adder();
 >Adder : typeof Adder
 
 === tests/cases/compiler/Drawing.ts ===
-export import Math = require('Math/Math')
+export import Math = require('./Math/Math')
 >Math : { Adder: typeof Adder; }
 
 === tests/cases/compiler/Math/Math.ts ===
-import Adder = require('Math/Adder');
+import Adder = require('./Adder');
 >Adder : typeof Adder
 
 var Math = {
diff --git a/tests/baselines/reference/multipleDefaultExports01.errors.txt b/tests/baselines/reference/multipleDefaultExports01.errors.txt
index 7b49afe1a4e..72898d474e8 100644
--- a/tests/baselines/reference/multipleDefaultExports01.errors.txt
+++ b/tests/baselines/reference/multipleDefaultExports01.errors.txt
@@ -24,7 +24,7 @@ tests/cases/conformance/es6/modules/m2.ts(3,1): error TS2348: Value of type 'typ
 !!! error TS2300: Duplicate identifier 'default'.
     
 ==== tests/cases/conformance/es6/modules/m2.ts (1 errors) ====
-    import Entity from "m1"
+    import Entity from "./m1"
     
     Entity();
     ~~~~~~~~
diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js
index e633cf69f55..b1ff3b4353c 100644
--- a/tests/baselines/reference/multipleDefaultExports01.js
+++ b/tests/baselines/reference/multipleDefaultExports01.js
@@ -14,7 +14,7 @@ var x = 10;
 export default x;
 
 //// [m2.ts]
-import Entity from "m1"
+import Entity from "./m1"
 
 Entity();
 
@@ -34,5 +34,5 @@ var x = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = x;
 //// [m2.js]
-var m1_1 = require("m1");
+var m1_1 = require("./m1");
 m1_1.default();
diff --git a/tests/baselines/reference/multipleDefaultExports02.errors.txt b/tests/baselines/reference/multipleDefaultExports02.errors.txt
index 51220ecfae2..235f8f7c3e3 100644
--- a/tests/baselines/reference/multipleDefaultExports02.errors.txt
+++ b/tests/baselines/reference/multipleDefaultExports02.errors.txt
@@ -17,6 +17,6 @@ tests/cases/conformance/es6/modules/m1.ts(6,25): error TS2393: Duplicate functio
     }
     
 ==== tests/cases/conformance/es6/modules/m2.ts (0 errors) ====
-    import Entity from "m1"
+    import Entity from "./m1"
     
     Entity();
\ No newline at end of file
diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js
index 3d1b84ff6a6..7b43c43ee60 100644
--- a/tests/baselines/reference/multipleDefaultExports02.js
+++ b/tests/baselines/reference/multipleDefaultExports02.js
@@ -11,7 +11,7 @@ export default function bar() {
 }
 
 //// [m2.ts]
-import Entity from "m1"
+import Entity from "./m1"
 
 Entity();
 
@@ -25,5 +25,5 @@ function bar() {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = bar;
 //// [m2.js]
-var m1_1 = require("m1");
+var m1_1 = require("./m1");
 m1_1.default();
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt
index 578baa694fd..b5d0ea8223e 100644
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt
@@ -9,7 +9,7 @@ tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(66,9): error
 
 
 ==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts (8 errors) ====
-    import exporter = require("privacyCannotNameAccessorDeclFile_exporter");
+    import exporter = require("./privacyCannotNameAccessorDeclFile_exporter");
     export class publicClassWithWithPrivateGetAccessorTypes {
         static get myPublicStaticMethod() { // Error
                    ~~~~~~~~~~~~~~~~~~~~
@@ -144,7 +144,7 @@ tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(66,9): error
     
 ==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_exporter.ts (0 errors) ====
     ///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
-    import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
+    import Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets");
     import Widgets1 = require("GlobalWidgets");
     export function createExportedWidget1() {
         return Widgets.createWidget1();
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
index 0295e42e654..8c4108ea9e8 100644
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
@@ -35,7 +35,7 @@ export module SpecializedWidget {
 
 //// [privacyCannotNameAccessorDeclFile_exporter.ts]
 ///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
+import Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -51,7 +51,7 @@ export function createExportedWidget4() {
 }
 
 //// [privacyCannotNameAccessorDeclFile_consumer.ts]
-import exporter = require("privacyCannotNameAccessorDeclFile_exporter");
+import exporter = require("./privacyCannotNameAccessorDeclFile_exporter");
 export class publicClassWithWithPrivateGetAccessorTypes {
     static get myPublicStaticMethod() { // Error
         return exporter.createExportedWidget1();
@@ -165,7 +165,7 @@ var SpecializedWidget;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
 //// [privacyCannotNameAccessorDeclFile_exporter.js]
 ///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
-var Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
+var Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
 function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -184,7 +184,7 @@ function createExportedWidget4() {
 }
 exports.createExportedWidget4 = createExportedWidget4;
 //// [privacyCannotNameAccessorDeclFile_consumer.js]
-var exporter = require("privacyCannotNameAccessorDeclFile_exporter");
+var exporter = require("./privacyCannotNameAccessorDeclFile_exporter");
 var publicClassWithWithPrivateGetAccessorTypes = (function () {
     function publicClassWithWithPrivateGetAccessorTypes() {
     }
@@ -403,7 +403,7 @@ export declare module SpecializedWidget {
 }
 //// [privacyCannotNameAccessorDeclFile_exporter.d.ts]
 /// <reference path="privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts" />
-import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
+import Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export declare function createExportedWidget1(): Widgets.Widget1;
 export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt
index 7f155f0e454..e76474d2d33 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt
@@ -13,7 +13,7 @@ tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(38,12): error
 
 
 ==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts (12 errors) ====
-    import exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
+    import exporter = require("./privacyCannotNameVarTypeDeclFile_exporter");
     export class publicClassWithWithPrivatePropertyTypes {
         static myPublicStaticProperty = exporter.createExportedWidget1(); // Error
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -120,7 +120,7 @@ tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(38,12): error
     
 ==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_exporter.ts (0 errors) ====
     ///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
-    import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
+    import Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets");
     import Widgets1 = require("GlobalWidgets");
     export function createExportedWidget1() {
         return Widgets.createWidget1();
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
index d1f04ee3cef..b40d1dc4980 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
@@ -36,7 +36,7 @@ export module SpecializedWidget {
 
 //// [privacyCannotNameVarTypeDeclFile_exporter.ts]
 ///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
+import Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -52,7 +52,7 @@ export function createExportedWidget4() {
 }
 
 //// [privacyCannotNameVarTypeDeclFile_consumer.ts]
-import exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
+import exporter = require("./privacyCannotNameVarTypeDeclFile_exporter");
 export class publicClassWithWithPrivatePropertyTypes {
     static myPublicStaticProperty = exporter.createExportedWidget1(); // Error
     private static myPrivateStaticProperty = exporter.createExportedWidget1();
@@ -129,7 +129,7 @@ var SpecializedWidget;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
 //// [privacyCannotNameVarTypeDeclFile_exporter.js]
 ///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
-var Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
+var Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
 function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -148,7 +148,7 @@ function createExportedWidget4() {
 }
 exports.createExportedWidget4 = createExportedWidget4;
 //// [privacyCannotNameVarTypeDeclFile_consumer.js]
-var exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
+var exporter = require("./privacyCannotNameVarTypeDeclFile_exporter");
 var publicClassWithWithPrivatePropertyTypes = (function () {
     function publicClassWithWithPrivatePropertyTypes() {
         this.myPublicProperty = exporter.createExportedWidget1(); // Error
@@ -231,7 +231,7 @@ export declare module SpecializedWidget {
 }
 //// [privacyCannotNameVarTypeDeclFile_exporter.d.ts]
 /// <reference path="privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts" />
-import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
+import Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export declare function createExportedWidget1(): Widgets.Widget1;
 export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
index eeaea58e0ab..8ed0b3cfa1b 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
@@ -7,7 +7,7 @@ class Foo<A> {
 }
 
 //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.ts]
-import Foo = require("privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
+import Foo = require("./privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
 export = Bar;
 interface Bar {
     foo: Foo<number>;
@@ -31,7 +31,7 @@ declare class Foo<A> {
     constructor(a: A);
 }
 //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.d.ts]
-import Foo = require("privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
+import Foo = require("./privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
 export = Bar;
 interface Bar {
     foo: Foo<number>;
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.symbols b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.symbols
index fed3799f950..75ebd0bff0a 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.symbols
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.symbols
@@ -1,5 +1,5 @@
 === tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass_1.ts ===
-import Foo = require("privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
+import Foo = require("./privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
 >Foo : Symbol(Foo, Decl(privacyCheckExternalModuleExportAssignmentOfGenericClass_1.ts, 0, 0))
 
 export = Bar;
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
index 2259b039c91..ebf2a0e3ff6 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass_1.ts ===
-import Foo = require("privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
+import Foo = require("./privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
 >Foo : typeof Foo
 
 export = Bar;
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt
index 1e221ccd70a..76fd8b4e80a 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt
@@ -25,7 +25,7 @@ tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(
 
 
 ==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts (24 errors) ====
-    import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
+    import exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter");
     export class publicClassWithWithPrivateParmeterTypes {
         static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error
                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -212,7 +212,7 @@ tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(
     
 ==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts (0 errors) ====
     ///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
-    import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
+    import Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
     import Widgets1 = require("GlobalWidgets");
     export function createExportedWidget1() {
         return Widgets.createWidget1();
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
index 7acd56927c7..bf2d820e2ea 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
@@ -36,7 +36,7 @@ export module SpecializedWidget {
 
 //// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts]
 ///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
+import Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -52,7 +52,7 @@ export function createExportedWidget4() {
 }
 
 //// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts]
-import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
+import exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter");
 export class publicClassWithWithPrivateParmeterTypes {
     static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error
     }
@@ -185,7 +185,7 @@ var SpecializedWidget;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
 //// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.js]
 ///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
-var Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
+var Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
 function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -204,7 +204,7 @@ function createExportedWidget4() {
 }
 exports.createExportedWidget4 = createExportedWidget4;
 //// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.js]
-var exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
+var exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter");
 var publicClassWithWithPrivateParmeterTypes = (function () {
     function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
         if (param === void 0) { param = exporter.createExportedWidget1(); }
@@ -417,7 +417,7 @@ export declare module SpecializedWidget {
 }
 //// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.d.ts]
 /// <reference path="privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts" />
-import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
+import Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export declare function createExportedWidget1(): Widgets.Widget1;
 export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt
index 4be9aec9abe..bc6229815f5 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt
@@ -13,7 +13,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(86,17): error
 
 
 ==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts (12 errors) ====
-    import exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
+    import exporter = require("./privacyFunctionReturnTypeDeclFile_exporter");
     export class publicClassWithWithPrivateParmeterTypes {
         static myPublicStaticMethod() { // Error
                ~~~~~~~~~~~~~~~~~~~~
@@ -183,7 +183,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(86,17): error
     
 ==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_exporter.ts (0 errors) ====
     ///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
-    import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
+    import Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets");
     import Widgets1 = require("GlobalWidgets");
     export function createExportedWidget1() {
         return Widgets.createWidget1();
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
index 5f822929a48..8de50f4ea8a 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
@@ -36,7 +36,7 @@ export module SpecializedWidget {
 
 //// [privacyFunctionReturnTypeDeclFile_exporter.ts]
 ///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
+import Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -52,7 +52,7 @@ export function createExportedWidget4() {
 }
 
 //// [privacyFunctionReturnTypeDeclFile_consumer.ts]
-import exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
+import exporter = require("./privacyFunctionReturnTypeDeclFile_exporter");
 export class publicClassWithWithPrivateParmeterTypes {
     static myPublicStaticMethod() { // Error
         return exporter.createExportedWidget1();
@@ -192,7 +192,7 @@ var SpecializedWidget;
 })(SpecializedWidget = exports.SpecializedWidget || (exports.SpecializedWidget = {}));
 //// [privacyFunctionReturnTypeDeclFile_exporter.js]
 ///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
-var Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
+var Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets");
 var Widgets1 = require("GlobalWidgets");
 function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -211,7 +211,7 @@ function createExportedWidget4() {
 }
 exports.createExportedWidget4 = createExportedWidget4;
 //// [privacyFunctionReturnTypeDeclFile_consumer.js]
-var exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
+var exporter = require("./privacyFunctionReturnTypeDeclFile_exporter");
 var publicClassWithWithPrivateParmeterTypes = (function () {
     function publicClassWithWithPrivateParmeterTypes() {
     }
@@ -374,7 +374,7 @@ export declare module SpecializedWidget {
 }
 //// [privacyFunctionReturnTypeDeclFile_exporter.d.ts]
 /// <reference path="privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts" />
-import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
+import Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export declare function createExportedWidget1(): Widgets.Widget1;
 export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
index f0ee8c1bb6c..4d184dfe714 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
@@ -32,8 +32,8 @@ declare module 'm2' {
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
-export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
-export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
+export import im_public_mi_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require");
+export import im_public_mu_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require1");
 export import im_public_mi_public = require("m");
 export import im_public_mu_public = require("m2");
 
@@ -69,8 +69,8 @@ exports.c_public = c_public;
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
-exports.im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
-exports.im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
+exports.im_public_mi_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require");
+exports.im_public_mu_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require1");
 exports.im_public_mi_public = require("m");
 exports.im_public_mu_public = require("m2");
 // Usage of privacy error imports
@@ -107,8 +107,8 @@ export declare class c_public {
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.d.ts]
 /// <reference path="privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts" />
 /// <reference path="privacyTopLevelAmbientExternalModuleImportWithExport_require3.d.ts" />
-export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
-export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
+export import im_public_mi_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require");
+export import im_public_mu_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require1");
 export import im_public_mi_public = require("m");
 export import im_public_mu_public = require("m2");
 export declare var publicUse_im_public_mi_private: im_public_mi_private.c_public;
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.symbols b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.symbols
index 3c0bd5ff61b..2dcddbbfa06 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.symbols
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.symbols
@@ -2,14 +2,14 @@
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
-export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
+export import im_public_mi_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require");
 >im_public_mi_private : Symbol(im_public_mi_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 0, 0))
 
-export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
->im_public_mu_private : Symbol(im_public_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 3, 109))
+export import im_public_mu_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require1");
+>im_public_mu_private : Symbol(im_public_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 3, 111))
 
 export import im_public_mi_public = require("m");
->im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 4, 110))
+>im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 4, 112))
 
 export import im_public_mu_public = require("m2");
 >im_public_mu_public : Symbol(im_public_mu_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 5, 49))
@@ -30,37 +30,37 @@ export var publicUse_im_public_mi_private = new im_public_mi_private.c_public();
 var privateUse_im_public_mu_private = new im_public_mu_private.c_public();
 >privateUse_im_public_mu_private : Symbol(privateUse_im_public_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 11, 3))
 >im_public_mu_private.c_public : Symbol(im_public_mu_private.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require1.ts, 0, 0))
->im_public_mu_private : Symbol(im_public_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 3, 109))
+>im_public_mu_private : Symbol(im_public_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 3, 111))
 >c_public : Symbol(im_public_mu_private.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require1.ts, 0, 0))
 
 export var publicUse_im_public_mu_private = new im_public_mu_private.c_public();
 >publicUse_im_public_mu_private : Symbol(publicUse_im_public_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 12, 10))
 >im_public_mu_private.c_public : Symbol(im_public_mu_private.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require1.ts, 0, 0))
->im_public_mu_private : Symbol(im_public_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 3, 109))
+>im_public_mu_private : Symbol(im_public_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 3, 111))
 >c_public : Symbol(im_public_mu_private.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require1.ts, 0, 0))
 
 var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
 >privateUse_im_public_mi_public : Symbol(privateUse_im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 13, 3), Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 15, 3))
 >im_public_mi_public.c_private : Symbol(im_public_mi_public.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts, 2, 20))
->im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 4, 110))
+>im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 4, 112))
 >c_private : Symbol(im_public_mi_public.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts, 2, 20))
 
 export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
 >publicUse_im_public_mi_public : Symbol(publicUse_im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 14, 10), Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 16, 10))
 >im_public_mi_public.c_private : Symbol(im_public_mi_public.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts, 2, 20))
->im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 4, 110))
+>im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 4, 112))
 >c_private : Symbol(im_public_mi_public.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts, 2, 20))
 
 var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
 >privateUse_im_public_mi_public : Symbol(privateUse_im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 13, 3), Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 15, 3))
 >im_public_mi_public.c_private : Symbol(im_public_mi_public.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts, 2, 20))
->im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 4, 110))
+>im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 4, 112))
 >c_private : Symbol(im_public_mi_public.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts, 2, 20))
 
 export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
 >publicUse_im_public_mi_public : Symbol(publicUse_im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 14, 10), Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 16, 10))
 >im_public_mi_public.c_private : Symbol(im_public_mi_public.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts, 2, 20))
->im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 4, 110))
+>im_public_mi_public : Symbol(im_public_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_core.ts, 4, 112))
 >c_private : Symbol(im_public_mi_public.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts, 2, 20))
 
 === tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require.ts ===
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
index b6d3d2967dc..5c082bef5de 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
@@ -2,10 +2,10 @@
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
-export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
+export import im_public_mi_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require");
 >im_public_mi_private : typeof im_public_mi_private
 
-export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
+export import im_public_mu_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require1");
 >im_public_mu_private : typeof im_public_mu_private
 
 export import im_public_mi_public = require("m");
diff --git a/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt b/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
index 7094bc6699f..d02593feff9 100644
--- a/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
+++ b/tests/baselines/reference/requireOfAnEmptyFile1.errors.txt
@@ -4,8 +4,8 @@ tests/cases/compiler/requireOfAnEmptyFile1_a.ts(3,21): error TS2306: File 'tests
 ==== tests/cases/compiler/requireOfAnEmptyFile1_a.ts (1 errors) ====
     //requireOfAnEmptyFile1
     
-    import fs = require('requireOfAnEmptyFile1_b');
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~
+    import fs = require('./requireOfAnEmptyFile1_b');
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2306: File 'requireOfAnEmptyFile1_b.ts' is not a module.
     
 ==== tests/cases/compiler/requireOfAnEmptyFile1_b.ts (0 errors) ====
diff --git a/tests/baselines/reference/requireOfAnEmptyFile1.js b/tests/baselines/reference/requireOfAnEmptyFile1.js
index 779bc887140..b2079afa6ef 100644
--- a/tests/baselines/reference/requireOfAnEmptyFile1.js
+++ b/tests/baselines/reference/requireOfAnEmptyFile1.js
@@ -3,7 +3,7 @@
 //// [requireOfAnEmptyFile1_a.ts]
 //requireOfAnEmptyFile1
 
-import fs = require('requireOfAnEmptyFile1_b');
+import fs = require('./requireOfAnEmptyFile1_b');
 
 //// [requireOfAnEmptyFile1_b.ts]
 
diff --git a/tests/baselines/reference/reuseInnerModuleMember.js b/tests/baselines/reference/reuseInnerModuleMember.js
index 8999ccea633..a15ec5e39a2 100644
--- a/tests/baselines/reference/reuseInnerModuleMember.js
+++ b/tests/baselines/reference/reuseInnerModuleMember.js
@@ -9,7 +9,7 @@ declare module bar {
     interface alpha { }
 }
 
-import f = require('reuseInnerModuleMember_0');
+import f = require('./reuseInnerModuleMember_0');
 module bar {
     var x: alpha;
 }
diff --git a/tests/baselines/reference/reuseInnerModuleMember.symbols b/tests/baselines/reference/reuseInnerModuleMember.symbols
index 27301f1256b..5dbd830293f 100644
--- a/tests/baselines/reference/reuseInnerModuleMember.symbols
+++ b/tests/baselines/reference/reuseInnerModuleMember.symbols
@@ -1,17 +1,17 @@
 === tests/cases/compiler/reuseInnerModuleMember_1.ts ===
 ///<reference path='reuseInnerModuleMember_0.ts'/>
 declare module bar {
->bar : Symbol(bar, Decl(reuseInnerModuleMember_1.ts, 0, 0), Decl(reuseInnerModuleMember_1.ts, 5, 47))
+>bar : Symbol(bar, Decl(reuseInnerModuleMember_1.ts, 0, 0), Decl(reuseInnerModuleMember_1.ts, 5, 49))
 
     interface alpha { }
 >alpha : Symbol(alpha, Decl(reuseInnerModuleMember_1.ts, 1, 20))
 }
 
-import f = require('reuseInnerModuleMember_0');
+import f = require('./reuseInnerModuleMember_0');
 >f : Symbol(f, Decl(reuseInnerModuleMember_1.ts, 3, 1))
 
 module bar {
->bar : Symbol(bar, Decl(reuseInnerModuleMember_1.ts, 0, 0), Decl(reuseInnerModuleMember_1.ts, 5, 47))
+>bar : Symbol(bar, Decl(reuseInnerModuleMember_1.ts, 0, 0), Decl(reuseInnerModuleMember_1.ts, 5, 49))
 
     var x: alpha;
 >x : Symbol(x, Decl(reuseInnerModuleMember_1.ts, 7, 7))
diff --git a/tests/baselines/reference/reuseInnerModuleMember.types b/tests/baselines/reference/reuseInnerModuleMember.types
index d42e071e16b..433da749b49 100644
--- a/tests/baselines/reference/reuseInnerModuleMember.types
+++ b/tests/baselines/reference/reuseInnerModuleMember.types
@@ -7,7 +7,7 @@ declare module bar {
 >alpha : alpha
 }
 
-import f = require('reuseInnerModuleMember_0');
+import f = require('./reuseInnerModuleMember_0');
 >f : typeof f
 
 module bar {
diff --git a/tests/baselines/reference/staticInstanceResolution3.js b/tests/baselines/reference/staticInstanceResolution3.js
index 92a4e6522c7..0a41cd77909 100644
--- a/tests/baselines/reference/staticInstanceResolution3.js
+++ b/tests/baselines/reference/staticInstanceResolution3.js
@@ -9,7 +9,7 @@ export class Promise {
 
 //// [staticInstanceResolution3_1.ts]
 ///<reference path='staticInstanceResolution3_0.ts'/>
-import WinJS = require('staticInstanceResolution3_0');
+import WinJS = require('./staticInstanceResolution3_0');
 WinJS.Promise.timeout(10);
 
 //// [staticInstanceResolution3_0.js]
@@ -24,5 +24,5 @@ var Promise = (function () {
 exports.Promise = Promise;
 //// [staticInstanceResolution3_1.js]
 ///<reference path='staticInstanceResolution3_0.ts'/>
-var WinJS = require('staticInstanceResolution3_0');
+var WinJS = require('./staticInstanceResolution3_0');
 WinJS.Promise.timeout(10);
diff --git a/tests/baselines/reference/staticInstanceResolution3.symbols b/tests/baselines/reference/staticInstanceResolution3.symbols
index 8d4fecbaab2..f1afeecd34e 100644
--- a/tests/baselines/reference/staticInstanceResolution3.symbols
+++ b/tests/baselines/reference/staticInstanceResolution3.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/staticInstanceResolution3_1.ts ===
 ///<reference path='staticInstanceResolution3_0.ts'/>
-import WinJS = require('staticInstanceResolution3_0');
+import WinJS = require('./staticInstanceResolution3_0');
 >WinJS : Symbol(WinJS, Decl(staticInstanceResolution3_1.ts, 0, 0))
 
 WinJS.Promise.timeout(10);
diff --git a/tests/baselines/reference/staticInstanceResolution3.types b/tests/baselines/reference/staticInstanceResolution3.types
index ef5c1cc5166..fe50c659f6d 100644
--- a/tests/baselines/reference/staticInstanceResolution3.types
+++ b/tests/baselines/reference/staticInstanceResolution3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/staticInstanceResolution3_1.ts ===
 ///<reference path='staticInstanceResolution3_0.ts'/>
-import WinJS = require('staticInstanceResolution3_0');
+import WinJS = require('./staticInstanceResolution3_0');
 >WinJS : typeof WinJS
 
 WinJS.Promise.timeout(10);
diff --git a/tests/baselines/reference/topLevelFileModule.js b/tests/baselines/reference/topLevelFileModule.js
index 5d655f78397..a6e7a151eb9 100644
--- a/tests/baselines/reference/topLevelFileModule.js
+++ b/tests/baselines/reference/topLevelFileModule.js
@@ -7,13 +7,13 @@ export var x: number;
 export declare var y: number;
 
 //// [foo_1.ts]
-import foo = require("vs/foo_0");
-import fum = require("vs/fum");
+import foo = require("./vs/foo_0");
+import fum = require("./vs/fum");
 var z = foo.x + fum.y;
 
 
 //// [foo_0.js]
 //// [foo_1.js]
-var foo = require("vs/foo_0");
-var fum = require("vs/fum");
+var foo = require("./vs/foo_0");
+var fum = require("./vs/fum");
 var z = foo.x + fum.y;
diff --git a/tests/baselines/reference/topLevelFileModule.symbols b/tests/baselines/reference/topLevelFileModule.symbols
index a677274ec07..d3961c0fa72 100644
--- a/tests/baselines/reference/topLevelFileModule.symbols
+++ b/tests/baselines/reference/topLevelFileModule.symbols
@@ -1,9 +1,9 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
-import foo = require("vs/foo_0");
+import foo = require("./vs/foo_0");
 >foo : Symbol(foo, Decl(foo_1.ts, 0, 0))
 
-import fum = require("vs/fum");
->fum : Symbol(fum, Decl(foo_1.ts, 0, 33))
+import fum = require("./vs/fum");
+>fum : Symbol(fum, Decl(foo_1.ts, 0, 35))
 
 var z = foo.x + fum.y;
 >z : Symbol(z, Decl(foo_1.ts, 2, 3))
@@ -11,7 +11,7 @@ var z = foo.x + fum.y;
 >foo : Symbol(foo, Decl(foo_1.ts, 0, 0))
 >x : Symbol(foo.x, Decl(foo_0.ts, 0, 10))
 >fum.y : Symbol(fum.y, Decl(fum.d.ts, 0, 18))
->fum : Symbol(fum, Decl(foo_1.ts, 0, 33))
+>fum : Symbol(fum, Decl(foo_1.ts, 0, 35))
 >y : Symbol(fum.y, Decl(fum.d.ts, 0, 18))
 
 === tests/cases/conformance/externalModules/vs/foo_0.ts ===
diff --git a/tests/baselines/reference/topLevelFileModule.types b/tests/baselines/reference/topLevelFileModule.types
index 033dbf197d3..2706fd75670 100644
--- a/tests/baselines/reference/topLevelFileModule.types
+++ b/tests/baselines/reference/topLevelFileModule.types
@@ -1,8 +1,8 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
-import foo = require("vs/foo_0");
+import foo = require("./vs/foo_0");
 >foo : typeof foo
 
-import fum = require("vs/fum");
+import fum = require("./vs/fum");
 >fum : typeof fum
 
 var z = foo.x + fum.y;
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
index b25ad480a9d..e75fa63c4b7 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.js
@@ -7,7 +7,7 @@ var classes = undefined;
 }
 
 //// [file2.ts]
-import f = require('file1');
+import f = require('./file1');
 f.foo();
 
 
@@ -18,7 +18,7 @@ function foo() {
 }
 exports.foo = foo;
 //// [file2.js]
-var f = require('file1');
+var f = require('./file1');
 f.foo();
 
 
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.symbols b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.symbols
index 2326ee5a8cd..4a4e4ef57da 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.symbols
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.symbols
@@ -1,5 +1,5 @@
 === tests/cases/compiler/file2.ts ===
-import f = require('file1');
+import f = require('./file1');
 >f : Symbol(f, Decl(file2.ts, 0, 0))
 
 f.foo();
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
index 23d2c3167d6..044de70c5cd 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/file2.ts ===
-import f = require('file1');
+import f = require('./file1');
 >f : typeof f
 
 f.foo();
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
index cde3247b7cd..9046972c895 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
@@ -7,8 +7,8 @@ tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2322: Type
 ==== tests/cases/compiler/typeofAmbientExternalModules_2.ts (2 errors) ====
     ///<reference path='typeofAmbientExternalModules_0.ts'/>
     ///<reference path='typeofAmbientExternalModules_1.ts'/>
-    import ext = require('typeofAmbientExternalModules_0');
-    import exp = require('typeofAmbientExternalModules_1');
+    import ext = require('./typeofAmbientExternalModules_0');
+    import exp = require('./typeofAmbientExternalModules_1');
     
     var y1: typeof ext = ext;
     y1 = exp;
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js
index 1bfd549fb04..66e6d7d45ea 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.js
+++ b/tests/baselines/reference/typeofAmbientExternalModules.js
@@ -10,8 +10,8 @@ export = D;
 //// [typeofAmbientExternalModules_2.ts]
 ///<reference path='typeofAmbientExternalModules_0.ts'/>
 ///<reference path='typeofAmbientExternalModules_1.ts'/>
-import ext = require('typeofAmbientExternalModules_0');
-import exp = require('typeofAmbientExternalModules_1');
+import ext = require('./typeofAmbientExternalModules_0');
+import exp = require('./typeofAmbientExternalModules_1');
 
 var y1: typeof ext = ext;
 y1 = exp;
@@ -35,8 +35,8 @@ module.exports = D;
 //// [typeofAmbientExternalModules_2.js]
 ///<reference path='typeofAmbientExternalModules_0.ts'/>
 ///<reference path='typeofAmbientExternalModules_1.ts'/>
-var ext = require('typeofAmbientExternalModules_0');
-var exp = require('typeofAmbientExternalModules_1');
+var ext = require('./typeofAmbientExternalModules_0');
+var exp = require('./typeofAmbientExternalModules_1');
 var y1 = ext;
 y1 = exp;
 var y2 = exp;
diff --git a/tests/baselines/reference/typeofExternalModules.errors.txt b/tests/baselines/reference/typeofExternalModules.errors.txt
index 05b56c9fe1b..0290a40c326 100644
--- a/tests/baselines/reference/typeofExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofExternalModules.errors.txt
@@ -5,8 +5,8 @@ tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2322: Type 'typ
 
 
 ==== tests/cases/compiler/typeofExternalModules_core.ts (2 errors) ====
-    import ext = require('typeofExternalModules_external');
-    import exp = require('typeofExternalModules_exportAssign');
+    import ext = require('./typeofExternalModules_external');
+    import exp = require('./typeofExternalModules_exportAssign');
     
     var y1: typeof ext = ext;
     y1 = exp;
diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js
index 8ffea8ca8ec..676f6f10b9f 100644
--- a/tests/baselines/reference/typeofExternalModules.js
+++ b/tests/baselines/reference/typeofExternalModules.js
@@ -8,8 +8,8 @@ class D { }
 export = D;
 
 //// [typeofExternalModules_core.ts]
-import ext = require('typeofExternalModules_external');
-import exp = require('typeofExternalModules_exportAssign');
+import ext = require('./typeofExternalModules_external');
+import exp = require('./typeofExternalModules_exportAssign');
 
 var y1: typeof ext = ext;
 y1 = exp;
@@ -31,8 +31,8 @@ var D = (function () {
 })();
 module.exports = D;
 //// [typeofExternalModules_core.js]
-var ext = require('typeofExternalModules_external');
-var exp = require('typeofExternalModules_exportAssign');
+var ext = require('./typeofExternalModules_external');
+var exp = require('./typeofExternalModules_exportAssign');
 var y1 = ext;
 y1 = exp;
 var y2 = exp;
diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js
index 54885f09e36..04e897c081a 100644
--- a/tests/baselines/reference/unusedImportDeclaration.js
+++ b/tests/baselines/reference/unusedImportDeclaration.js
@@ -7,7 +7,7 @@ class TesterB {
 export = TesterB;
 
 //// [unusedImportDeclaration_testerA.ts]
-import B = require("unusedImportDeclaration_testerB");
+import B = require("./unusedImportDeclaration_testerB");
 var thingy: B = {
     me: "A"
 };
diff --git a/tests/baselines/reference/unusedImportDeclaration.symbols b/tests/baselines/reference/unusedImportDeclaration.symbols
index 5506c4ad6b6..a298ba94631 100644
--- a/tests/baselines/reference/unusedImportDeclaration.symbols
+++ b/tests/baselines/reference/unusedImportDeclaration.symbols
@@ -1,5 +1,5 @@
 === tests/cases/compiler/unusedImportDeclaration_testerA.ts ===
-import B = require("unusedImportDeclaration_testerB");
+import B = require("./unusedImportDeclaration_testerB");
 >B : Symbol(B, Decl(unusedImportDeclaration_testerA.ts, 0, 0))
 
 var thingy: B = {
diff --git a/tests/baselines/reference/unusedImportDeclaration.types b/tests/baselines/reference/unusedImportDeclaration.types
index dcedf3fd350..c14338756da 100644
--- a/tests/baselines/reference/unusedImportDeclaration.types
+++ b/tests/baselines/reference/unusedImportDeclaration.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/unusedImportDeclaration_testerA.ts ===
-import B = require("unusedImportDeclaration_testerB");
+import B = require("./unusedImportDeclaration_testerB");
 >B : typeof B
 
 var thingy: B = {
diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
index e3f60cfa17b..660a4017a7f 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.js
@@ -3,8 +3,8 @@
 //// [visibilityOfCrossModuleTypeUsage_commands.ts]
 //visibilityOfCrossModuleTypeUsage
 
-import fs = require('visibilityOfCrossModuleTypeUsage_fs');
-import server = require('visibilityOfCrossModuleTypeUsage_server');
+import fs = require('./visibilityOfCrossModuleTypeUsage_fs');
+import server = require('./visibilityOfCrossModuleTypeUsage_server');
 
 export interface IConfiguration {
     workspace: server.IWorkspace;
@@ -20,7 +20,7 @@ export interface IWorkspace {
 }
 
 //// [visibilityOfCrossModuleTypeUsage_fs.ts]
-import commands = require('visibilityOfCrossModuleTypeUsage_commands');
+import commands = require('./visibilityOfCrossModuleTypeUsage_commands');
 function run(configuration: commands.IConfiguration) {
     var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
 }
diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.symbols b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.symbols
index 0fdd5c4fbe1..d1132151097 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.symbols
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/visibilityOfCrossModuleTypeUsage_fs.ts ===
-import commands = require('visibilityOfCrossModuleTypeUsage_commands');
+import commands = require('./visibilityOfCrossModuleTypeUsage_commands');
 >commands : Symbol(commands, Decl(visibilityOfCrossModuleTypeUsage_fs.ts, 0, 0))
 
 function run(configuration: commands.IConfiguration) {
->run : Symbol(run, Decl(visibilityOfCrossModuleTypeUsage_fs.ts, 0, 71))
+>run : Symbol(run, Decl(visibilityOfCrossModuleTypeUsage_fs.ts, 0, 73))
 >configuration : Symbol(configuration, Decl(visibilityOfCrossModuleTypeUsage_fs.ts, 1, 13))
 >commands : Symbol(commands, Decl(visibilityOfCrossModuleTypeUsage_fs.ts, 0, 0))
->IConfiguration : Symbol(commands.IConfiguration, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 3, 67))
+>IConfiguration : Symbol(commands.IConfiguration, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 3, 69))
 
     var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
 >absoluteWorkspacePath : Symbol(absoluteWorkspacePath, Decl(visibilityOfCrossModuleTypeUsage_fs.ts, 2, 7))
@@ -22,23 +22,23 @@ function run(configuration: commands.IConfiguration) {
 === tests/cases/compiler/visibilityOfCrossModuleTypeUsage_commands.ts ===
 //visibilityOfCrossModuleTypeUsage
 
-import fs = require('visibilityOfCrossModuleTypeUsage_fs');
+import fs = require('./visibilityOfCrossModuleTypeUsage_fs');
 >fs : Symbol(fs, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 0, 0))
 
-import server = require('visibilityOfCrossModuleTypeUsage_server');
->server : Symbol(server, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 2, 59))
+import server = require('./visibilityOfCrossModuleTypeUsage_server');
+>server : Symbol(server, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 2, 61))
 
 export interface IConfiguration {
->IConfiguration : Symbol(IConfiguration, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 3, 67))
+>IConfiguration : Symbol(IConfiguration, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 3, 69))
 
     workspace: server.IWorkspace;
 >workspace : Symbol(workspace, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 5, 33))
->server : Symbol(server, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 2, 59))
+>server : Symbol(server, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 2, 61))
 >IWorkspace : Symbol(server.IWorkspace, Decl(visibilityOfCrossModuleTypeUsage_server.ts, 1, 1))
 
     server?: server.IServer;
 >server : Symbol(server, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 6, 33))
->server : Symbol(server, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 2, 59))
+>server : Symbol(server, Decl(visibilityOfCrossModuleTypeUsage_commands.ts, 2, 61))
 >IServer : Symbol(server.IServer, Decl(visibilityOfCrossModuleTypeUsage_server.ts, 0, 0))
 }
 
diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
index 90cb54fe1e0..2ee7189a77c 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/visibilityOfCrossModuleTypeUsage_fs.ts ===
-import commands = require('visibilityOfCrossModuleTypeUsage_commands');
+import commands = require('./visibilityOfCrossModuleTypeUsage_commands');
 >commands : typeof commands
 
 function run(configuration: commands.IConfiguration) {
@@ -23,10 +23,10 @@ function run(configuration: commands.IConfiguration) {
 === tests/cases/compiler/visibilityOfCrossModuleTypeUsage_commands.ts ===
 //visibilityOfCrossModuleTypeUsage
 
-import fs = require('visibilityOfCrossModuleTypeUsage_fs');
+import fs = require('./visibilityOfCrossModuleTypeUsage_fs');
 >fs : typeof fs
 
-import server = require('visibilityOfCrossModuleTypeUsage_server');
+import server = require('./visibilityOfCrossModuleTypeUsage_server');
 >server : typeof server
 
 export interface IConfiguration {
diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.errors.txt b/tests/baselines/reference/voidAsNonAmbiguousReturnType.errors.txt
index aa61a114145..ce8b52f316c 100644
--- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.errors.txt
+++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.errors.txt
@@ -3,7 +3,7 @@ tests/cases/compiler/voidAsNonAmbiguousReturnType_0.ts(1,17): error TS2394: Over
 
 ==== tests/cases/compiler/voidAsNonAmbiguousReturnType_1.ts (0 errors) ====
     ///<reference path='voidAsNonAmbiguousReturnType_0.ts'/>
-    import fs = require("voidAsNonAmbiguousReturnType_0");
+    import fs = require("./voidAsNonAmbiguousReturnType_0");
     
     function main() {
      fs.mkdirSync('test'); // should not error - return types are the same
diff --git a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
index 713c4ffe47b..0ab15304493 100644
--- a/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
+++ b/tests/baselines/reference/voidAsNonAmbiguousReturnType.js
@@ -6,7 +6,7 @@ export function mkdirSync(path: string, mode?: string): void {}
 
 //// [voidAsNonAmbiguousReturnType_1.ts]
 ///<reference path='voidAsNonAmbiguousReturnType_0.ts'/>
-import fs = require("voidAsNonAmbiguousReturnType_0");
+import fs = require("./voidAsNonAmbiguousReturnType_0");
 
 function main() {
  fs.mkdirSync('test'); // should not error - return types are the same
@@ -18,7 +18,7 @@ function mkdirSync(path, mode) { }
 exports.mkdirSync = mkdirSync;
 //// [voidAsNonAmbiguousReturnType_1.js]
 ///<reference path='voidAsNonAmbiguousReturnType_0.ts'/>
-var fs = require("voidAsNonAmbiguousReturnType_0");
+var fs = require("./voidAsNonAmbiguousReturnType_0");
 function main() {
     fs.mkdirSync('test'); // should not error - return types are the same
 }
diff --git a/tests/cases/compiler/aliasAssignments.ts b/tests/cases/compiler/aliasAssignments.ts
index 4a83ee80da7..6a7ed9a9974 100644
--- a/tests/cases/compiler/aliasAssignments.ts
+++ b/tests/cases/compiler/aliasAssignments.ts
@@ -5,7 +5,7 @@ export class someClass {
 }
 
 // @Filename: aliasAssignments_1.ts
-import moduleA = require("aliasAssignments_moduleA");
+import moduleA = require("./aliasAssignments_moduleA");
 var x = moduleA;
 x = 1; // Should be error
 var y = 1;
diff --git a/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts b/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts
index 2aeddbad947..c6d1b1480c0 100644
--- a/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts
+++ b/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @target: ES5
 // @Filename: aliasUsage1_backbone.ts
 export class Model {
@@ -6,14 +6,14 @@ export class Model {
 }
 
 // @Filename: aliasUsage1_moduleA.ts
-import Backbone = require("aliasUsage1_backbone");
+import Backbone = require("./aliasUsage1_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 // @Filename: aliasUsage1_main.ts
-import Backbone = require("aliasUsage1_backbone");
-import moduleA = require("aliasUsage1_moduleA");
+import Backbone = require("./aliasUsage1_backbone");
+import moduleA = require("./aliasUsage1_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
diff --git a/tests/cases/compiler/aliasUsageInArray.ts b/tests/cases/compiler/aliasUsageInArray.ts
index 9c2e4e64e48..7f71b00e72a 100644
--- a/tests/cases/compiler/aliasUsageInArray.ts
+++ b/tests/cases/compiler/aliasUsageInArray.ts
@@ -5,14 +5,14 @@ export class Model {
 }
 
 // @Filename: aliasUsageInArray_moduleA.ts
-import Backbone = require("aliasUsageInArray_backbone");
+import Backbone = require("./aliasUsageInArray_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 // @Filename: aliasUsageInArray_main.ts
-import Backbone = require("aliasUsageInArray_backbone");
-import moduleA = require("aliasUsageInArray_moduleA");
+import Backbone = require("./aliasUsageInArray_backbone");
+import moduleA = require("./aliasUsageInArray_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
diff --git a/tests/cases/compiler/aliasUsageInFunctionExpression.ts b/tests/cases/compiler/aliasUsageInFunctionExpression.ts
index 47b377c5b28..4c9a91b713b 100644
--- a/tests/cases/compiler/aliasUsageInFunctionExpression.ts
+++ b/tests/cases/compiler/aliasUsageInFunctionExpression.ts
@@ -1,18 +1,18 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: aliasUsageInFunctionExpression_backbone.ts
 export class Model {
     public someData: string;
 }
 
 // @Filename: aliasUsageInFunctionExpression_moduleA.ts
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 // @Filename: aliasUsageInFunctionExpression_main.ts
-import Backbone = require("aliasUsageInFunctionExpression_backbone");
-import moduleA = require("aliasUsageInFunctionExpression_moduleA");
+import Backbone = require("./aliasUsageInFunctionExpression_backbone");
+import moduleA = require("./aliasUsageInFunctionExpression_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
diff --git a/tests/cases/compiler/aliasUsageInGenericFunction.ts b/tests/cases/compiler/aliasUsageInGenericFunction.ts
index d9966dbd299..f153195009c 100644
--- a/tests/cases/compiler/aliasUsageInGenericFunction.ts
+++ b/tests/cases/compiler/aliasUsageInGenericFunction.ts
@@ -1,18 +1,18 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: aliasUsageInGenericFunction_backbone.ts
 export class Model {
     public someData: string;
 }
 
 // @Filename: aliasUsageInGenericFunction_moduleA.ts
-import Backbone = require("aliasUsageInGenericFunction_backbone");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 // @Filename: aliasUsageInGenericFunction_main.ts
-import Backbone = require("aliasUsageInGenericFunction_backbone");
-import moduleA = require("aliasUsageInGenericFunction_moduleA");
+import Backbone = require("./aliasUsageInGenericFunction_backbone");
+import moduleA = require("./aliasUsageInGenericFunction_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
diff --git a/tests/cases/compiler/aliasUsageInIndexerOfClass.ts b/tests/cases/compiler/aliasUsageInIndexerOfClass.ts
index a6df86fbc99..a9aca7d2970 100644
--- a/tests/cases/compiler/aliasUsageInIndexerOfClass.ts
+++ b/tests/cases/compiler/aliasUsageInIndexerOfClass.ts
@@ -1,18 +1,18 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: aliasUsageInIndexerOfClass_backbone.ts
 export class Model {
     public someData: string;
 }
 
 // @Filename: aliasUsageInIndexerOfClass_moduleA.ts
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 // @Filename: aliasUsageInIndexerOfClass_main.ts
-import Backbone = require("aliasUsageInIndexerOfClass_backbone");
-import moduleA = require("aliasUsageInIndexerOfClass_moduleA");
+import Backbone = require("./aliasUsageInIndexerOfClass_backbone");
+import moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
diff --git a/tests/cases/compiler/aliasUsageInObjectLiteral.ts b/tests/cases/compiler/aliasUsageInObjectLiteral.ts
index a9d2017d50c..e16d5552fe6 100644
--- a/tests/cases/compiler/aliasUsageInObjectLiteral.ts
+++ b/tests/cases/compiler/aliasUsageInObjectLiteral.ts
@@ -1,18 +1,18 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: aliasUsageInObjectLiteral_backbone.ts
 export class Model {
     public someData: string;
 }
 
 // @Filename: aliasUsageInObjectLiteral_moduleA.ts
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 // @Filename: aliasUsageInObjectLiteral_main.ts
-import Backbone = require("aliasUsageInObjectLiteral_backbone");
-import moduleA = require("aliasUsageInObjectLiteral_moduleA");
+import Backbone = require("./aliasUsageInObjectLiteral_backbone");
+import moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
diff --git a/tests/cases/compiler/aliasUsageInOrExpression.ts b/tests/cases/compiler/aliasUsageInOrExpression.ts
index e7ddd4014f0..540a3ae91c0 100644
--- a/tests/cases/compiler/aliasUsageInOrExpression.ts
+++ b/tests/cases/compiler/aliasUsageInOrExpression.ts
@@ -1,18 +1,18 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: aliasUsageInOrExpression_backbone.ts
 export class Model {
     public someData: string;
 }
 
 // @Filename: aliasUsageInOrExpression_moduleA.ts
-import Backbone = require("aliasUsageInOrExpression_backbone");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 // @Filename: aliasUsageInOrExpression_main.ts
-import Backbone = require("aliasUsageInOrExpression_backbone");
-import moduleA = require("aliasUsageInOrExpression_moduleA");
+import Backbone = require("./aliasUsageInOrExpression_backbone");
+import moduleA = require("./aliasUsageInOrExpression_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
diff --git a/tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause.ts b/tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause.ts
index 548963ff123..c09c715ed3a 100644
--- a/tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause.ts
+++ b/tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause.ts
@@ -1,18 +1,18 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: aliasUsageInTypeArgumentOfExtendsClause_backbone.ts
 export class Model {
     public someData: string;
 }
 
 // @Filename: aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 // @Filename: aliasUsageInTypeArgumentOfExtendsClause_main.ts
-import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
-import moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
+import Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
+import moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
diff --git a/tests/cases/compiler/aliasUsageInVarAssignment.ts b/tests/cases/compiler/aliasUsageInVarAssignment.ts
index 1644c825a4d..ed14d4241f5 100644
--- a/tests/cases/compiler/aliasUsageInVarAssignment.ts
+++ b/tests/cases/compiler/aliasUsageInVarAssignment.ts
@@ -1,18 +1,18 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: aliasUsageInVarAssignment_backbone.ts
 export class Model {
     public someData: string;
 }
 
 // @Filename: aliasUsageInVarAssignment_moduleA.ts
-import Backbone = require("aliasUsageInVarAssignment_backbone");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 // @Filename: aliasUsageInVarAssignment_main.ts
-import Backbone = require("aliasUsageInVarAssignment_backbone");
-import moduleA = require("aliasUsageInVarAssignment_moduleA");
+import Backbone = require("./aliasUsageInVarAssignment_backbone");
+import moduleA = require("./aliasUsageInVarAssignment_moduleA");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
diff --git a/tests/cases/compiler/aliasUsedAsNameValue.ts b/tests/cases/compiler/aliasUsedAsNameValue.ts
index 20b60b53d1e..2426399252b 100644
--- a/tests/cases/compiler/aliasUsedAsNameValue.ts
+++ b/tests/cases/compiler/aliasUsedAsNameValue.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: aliasUsedAsNameValue_0.ts
 export var id: number;
 
@@ -8,8 +8,8 @@ export function b(a: any): any { return null; }
 // @Filename: aliasUsedAsNameValue_2.ts
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
-import mod = require("aliasUsedAsNameValue_0");
-import b = require("aliasUsedAsNameValue_1");
+import mod = require("./aliasUsedAsNameValue_0");
+import b = require("./aliasUsedAsNameValue_1");
  
 export var a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
diff --git a/tests/cases/compiler/aliasWithInterfaceExportAssignmentUsedInVarInitializer.ts b/tests/cases/compiler/aliasWithInterfaceExportAssignmentUsedInVarInitializer.ts
index f4d818d9562..37a6c42caee 100644
--- a/tests/cases/compiler/aliasWithInterfaceExportAssignmentUsedInVarInitializer.ts
+++ b/tests/cases/compiler/aliasWithInterfaceExportAssignmentUsedInVarInitializer.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: aliasWithInterfaceExportAssignmentUsedInVarInitializer_0.ts
 interface c {
     q3: number;
@@ -6,5 +6,5 @@ interface c {
 export = c;
 
 // @Filename: aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.ts
-import moduleA = require("aliasWithInterfaceExportAssignmentUsedInVarInitializer_0");
+import moduleA = require("./aliasWithInterfaceExportAssignmentUsedInVarInitializer_0");
 var d = b.q3;
\ No newline at end of file
diff --git a/tests/cases/compiler/arrayOfExportedClass.ts b/tests/cases/compiler/arrayOfExportedClass.ts
index 020be79408c..794a83fbd83 100644
--- a/tests/cases/compiler/arrayOfExportedClass.ts
+++ b/tests/cases/compiler/arrayOfExportedClass.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: arrayOfExportedClass_0.ts
 class Car {
     foo: string;
@@ -8,7 +8,7 @@ export = Car;
 
 // @Filename: arrayOfExportedClass_1.ts
 ///<reference path='arrayOfExportedClass_0.ts'/>
-import Car = require('arrayOfExportedClass_0');
+import Car = require('./arrayOfExportedClass_0');
 
 class Road {
 
diff --git a/tests/cases/compiler/chainedImportAlias.ts b/tests/cases/compiler/chainedImportAlias.ts
index 97bf28bf4a5..5b91c58f4bc 100644
--- a/tests/cases/compiler/chainedImportAlias.ts
+++ b/tests/cases/compiler/chainedImportAlias.ts
@@ -1,10 +1,10 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: chainedImportAlias_file0.ts
 export module m {
     export function foo() { }
 }
 
 // @Filename: chainedImportAlias_file1.ts 
-import x = require('chainedImportAlias_file0');
+import x = require('./chainedImportAlias_file0');
 import y = x;
 y.m.foo();
diff --git a/tests/cases/compiler/commentsExternalModules3.ts b/tests/cases/compiler/commentsExternalModules3.ts
index e6979939ac8..a59458893ca 100644
--- a/tests/cases/compiler/commentsExternalModules3.ts
+++ b/tests/cases/compiler/commentsExternalModules3.ts
@@ -56,7 +56,7 @@ var myvar2 = new m4.m2.c();
 
 // @Filename: commentsExternalModules_1.ts
 /**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0"); // trailing comment 1
+import extMod = require("./commentsExternalModules2_0"); // trailing comment 1
 extMod.m1.fooExport();
 export var newVar = new extMod.m1.m2.c();
 extMod.m4.fooExport();
diff --git a/tests/cases/compiler/declFileAliasUseBeforeDeclaration.ts b/tests/cases/compiler/declFileAliasUseBeforeDeclaration.ts
index c803f65cf7c..63cd2761a9e 100644
--- a/tests/cases/compiler/declFileAliasUseBeforeDeclaration.ts
+++ b/tests/cases/compiler/declFileAliasUseBeforeDeclaration.ts
@@ -1,9 +1,9 @@
-//@module: commonjs
-//@declaration: true
+// @module: commonjs
+// @declaration: true
 
 // @Filename: declFileAliasUseBeforeDeclaration_foo.ts
 export class Foo { }
 
 // @Filename: declFileAliasUseBeforeDeclaration_test.ts
 export function bar(a: foo.Foo) { }
-import foo = require("declFileAliasUseBeforeDeclaration_foo");
\ No newline at end of file
+import foo = require("./declFileAliasUseBeforeDeclaration_foo");
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileForExportedImport.ts b/tests/cases/compiler/declFileForExportedImport.ts
index ec286c2711e..8809d0baa37 100644
--- a/tests/cases/compiler/declFileForExportedImport.ts
+++ b/tests/cases/compiler/declFileForExportedImport.ts
@@ -5,7 +5,7 @@ export var x: number;
 
 // @Filename: declFileForExportedImport_1.ts
 ///<reference path='declFileForExportedImport_0.ts'/>
-export import a = require('declFileForExportedImport_0');
+export import a = require('./declFileForExportedImport_0');
 var y = a.x;
 
 export import b = a;
diff --git a/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts b/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts
index 3e00557eec5..3a619905768 100644
--- a/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts
+++ b/tests/cases/compiler/declFileImportModuleWithExportAssignment.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @declaration: true
 
 // @Filename: declFileImportModuleWithExportAssignment_0.ts
@@ -21,6 +21,6 @@ export = m2;
 
 // @Filename: declFileImportModuleWithExportAssignment_1.ts
 /**This is on import declaration*/
-import a1 = require("declFileImportModuleWithExportAssignment_0");
+import a1 = require("./declFileImportModuleWithExportAssignment_0");
 export var a = a1;
 a.test1(null, null, null);
diff --git a/tests/cases/compiler/declarationEmit_exportAssignment.ts b/tests/cases/compiler/declarationEmit_exportAssignment.ts
index 166f4abe8e7..bf9e443c85a 100644
--- a/tests/cases/compiler/declarationEmit_exportAssignment.ts
+++ b/tests/cases/compiler/declarationEmit_exportAssignment.ts
@@ -8,5 +8,5 @@ export function bar() { }
 export interface Buzz { }
 
 // @filename: index.ts
-import {foo} from "utils";
+import {foo} from "./utils";
 export = foo;
\ No newline at end of file
diff --git a/tests/cases/compiler/declarationEmit_exportDeclaration.ts b/tests/cases/compiler/declarationEmit_exportDeclaration.ts
index a9e0bda761f..c7cff923b08 100644
--- a/tests/cases/compiler/declarationEmit_exportDeclaration.ts
+++ b/tests/cases/compiler/declarationEmit_exportDeclaration.ts
@@ -8,7 +8,7 @@ export function bar() { }
 export interface Buzz { }
 
 // @filename: index.ts
-import {foo, bar, Buzz} from "utils";
+import {foo, bar, Buzz} from "./utils";
 
 foo();
 let obj: Buzz;
diff --git a/tests/cases/compiler/declarationEmit_nameConflicts.ts b/tests/cases/compiler/declarationEmit_nameConflicts.ts
index 66eb732ddae..a30f4b2ff1b 100644
--- a/tests/cases/compiler/declarationEmit_nameConflicts.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflicts.ts
@@ -5,7 +5,7 @@ module f { export class c { } }
 export = f;
 
 // @Filename: declarationEmit_nameConflicts_0.ts
-import im = require('declarationEmit_nameConflicts_1');
+import im = require('./declarationEmit_nameConflicts_1');
 export module M {
     export function f() { }
     export class C { }
diff --git a/tests/cases/compiler/elidingImportNames.ts b/tests/cases/compiler/elidingImportNames.ts
index b5893461664..f9cbf457d53 100644
--- a/tests/cases/compiler/elidingImportNames.ts
+++ b/tests/cases/compiler/elidingImportNames.ts
@@ -1,10 +1,10 @@
 // @module: commonjs
 
 // @Filename: elidingImportNames_test.ts
-import a = require('elidingImportNames_main'); // alias used in typeof
+import a = require('./elidingImportNames_main'); // alias used in typeof
 var b = a;
 var x: typeof a;
-import a2 = require('elidingImportNames_main1'); // alias not used in typeof
+import a2 = require('./elidingImportNames_main1'); // alias not used in typeof
 var b2 = a2;
 
 
diff --git a/tests/cases/compiler/enumFromExternalModule.ts b/tests/cases/compiler/enumFromExternalModule.ts
index 3047dd52db3..2e943caf413 100644
--- a/tests/cases/compiler/enumFromExternalModule.ts
+++ b/tests/cases/compiler/enumFromExternalModule.ts
@@ -1,9 +1,9 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: enumFromExternalModule_0.ts
 export enum Mode { Open }
 
 // @Filename: enumFromExternalModule_1.ts
 ///<reference path='enumFromExternalModule_0.ts'/>
-import f = require('enumFromExternalModule_0');
+import f = require('./enumFromExternalModule_0');
 
 var x = f.Mode.Open;
diff --git a/tests/cases/compiler/errorsOnImportedSymbol.ts b/tests/cases/compiler/errorsOnImportedSymbol.ts
index 17f3e5fb92c..b3da9da162e 100644
--- a/tests/cases/compiler/errorsOnImportedSymbol.ts
+++ b/tests/cases/compiler/errorsOnImportedSymbol.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @target: ES5
 
 // @Filename: errorsOnImportedSymbol_0.ts
@@ -9,7 +9,7 @@ interface Sammy {
 export = Sammy;
 
 // @Filename: errorsOnImportedSymbol_1.ts
-import Sammy = require("errorsOnImportedSymbol_0");
+import Sammy = require("./errorsOnImportedSymbol_0");
 var x = new Sammy.Sammy();
 var y = Sammy.Sammy(); 
-
+
diff --git a/tests/cases/compiler/es6ExportAllInEs5.ts b/tests/cases/compiler/es6ExportAllInEs5.ts
index ed754e5cacb..3ee95e1a217 100644
--- a/tests/cases/compiler/es6ExportAllInEs5.ts
+++ b/tests/cases/compiler/es6ExportAllInEs5.ts
@@ -15,4 +15,4 @@ export module uninstantiated {
 }
 
 // @filename: client.ts
-export * from "server";
\ No newline at end of file
+export * from "./server";
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts
index 6361c013367..24dbc77e98f 100644
--- a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts
+++ b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifierInEs5.ts
@@ -15,8 +15,8 @@ export module uninstantiated {
 }
 
 // @filename: client.ts
-export { c } from "server";
-export { c as c2 } from "server";
-export { i, m as instantiatedModule } from "server";
-export { uninstantiated } from "server";
-export { x } from "server";
\ No newline at end of file
+export { c } from "./server";
+export { c as c2 } from "./server";
+export { i, m as instantiatedModule } from "./server";
+export { uninstantiated } from "./server";
+export { x } from "./server";
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBindingDts.ts b/tests/cases/compiler/es6ImportDefaultBindingDts.ts
index 8b8a9787fdd..b4b82768691 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingDts.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingDts.ts
@@ -7,6 +7,6 @@ class c { }
 export default c;
 
 // @filename: client.ts
-import defaultBinding from "server";
+import defaultBinding from "./server";
 export var x = new defaultBinding();
-import defaultBinding2 from "server"; // elide this import since defaultBinding2 is not used
+import defaultBinding2 from "./server"; // elide this import since defaultBinding2 is not used
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts
index 9a6e1a8ebf5..cb84036af5e 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts
@@ -9,15 +9,15 @@ export var m = a;
 export default {};
 
 // @filename: es6ImportDefaultBindingFollowedWithNamedImport_1.ts
-import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
-import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1: number = a;
-import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1: number = b;
-import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1: number = x;
 var x1: number = y;
-import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1: number = z;
-import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport_0";
+import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport_0";
 var x1: number = m;
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.ts
index d5c9a6a395d..fc13b26e737 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.ts
@@ -7,15 +7,15 @@ var a = 10;
 export default a;
 
 // @filename: es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.ts
-import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding1;
-import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding2;
-import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding3;
-import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding4;
-import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding5;
-import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
+import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0";
 var x: number = defaultBinding6;
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.ts
index 23ec8767d94..ca2b0561433 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.ts
@@ -7,15 +7,15 @@ var a = 10;
 export default a;
 
 // @filename: client.ts
-export import defaultBinding1, { } from "server";
+export import defaultBinding1, { } from "./server";
 export var x1: number = defaultBinding1;
-export import defaultBinding2, { a } from "server";
+export import defaultBinding2, { a } from "./server";
 export var x1: number = defaultBinding2;
-export import defaultBinding3, { a as b } from "server";
+export import defaultBinding3, { a as b } from "./server";
 export var x1: number = defaultBinding3;
-export import defaultBinding4, { x, a as y } from "server";
+export import defaultBinding4, { x, a as y } from "./server";
 export var x1: number = defaultBinding4;
-export import defaultBinding5, { x as z,  } from "server";
+export import defaultBinding5, { x as z,  } from "./server";
 export var x1: number = defaultBinding5;
-export import defaultBinding6, { m,  } from "server";
+export import defaultBinding6, { m,  } from "./server";
 export var x1: number = defaultBinding6;
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts
index a84dab94033..87782d66aff 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts
@@ -10,15 +10,15 @@ export class a12 { }
 export class x11 { }
 
 // @filename: client.ts
-import defaultBinding1, { } from "server";
-import defaultBinding2, { a } from "server";
+import defaultBinding1, { } from "./server";
+import defaultBinding2, { a } from "./server";
 export var x1 = new a();
-import defaultBinding3, { a11 as b } from "server";
+import defaultBinding3, { a11 as b } from "./server";
 export var x2 = new b();
-import defaultBinding4, { x, a12 as y } from "server";
+import defaultBinding4, { x, a12 as y } from "./server";
 export var x4 = new x();
 export var x5 = new y();
-import defaultBinding5, { x11 as z,  } from "server";
+import defaultBinding5, { x11 as z,  } from "./server";
 export var x3 = new z();
-import defaultBinding6, { m,  } from "server";
+import defaultBinding6, { m,  } from "./server";
 export var x6 = new m();
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.ts
index 7940f211ec7..64e771bebd1 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.ts
@@ -7,15 +7,15 @@ class a { }
 export default a;
 
 // @filename: client.ts
-import defaultBinding1, { } from "server";
+import defaultBinding1, { } from "./server";
 export var x1 = new defaultBinding1();
-import defaultBinding2, { a } from "server";
+import defaultBinding2, { a } from "./server";
 export var x2 = new defaultBinding2();
-import defaultBinding3, { a as b } from "server";
+import defaultBinding3, { a as b } from "./server";
 export var x3 = new defaultBinding3();
-import defaultBinding4, { x, a as y } from "server";
+import defaultBinding4, { x, a as y } from "./server";
 export var x4 = new defaultBinding4();
-import defaultBinding5, { x as z,  } from "server";
+import defaultBinding5, { x as z,  } from "./server";
 export var x5 = new defaultBinding5();
-import defaultBinding6, { m,  } from "server";
+import defaultBinding6, { m,  } from "./server";
 export var x6 = new defaultBinding6();
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5.ts
index 6e42898d1bc..9a7902d66a0 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportInEs5.ts
@@ -8,15 +8,15 @@ export var x = a;
 export var m = a;
 
 // @filename: es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.ts
-import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
-import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
 var x1: number = a;
-import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
 var x1: number = b;
-import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
 var x1: number = x;
 var x1: number = y;
-import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding5, { x as z,  } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
 var x1: number = z;
-import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
+import defaultBinding6, { m,  } from "./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0";
 var x1: number = m;
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.ts
index 6195b279f72..133abf147cb 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.ts
@@ -7,5 +7,5 @@ var a = 10;
 export default a;
 
 // @filename: es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts
-import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
+import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
 var x: number = defaultBinding;
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.ts
index 732f7ef7ba0..c9bb1a6dd10 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.ts
@@ -5,5 +5,5 @@
 export class a { }
 
 // @filename: client.ts
-import defaultBinding, * as nameSpaceBinding  from "server";
+import defaultBinding, * as nameSpaceBinding  from "./server";
 export var x = new nameSpaceBinding.a();
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.ts
index c58ba286e0a..cdc1590ec8f 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.ts
@@ -6,5 +6,5 @@
 export var a = 10;
 
 // @filename: es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.ts
-import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
+import defaultBinding, * as nameSpaceBinding  from "./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0";
 var x: number = nameSpaceBinding.a;
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.ts b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.ts
index cafcace08a0..768386f67f6 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.ts
@@ -5,5 +5,5 @@
 export var a = 10;
 
 // @filename: client.ts
-export import defaultBinding, * as nameSpaceBinding  from "server";
+export import defaultBinding, * as nameSpaceBinding  from "./server";
 export var x: number = nameSpaceBinding.a;
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBindingInEs5.ts b/tests/cases/compiler/es6ImportDefaultBindingInEs5.ts
index e0877bd74c1..261c1b6079c 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingInEs5.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingInEs5.ts
@@ -7,4 +7,4 @@ var a = 10;
 export = a;
 
 // @filename: es6ImportDefaultBindingInEs5_1.ts
-import defaultBinding from "es6ImportDefaultBindingInEs5_0";
\ No newline at end of file
+import defaultBinding from "./es6ImportDefaultBindingInEs5_0";
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts b/tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts
index 1d87fde5784..3d637abd798 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts
@@ -6,11 +6,11 @@ var a = 10;
 export default a;
 
 // @filename: es6ImportDefaultBindingMergeErrors_1.ts
-import defaultBinding from "es6ImportDefaultBindingMergeErrors_0";
+import defaultBinding from "./es6ImportDefaultBindingMergeErrors_0";
 interface defaultBinding { // This is ok
 }
 var x = defaultBinding;
-import defaultBinding2 from "es6ImportDefaultBindingMergeErrors_0"; // Should be error
+import defaultBinding2 from "./es6ImportDefaultBindingMergeErrors_0"; // Should be error
 var defaultBinding2 = "hello world"; 
-import defaultBinding3 from "es6ImportDefaultBindingMergeErrors_0"; // Should be error
-import defaultBinding3 from "es6ImportDefaultBindingMergeErrors_0"; // SHould be error
+import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // Should be error
+import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould be error
diff --git a/tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts b/tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts
index 5ab1c743721..74b2abfa83c 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts
@@ -4,4 +4,4 @@
 export var a = 10;
 
 // @filename: es6ImportDefaultBindingNoDefaultProperty_1.ts
-import defaultBinding from "es6ImportDefaultBindingNoDefaultProperty_0";
+import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0";
diff --git a/tests/cases/compiler/es6ImportNameSpaceImport.ts b/tests/cases/compiler/es6ImportNameSpaceImport.ts
index 0c831d323d1..87fc59fdbaa 100644
--- a/tests/cases/compiler/es6ImportNameSpaceImport.ts
+++ b/tests/cases/compiler/es6ImportNameSpaceImport.ts
@@ -6,6 +6,6 @@
 export var a = 10;
 
 // @filename: es6ImportNameSpaceImport_1.ts
-import * as nameSpaceBinding from "es6ImportNameSpaceImport_0";
+import * as nameSpaceBinding from "./es6ImportNameSpaceImport_0";
 var x = nameSpaceBinding.a;
-import * as nameSpaceBinding2 from "es6ImportNameSpaceImport_0"; // elide this
+import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this
diff --git a/tests/cases/compiler/es6ImportNameSpaceImportDts.ts b/tests/cases/compiler/es6ImportNameSpaceImportDts.ts
index 95b85e53edc..77e65123e78 100644
--- a/tests/cases/compiler/es6ImportNameSpaceImportDts.ts
+++ b/tests/cases/compiler/es6ImportNameSpaceImportDts.ts
@@ -5,6 +5,6 @@
 export class c { };  
 
 // @filename: client.ts
-import * as nameSpaceBinding from "server";
+import * as nameSpaceBinding from "./server";
 export var x = new nameSpaceBinding.c();
-import * as nameSpaceBinding2 from "server"; // unreferenced
\ No newline at end of file
+import * as nameSpaceBinding2 from "./server"; // unreferenced
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportNameSpaceImportInEs5.ts b/tests/cases/compiler/es6ImportNameSpaceImportInEs5.ts
index 8104fe8b3c0..7900e5b5a2b 100644
--- a/tests/cases/compiler/es6ImportNameSpaceImportInEs5.ts
+++ b/tests/cases/compiler/es6ImportNameSpaceImportInEs5.ts
@@ -6,6 +6,6 @@
 export var a = 10;  
 
 // @filename: es6ImportNameSpaceImportInEs5_1.ts
-import * as nameSpaceBinding from "es6ImportNameSpaceImportInEs5_0";
+import * as nameSpaceBinding from "./es6ImportNameSpaceImportInEs5_0";
 var x = nameSpaceBinding.a;
-import * as nameSpaceBinding2 from "es6ImportNameSpaceImportInEs5_0"; // elide this
+import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide this
diff --git a/tests/cases/compiler/es6ImportNameSpaceImportMergeErrors.ts b/tests/cases/compiler/es6ImportNameSpaceImportMergeErrors.ts
index d4b69e8bcf4..cdedbe3fe9b 100644
--- a/tests/cases/compiler/es6ImportNameSpaceImportMergeErrors.ts
+++ b/tests/cases/compiler/es6ImportNameSpaceImportMergeErrors.ts
@@ -5,11 +5,11 @@
 export var a = 10;
 
 // @filename: es6ImportNameSpaceImportMergeErrors_1.ts
-import * as nameSpaceBinding from "es6ImportNameSpaceImportMergeErrors_0"; 
+import * as nameSpaceBinding from "./es6ImportNameSpaceImportMergeErrors_0"; 
 interface nameSpaceBinding { } // this should be ok
 
-import * as nameSpaceBinding1 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error
-import * as nameSpaceBinding1 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error
+import * as nameSpaceBinding1 from "./es6ImportNameSpaceImportMergeErrors_0"; // should be error
+import * as nameSpaceBinding1 from "./es6ImportNameSpaceImportMergeErrors_0"; // should be error
 
-import * as nameSpaceBinding3 from "es6ImportNameSpaceImportMergeErrors_0"; // should be error
+import * as nameSpaceBinding3 from "./es6ImportNameSpaceImportMergeErrors_0"; // should be error
 var nameSpaceBinding3 = 10;
diff --git a/tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports.ts b/tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports.ts
index 7d3bdcec94c..fe471dbc6c7 100644
--- a/tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports.ts
+++ b/tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports.ts
@@ -6,4 +6,4 @@ var a = 10;
 export = a;
 
 // @filename: es6ImportNameSpaceImportNoNamedExports_1.ts
-import * as nameSpaceBinding from "es6ImportNameSpaceImportNoNamedExports_0"; // error
\ No newline at end of file
+import * as nameSpaceBinding from "./es6ImportNameSpaceImportNoNamedExports_0"; // error
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportNamedImport.ts b/tests/cases/compiler/es6ImportNamedImport.ts
index 0a12e10169b..d71b27eeede 100644
--- a/tests/cases/compiler/es6ImportNamedImport.ts
+++ b/tests/cases/compiler/es6ImportNamedImport.ts
@@ -13,30 +13,30 @@ export var z2 = 10;
 export var aaaa = 10;
 
 // @filename: es6ImportNamedImport_1.ts
-import { } from "es6ImportNamedImport_0";
-import { a } from "es6ImportNamedImport_0";
+import { } from "./es6ImportNamedImport_0";
+import { a } from "./es6ImportNamedImport_0";
 var xxxx = a;
-import { a as b } from "es6ImportNamedImport_0";
+import { a as b } from "./es6ImportNamedImport_0";
 var xxxx = b;
-import { x, a as y } from "es6ImportNamedImport_0";
+import { x, a as y } from "./es6ImportNamedImport_0";
 var xxxx = x;
 var xxxx = y;
-import { x as z,  } from "es6ImportNamedImport_0";
+import { x as z,  } from "./es6ImportNamedImport_0";
 var xxxx = z;
-import { m,  } from "es6ImportNamedImport_0";
+import { m,  } from "./es6ImportNamedImport_0";
 var xxxx = m;
-import { a1, x1 } from "es6ImportNamedImport_0";
+import { a1, x1 } from "./es6ImportNamedImport_0";
 var xxxx = a1;
 var xxxx = x1;
-import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0";
+import { a1 as a11, x1 as x11 } from "./es6ImportNamedImport_0";
 var xxxx = a11;
 var xxxx = x11;
-import { z1 } from "es6ImportNamedImport_0";
+import { z1 } from "./es6ImportNamedImport_0";
 var z111 = z1;
-import { z2 as z3 } from "es6ImportNamedImport_0";
+import { z2 as z3 } from "./es6ImportNamedImport_0";
 var z2 = z3; // z2 shouldn't give redeclare error
 
 // These are elided
-import { aaaa } from "es6ImportNamedImport_0";
+import { aaaa } from "./es6ImportNamedImport_0";
 // These are elided
-import { aaaa as bbbb } from "es6ImportNamedImport_0";
+import { aaaa as bbbb } from "./es6ImportNamedImport_0";
diff --git a/tests/cases/compiler/es6ImportNamedImportDts.ts b/tests/cases/compiler/es6ImportNamedImportDts.ts
index d83672f3754..b98a20ecfa1 100644
--- a/tests/cases/compiler/es6ImportNamedImportDts.ts
+++ b/tests/cases/compiler/es6ImportNamedImportDts.ts
@@ -18,29 +18,29 @@ export class aaaa { }
 export class aaaa1 { }
 
 // @filename: client.ts
-import { } from "server";
-import { a } from "server";
+import { } from "./server";
+import { a } from "./server";
 export var xxxx = new a();
-import { a11 as b } from "server";
+import { a11 as b } from "./server";
 export var xxxx1 = new b();
-import { x, a12 as y } from "server";
+import { x, a12 as y } from "./server";
 export var xxxx2 = new x();
 export var xxxx3 = new y();
-import { x11 as z,  } from "server";
+import { x11 as z,  } from "./server";
 export var xxxx4 = new z();
-import { m,  } from "server";
+import { m,  } from "./server";
 export var xxxx5 = new m();
-import { a1, x1 } from "server";
+import { a1, x1 } from "./server";
 export var xxxx6 = new a1();
 export var xxxx7 = new x1();
-import { a111 as a11, x111 as x11 } from "server";
+import { a111 as a11, x111 as x11 } from "./server";
 export var xxxx8 = new a11();
 export var xxxx9 = new x11();
-import { z1 } from "server";
+import { z1 } from "./server";
 export var z111 = new z1();
-import { z2 as z3 } from "server";
+import { z2 as z3 } from "./server";
 export var z2 = new z3(); // z2 shouldn't give redeclare error
 
 // not referenced
-import { aaaa } from "server";
-import { aaaa1 as bbbb } from "server";
+import { aaaa } from "./server";
+import { aaaa1 as bbbb } from "./server";
diff --git a/tests/cases/compiler/es6ImportNamedImportInEs5.ts b/tests/cases/compiler/es6ImportNamedImportInEs5.ts
index e12a8d032d3..428ad235329 100644
--- a/tests/cases/compiler/es6ImportNamedImportInEs5.ts
+++ b/tests/cases/compiler/es6ImportNamedImportInEs5.ts
@@ -13,30 +13,30 @@ export var z2 = 10;
 export var aaaa = 10;
 
 // @filename: es6ImportNamedImportInEs5_1.ts
-import { } from "es6ImportNamedImportInEs5_0";
-import { a } from "es6ImportNamedImportInEs5_0";
+import { } from "./es6ImportNamedImportInEs5_0";
+import { a } from "./es6ImportNamedImportInEs5_0";
 var xxxx = a;
-import { a as b } from "es6ImportNamedImportInEs5_0";
+import { a as b } from "./es6ImportNamedImportInEs5_0";
 var xxxx = b;
-import { x, a as y } from "es6ImportNamedImportInEs5_0";
+import { x, a as y } from "./es6ImportNamedImportInEs5_0";
 var xxxx = x;
 var xxxx = y;
-import { x as z,  } from "es6ImportNamedImportInEs5_0";
+import { x as z,  } from "./es6ImportNamedImportInEs5_0";
 var xxxx = z;
-import { m,  } from "es6ImportNamedImportInEs5_0";
+import { m,  } from "./es6ImportNamedImportInEs5_0";
 var xxxx = m;
-import { a1, x1 } from "es6ImportNamedImportInEs5_0";
+import { a1, x1 } from "./es6ImportNamedImportInEs5_0";
 var xxxx = a1;
 var xxxx = x1;
-import { a1 as a11, x1 as x11 } from "es6ImportNamedImportInEs5_0";
+import { a1 as a11, x1 as x11 } from "./es6ImportNamedImportInEs5_0";
 var xxxx = a11;
 var xxxx = x11;
-import { z1 } from "es6ImportNamedImportInEs5_0";
+import { z1 } from "./es6ImportNamedImportInEs5_0";
 var z111 = z1;
-import { z2 as z3 } from "es6ImportNamedImportInEs5_0";
+import { z2 as z3 } from "./es6ImportNamedImportInEs5_0";
 var z2 = z3; // z2 shouldn't give redeclare error
 
 // These are elided
-import { aaaa } from "es6ImportNamedImportInEs5_0";
+import { aaaa } from "./es6ImportNamedImportInEs5_0";
 // These are elided
-import { aaaa as bbbb } from "es6ImportNamedImportInEs5_0";
+import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0";
diff --git a/tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts b/tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts
index 7a4519c68bb..e3f64e1e747 100644
--- a/tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts
+++ b/tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts
@@ -6,5 +6,5 @@
 export var a = 10;
 
 // @filename: es6ImportNamedImportInExportAssignment_1.ts
-import { a } from "es6ImportNamedImportInExportAssignment_0";
+import { a } from "./es6ImportNamedImportInExportAssignment_0";
 export = a;
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts b/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts
index 16d11d4e19f..381a21f58ea 100644
--- a/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts
+++ b/tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts
@@ -8,6 +8,6 @@ export module a {
 }
 
 // @filename: es6ImportNamedImportInIndirectExportAssignment_1.ts
-import { a } from "es6ImportNamedImportInIndirectExportAssignment_0";
+import { a } from "./es6ImportNamedImportInIndirectExportAssignment_0";
 import x = a;
 export = x;
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts b/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts
index 54e30be1e23..60f13d51355 100644
--- a/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts
+++ b/tests/cases/compiler/es6ImportNamedImportMergeErrors.ts
@@ -7,13 +7,13 @@ export var z = a;
 export var z1 = a;
 
 // @filename: es6ImportNamedImportMergeErrors_1.ts
-import { a } from "es6ImportNamedImportMergeErrors_0";
+import { a } from "./es6ImportNamedImportMergeErrors_0";
 interface a { } // shouldnt be error
-import { x as x1 } from "es6ImportNamedImportMergeErrors_0";
+import { x as x1 } from "./es6ImportNamedImportMergeErrors_0";
 interface x1 { } // shouldnt be error
-import { x } from "es6ImportNamedImportMergeErrors_0"; // should be error
+import { x } from "./es6ImportNamedImportMergeErrors_0"; // should be error
 var x = 10; 
-import { x as x44 } from "es6ImportNamedImportMergeErrors_0"; // should be error
+import { x as x44 } from "./es6ImportNamedImportMergeErrors_0"; // should be error
 var x44 = 10; 
-import { z } from "es6ImportNamedImportMergeErrors_0"; // should be error
-import { z1 as z } from "es6ImportNamedImportMergeErrors_0"; // should be error
+import { z } from "./es6ImportNamedImportMergeErrors_0"; // should be error
+import { z1 as z } from "./es6ImportNamedImportMergeErrors_0"; // should be error
diff --git a/tests/cases/compiler/es6ImportNamedImportNoExportMember.ts b/tests/cases/compiler/es6ImportNamedImportNoExportMember.ts
index bd507308d8d..48f8036a753 100644
--- a/tests/cases/compiler/es6ImportNamedImportNoExportMember.ts
+++ b/tests/cases/compiler/es6ImportNamedImportNoExportMember.ts
@@ -5,5 +5,5 @@ export var a = 10;
 export var x = a;
 
 // @filename: es6ImportNamedImport_1.ts
-import { a1 } from "es6ImportNamedImportNoExportMember_0";
-import { x1 as x } from "es6ImportNamedImportNoExportMember_0";
\ No newline at end of file
+import { a1 } from "./es6ImportNamedImportNoExportMember_0";
+import { x1 as x } from "./es6ImportNamedImportNoExportMember_0";
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts b/tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts
index 9dd243ff36d..9e46253cc9c 100644
--- a/tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts
+++ b/tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts
@@ -6,5 +6,5 @@ var a = 10;
 export = a;
 
 // @filename: es6ImportNamedImportNoNamedExports_1.ts
-import { a } from "es6ImportNamedImportNoNamedExports_0";
-import { a as x } from "es6ImportNamedImportNoNamedExports_0";
\ No newline at end of file
+import { a } from "./es6ImportNamedImportNoNamedExports_0";
+import { a as x } from "./es6ImportNamedImportNoNamedExports_0";
\ No newline at end of file
diff --git a/tests/cases/compiler/es6ImportNamedImportWithExport.ts b/tests/cases/compiler/es6ImportNamedImportWithExport.ts
index f25a3779b99..9643a82b9b9 100644
--- a/tests/cases/compiler/es6ImportNamedImportWithExport.ts
+++ b/tests/cases/compiler/es6ImportNamedImportWithExport.ts
@@ -12,29 +12,29 @@ export var z2 = 10;
 export var aaaa = 10;
 
 // @filename: client.ts
-export import { } from "server";
-export import { a } from "server";
+export import { } from "./server";
+export import { a } from "./server";
 export var xxxx = a;
-export import { a as b } from "server";
+export import { a as b } from "./server";
 export var xxxx = b;
-export import { x, a as y } from "server";
+export import { x, a as y } from "./server";
 export var xxxx = x;
 export var xxxx = y;
-export import { x as z,  } from "server";
+export import { x as z,  } from "./server";
 export var xxxx = z;
-export import { m,  } from "server";
+export import { m,  } from "./server";
 export var xxxx = m;
-export import { a1, x1 } from "server";
+export import { a1, x1 } from "./server";
 export var xxxx = a1;
 export var xxxx = x1;
-export import { a1 as a11, x1 as x11 } from "server";
+export import { a1 as a11, x1 as x11 } from "./server";
 export var xxxx = a11;
 export var xxxx = x11;
-export import { z1 } from "server";
+export import { z1 } from "./server";
 export var z111 = z1;
-export import { z2 as z3 } from "server";
+export import { z2 as z3 } from "./server";
 export var z2 = z3; // z2 shouldn't give redeclare error
 
 // Non referenced imports
-export import { aaaa } from "server";
-export import { aaaa as bbbb } from "server";
+export import { aaaa } from "./server";
+export import { aaaa as bbbb } from "./server";
diff --git a/tests/cases/compiler/es6ImportNamedImportWithTypesAndValues.ts b/tests/cases/compiler/es6ImportNamedImportWithTypesAndValues.ts
index 08294e57232..4b5a2f17ab0 100644
--- a/tests/cases/compiler/es6ImportNamedImportWithTypesAndValues.ts
+++ b/tests/cases/compiler/es6ImportNamedImportWithTypesAndValues.ts
@@ -16,6 +16,6 @@ export class C2 implements I2 {
 }
 
 // @filename: client.ts
-import { C, I, C2 } from "server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
+import { C, I, C2 } from "./server"; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
 export type cValInterface = I;
 export var cVal = new C();
\ No newline at end of file
diff --git a/tests/cases/compiler/exportAssignClassAndModule.ts b/tests/cases/compiler/exportAssignClassAndModule.ts
index 1124234ae8d..0ac65454b00 100644
--- a/tests/cases/compiler/exportAssignClassAndModule.ts
+++ b/tests/cases/compiler/exportAssignClassAndModule.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: exportAssignClassAndModule_0.ts
 class Foo {
     x: Foo.Bar;
@@ -11,7 +11,7 @@ export = Foo;
 
 // @Filename: exportAssignClassAndModule_1.ts
 ///<reference path='exportAssignClassAndModule_0.ts'/>
-import Foo = require('exportAssignClassAndModule_0');
+import Foo = require('./exportAssignClassAndModule_0');
 
 var z: Foo.Bar;
 var zz: Foo;
diff --git a/tests/cases/compiler/exportAssignmentEnum.ts b/tests/cases/compiler/exportAssignmentEnum.ts
index debaab1e5e8..dff61fdb5df 100644
--- a/tests/cases/compiler/exportAssignmentEnum.ts
+++ b/tests/cases/compiler/exportAssignmentEnum.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: exportAssignmentEnum_A.ts
 enum E {
 	A,
@@ -9,7 +9,7 @@ enum E {
 export = E;
 
 // @Filename: exportAssignmentEnum_B.ts
-import EnumE = require("exportAssignmentEnum_A");
+import EnumE = require("./exportAssignmentEnum_A");
 
 var a = EnumE.A;
 var b = EnumE.B;
diff --git a/tests/cases/compiler/exportAssignmentOfDeclaredExternalModule.ts b/tests/cases/compiler/exportAssignmentOfDeclaredExternalModule.ts
index 63c1f01eb28..fd6b55c9c08 100644
--- a/tests/cases/compiler/exportAssignmentOfDeclaredExternalModule.ts
+++ b/tests/cases/compiler/exportAssignmentOfDeclaredExternalModule.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: exportAssignmentOfDeclaredExternalModule_0.ts
 interface Sammy {
     new (): any; // a constructor signature
@@ -8,7 +8,7 @@ export = Sammy;
 
 // @Filename: exportAssignmentOfDeclaredExternalModule_1.ts
 ///<reference path='exportAssignmentOfDeclaredExternalModule_0.ts'/>
-import Sammy = require('exportAssignmentOfDeclaredExternalModule_0');
+import Sammy = require('./exportAssignmentOfDeclaredExternalModule_0');
 var x = new Sammy(); // error to use as constructor as there is not constructor symbol
 var y = Sammy(); // error to use interface name as call target
 var z: Sammy; // no error - z is of type interface Sammy from module 'M'
diff --git a/tests/cases/compiler/exportAssignmentVariable.ts b/tests/cases/compiler/exportAssignmentVariable.ts
index b1ba2452884..9bb53a7c89d 100644
--- a/tests/cases/compiler/exportAssignmentVariable.ts
+++ b/tests/cases/compiler/exportAssignmentVariable.ts
@@ -1,10 +1,10 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: exportAssignmentVariable_A.ts
 var x = 0;
 
 export = x;
 
 // @Filename: exportAssignmentVariable_B.ts
-import y = require("exportAssignmentVariable_A");
+import y = require("./exportAssignmentVariable_A");
 
 var n: number = y;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportEqualMemberMissing.ts b/tests/cases/compiler/exportEqualMemberMissing.ts
index 6f916b65260..89b328f0536 100644
--- a/tests/cases/compiler/exportEqualMemberMissing.ts
+++ b/tests/cases/compiler/exportEqualMemberMissing.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: exportEqualMemberMissing_0.ts
 module server {
     export interface connectModule {
@@ -16,5 +16,5 @@ export = server;
 
 // @Filename: exportEqualMemberMissing_1.ts
 ///<reference path='exportEqualMemberMissing_0.ts'/>
-import connect = require('exportEqualMemberMissing_0');
+import connect = require('./exportEqualMemberMissing_0');
 connect().use(connect.static('foo')); // Error	1	The property 'static' does not exist on value of type ''.
diff --git a/tests/cases/compiler/exportStarFromEmptyModule.ts b/tests/cases/compiler/exportStarFromEmptyModule.ts
index 163576f1c08..8e4ea8a7b21 100644
--- a/tests/cases/compiler/exportStarFromEmptyModule.ts
+++ b/tests/cases/compiler/exportStarFromEmptyModule.ts
@@ -11,15 +11,15 @@ export class A {
 // empty
 
 // @filename: exportStarFromEmptyModule_module3.ts
-export * from "exportStarFromEmptyModule_module2";
-export * from "exportStarFromEmptyModule_module1";
+export * from "./exportStarFromEmptyModule_module2";
+export * from "./exportStarFromEmptyModule_module1";
 
 export class A {
     static q;
 }
 
 // @filename: exportStarFromEmptyModule_module4.ts
-import * as X from "exportStarFromEmptyModule_module3";
+import * as X from "./exportStarFromEmptyModule_module3";
 var s: X.A;
 X.A.q;
 X.A.r; // Error
\ No newline at end of file
diff --git a/tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer.ts b/tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer.ts
index 9cd73deb90d..4e5a67665d9 100644
--- a/tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer.ts
+++ b/tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer.ts
@@ -1,25 +1,25 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: extendingClassFromAliasAndUsageInIndexer_backbone.ts
 export class Model {
     public someData: string;
 }
 
 // @Filename: extendingClassFromAliasAndUsageInIndexer_moduleA.ts
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 export class VisualizationModel extends Backbone.Model {
     // interesting stuff here
 }
 
 // @Filename: extendingClassFromAliasAndUsageInIndexer_moduleB.ts
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 export class VisualizationModel extends Backbone.Model {
     // different interesting stuff here
 }
 
 // @Filename: extendingClassFromAliasAndUsageInIndexer_main.ts
-import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
-import moduleA = require("extendingClassFromAliasAndUsageInIndexer_moduleA");
-import moduleB = require("extendingClassFromAliasAndUsageInIndexer_moduleB");
+import Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
+import moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA");
+import moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB");
 interface IHasVisualizationModel {
     VisualizationModel: typeof Backbone.Model;
 }
diff --git a/tests/cases/compiler/externalModuleExportingGenericClass.ts b/tests/cases/compiler/externalModuleExportingGenericClass.ts
index 882dd1c5603..b20afb56013 100644
--- a/tests/cases/compiler/externalModuleExportingGenericClass.ts
+++ b/tests/cases/compiler/externalModuleExportingGenericClass.ts
@@ -8,7 +8,7 @@ export = C;
 
 
 // @Filename: externalModuleExportingGenericClass_file1.ts
-import a = require('externalModuleExportingGenericClass_file0');
+import a = require('./externalModuleExportingGenericClass_file0');
 var v: a; // this should report error
 var v2: any = (new a()).foo;
 var v3: number = (new a<number>()).foo;
diff --git a/tests/cases/compiler/externalModuleImmutableBindings.ts b/tests/cases/compiler/externalModuleImmutableBindings.ts
index 2321961f6f8..33e1b9894e1 100644
--- a/tests/cases/compiler/externalModuleImmutableBindings.ts
+++ b/tests/cases/compiler/externalModuleImmutableBindings.ts
@@ -5,7 +5,7 @@ export var x = 1;
 // @Filename: f2.ts
 
 // all mutations below are illegal and should be fixed
-import * as stuff from 'f1';
+import * as stuff from './f1';
 
 var n = 'baz';
 
diff --git a/tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration.ts b/tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration.ts
index 79cf425bdda..55922da6ca8 100644
--- a/tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration.ts
+++ b/tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: externalModuleRefernceResolutionOrderInImportDeclaration_file1.ts
 export function foo() { };
 
@@ -10,7 +10,7 @@ declare module "externalModuleRefernceResolutionOrderInImportDeclaration_file1"
 
 // @Filename: externalModuleRefernceResolutionOrderInImportDeclaration_file3.ts
 ///<reference path='externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts'/>
-import file1 = require('externalModuleRefernceResolutionOrderInImportDeclaration_file1');
+import file1 = require('./externalModuleRefernceResolutionOrderInImportDeclaration_file1');
 file1.foo();
 file1.bar();
 
diff --git a/tests/cases/compiler/importAsBaseClass.ts b/tests/cases/compiler/importAsBaseClass.ts
index b533453773c..4077ca952b9 100644
--- a/tests/cases/compiler/importAsBaseClass.ts
+++ b/tests/cases/compiler/importAsBaseClass.ts
@@ -1,9 +1,9 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: importAsBaseClass_0.ts
 export class Greeter {
    greet() { return 'greet' }
 }
 
 // @Filename: importAsBaseClass_1.ts
-import Greeter = require("importAsBaseClass_0");
+import Greeter = require("./importAsBaseClass_0");
 class Hello extends Greeter { }
diff --git a/tests/cases/compiler/importDecl.ts b/tests/cases/compiler/importDecl.ts
index c28b332eb43..e7c3a0789ce 100644
--- a/tests/cases/compiler/importDecl.ts
+++ b/tests/cases/compiler/importDecl.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @declaration: true
 // @Filename: importDecl_require.ts
 export class d {
@@ -29,7 +29,7 @@ export var x: d;
 export function foo(): d { return null; }
 
 // @Filename: importDecl_require4.ts
-import m4 = require("importDecl_require");
+import m4 = require("./importDecl_require");
 export function foo2(): m4.d { return null; }
 
 // @Filename: importDecl_1.ts
@@ -38,7 +38,7 @@ export function foo2(): m4.d { return null; }
 ///<reference path='importDecl_require2.ts'/>
 ///<reference path='importDecl_require3.ts'/>
 ///<reference path='importDecl_require4.ts'/>
-import m4 = require("importDecl_require"); // Emit used
+import m4 = require("./importDecl_require"); // Emit used
 export var x4 = m4.x;
 export var d4 = m4.d;
 export var f4 = m4.foo();
@@ -54,16 +54,16 @@ export module m1 {
 }
 
 //Emit global only usage
-import glo_m4 = require("importDecl_require1");
+import glo_m4 = require("./importDecl_require1");
 export var useGlo_m4_d4 = glo_m4.d;
 export var useGlo_m4_f4 = glo_m4.foo();
 
 //Emit even when used just in function type
-import fncOnly_m4 = require("importDecl_require2");
+import fncOnly_m4 = require("./importDecl_require2");
 export var useFncOnly_m4_f4 = fncOnly_m4.foo();
 
 // only used privately no need to emit
-import private_m4 = require("importDecl_require3");
+import private_m4 = require("./importDecl_require3");
 export module usePrivate_m4_m1 {
     var x3 = private_m4.x;
     var d3 = private_m4.d;
@@ -71,11 +71,11 @@ export module usePrivate_m4_m1 {
 }
 
 // Do not emit unused import
-import m5 = require("importDecl_require4");
+import m5 = require("./importDecl_require4");
 export var d = m5.foo2();
 
 // Do not emit multiple used import statements
-import multiImport_m4 = require("importDecl_require"); // Emit used
+import multiImport_m4 = require("./importDecl_require"); // Emit used
 export var useMultiImport_m4_x4 = multiImport_m4.x;
 export var useMultiImport_m4_d4 = multiImport_m4.d;
 export var useMultiImport_m4_f4 = multiImport_m4.foo();
diff --git a/tests/cases/compiler/importDeclarationUsedAsTypeQuery.ts b/tests/cases/compiler/importDeclarationUsedAsTypeQuery.ts
index aea205dd447..5fc77ca1a8e 100644
--- a/tests/cases/compiler/importDeclarationUsedAsTypeQuery.ts
+++ b/tests/cases/compiler/importDeclarationUsedAsTypeQuery.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @declaration: true
 // @Filename: importDeclarationUsedAsTypeQuery_require.ts
 export class B {
@@ -7,5 +7,5 @@ export class B {
 
 // @Filename: importDeclarationUsedAsTypeQuery_1.ts
 ///<reference path='importDeclarationUsedAsTypeQuery_require.ts'/>
-import a = require('importDeclarationUsedAsTypeQuery_require');
+import a = require('./importDeclarationUsedAsTypeQuery_require');
 export var x: typeof a;
diff --git a/tests/cases/compiler/importUsedInExtendsList1.ts b/tests/cases/compiler/importUsedInExtendsList1.ts
index f76ccc874c9..f5e3b77f1e3 100644
--- a/tests/cases/compiler/importUsedInExtendsList1.ts
+++ b/tests/cases/compiler/importUsedInExtendsList1.ts
@@ -1,10 +1,10 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: importUsedInExtendsList1_require.ts
 export class Super { foo: string; }
 
 // @Filename: importUsedInExtendsList1_1.ts
 ///<reference path='importUsedInExtendsList1_require.ts'/>
-import foo = require('importUsedInExtendsList1_require');
+import foo = require('./importUsedInExtendsList1_require');
 class Sub extends foo.Super { }
 var s: Sub;
 var r: string = s.foo;
diff --git a/tests/cases/compiler/localAliasExportAssignment.ts b/tests/cases/compiler/localAliasExportAssignment.ts
index 8e6df40403b..9fe29ba91d1 100644
--- a/tests/cases/compiler/localAliasExportAssignment.ts
+++ b/tests/cases/compiler/localAliasExportAssignment.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: localAliasExportAssignment_0.ts
 var server: {
     (): any;
@@ -8,7 +8,7 @@ export = server;
 
 // @Filename: localAliasExportAssignment_1.ts
 ///<reference path='localAliasExportAssignment_0.ts'/>
-import connect = require('localAliasExportAssignment_0');
+import connect = require('./localAliasExportAssignment_0');
 
 connect();
 
diff --git a/tests/cases/compiler/moduleInTypePosition1.ts b/tests/cases/compiler/moduleInTypePosition1.ts
index 170afc1f876..51481a5c0ea 100644
--- a/tests/cases/compiler/moduleInTypePosition1.ts
+++ b/tests/cases/compiler/moduleInTypePosition1.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: moduleInTypePosition1_0.ts
 export class Promise {
     foo: string;
@@ -6,5 +6,5 @@ export class Promise {
 
 // @Filename: moduleInTypePosition1_1.ts
 ///<reference path='moduleInTypePosition1_0.ts'/>
-import WinJS = require('moduleInTypePosition1_0');
+import WinJS = require('./moduleInTypePosition1_0');
 var x = (w1: WinJS) => { };
diff --git a/tests/cases/compiler/multiImportExport.ts b/tests/cases/compiler/multiImportExport.ts
index 939a6e1061e..fe253e282ad 100644
--- a/tests/cases/compiler/multiImportExport.ts
+++ b/tests/cases/compiler/multiImportExport.ts
@@ -5,10 +5,10 @@ import Drawing = require('./Drawing');
 var addr = new Drawing.Math.Adder();
 
 // @Filename: Drawing.ts
-export import Math = require('Math/Math')
+export import Math = require('./Math/Math')
 
 // @Filename: Math/Math.ts
-import Adder = require('Math/Adder');
+import Adder = require('./Adder');
 
 var Math = {
     Adder:Adder
diff --git a/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts b/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts
index 1150cf963bf..70369c47895 100644
--- a/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts
+++ b/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts
@@ -36,7 +36,7 @@ export module SpecializedWidget {
 
 // @Filename:privacyCannotNameAccessorDeclFile_exporter.ts
 ///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
+import Widgets = require("./privacyCannotNameAccessorDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -52,7 +52,7 @@ export function createExportedWidget4() {
 }
 
 // @Filename:privacyCannotNameAccessorDeclFile_consumer.ts
-import exporter = require("privacyCannotNameAccessorDeclFile_exporter");
+import exporter = require("./privacyCannotNameAccessorDeclFile_exporter");
 export class publicClassWithWithPrivateGetAccessorTypes {
     static get myPublicStaticMethod() { // Error
         return exporter.createExportedWidget1();
diff --git a/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts b/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts
index e49d31946c6..1135e3c86f4 100644
--- a/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts
+++ b/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts
@@ -36,7 +36,7 @@ export module SpecializedWidget {
 
 // @Filename:privacyCannotNameVarTypeDeclFile_exporter.ts
 ///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
+import Widgets = require("./privacyCannotNameVarTypeDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -52,7 +52,7 @@ export function createExportedWidget4() {
 }
 
 // @Filename:privacyCannotNameVarTypeDeclFile_consumer.ts
-import exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
+import exporter = require("./privacyCannotNameVarTypeDeclFile_exporter");
 export class publicClassWithWithPrivatePropertyTypes {
     static myPublicStaticProperty = exporter.createExportedWidget1(); // Error
     private static myPrivateStaticProperty = exporter.createExportedWidget1();
diff --git a/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts b/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts
index b412622ad40..a214104fafb 100644
--- a/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts
+++ b/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts
@@ -1,5 +1,5 @@
-//@module: commonjs
-//@declaration: true
+// @module: commonjs
+// @declaration: true
 // @Filename: privacyCheckExternalModuleExportAssignmentOfGenericClass_0.ts
 export = Foo;
 class Foo<A> {
@@ -7,7 +7,7 @@ class Foo<A> {
 }
 
 // @Filename: privacyCheckExternalModuleExportAssignmentOfGenericClass_1.ts
-import Foo = require("privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
+import Foo = require("./privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
 export = Bar;
 interface Bar {
     foo: Foo<number>;
diff --git a/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts
index f24ed8ea32b..dd5eaf82bdf 100644
--- a/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts
+++ b/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts
@@ -36,7 +36,7 @@ export module SpecializedWidget {
 
 // @Filename:privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts
 ///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
+import Widgets = require("./privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -52,7 +52,7 @@ export function createExportedWidget4() {
 }
 
 // @Filename:privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts
-import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
+import exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter");
 export class publicClassWithWithPrivateParmeterTypes {
     static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error
     }
diff --git a/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts
index 2eff22327b5..cb1993286a4 100644
--- a/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts
+++ b/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts
@@ -36,7 +36,7 @@ export module SpecializedWidget {
 
 // @Filename:privacyFunctionReturnTypeDeclFile_exporter.ts
 ///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
+import Widgets = require("./privacyFunctionReturnTypeDeclFile_Widgets");
 import Widgets1 = require("GlobalWidgets");
 export function createExportedWidget1() {
     return Widgets.createWidget1();
@@ -52,7 +52,7 @@ export function createExportedWidget4() {
 }
 
 // @Filename:privacyFunctionReturnTypeDeclFile_consumer.ts
-import exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
+import exporter = require("./privacyFunctionReturnTypeDeclFile_exporter");
 export class publicClassWithWithPrivateParmeterTypes {
     static myPublicStaticMethod() { // Error
         return exporter.createExportedWidget1();
diff --git a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts
index 16c6e19fb59..1ea30d1f3c4 100644
--- a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts
+++ b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts
@@ -1,5 +1,5 @@
-//@module: commonjs
-//@declaration: true
+// @module: commonjs
+// @declaration: true
 // @Filename: privacyTopLevelAmbientExternalModuleImportWithExport_require.ts
 // Public elements
 export class c_public {
@@ -32,8 +32,8 @@ declare module 'm2' {
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
-export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
-export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
+export import im_public_mi_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require");
+export import im_public_mu_private = require("./privacyTopLevelAmbientExternalModuleImportWithExport_require1");
 export import im_public_mi_public = require("m");
 export import im_public_mu_public = require("m2");
 
diff --git a/tests/cases/compiler/requireOfAnEmptyFile1.ts b/tests/cases/compiler/requireOfAnEmptyFile1.ts
index 365817f1339..98d5003ad67 100644
--- a/tests/cases/compiler/requireOfAnEmptyFile1.ts
+++ b/tests/cases/compiler/requireOfAnEmptyFile1.ts
@@ -1,7 +1,7 @@
-//@module: commonjs
+// @module: commonjs
 //requireOfAnEmptyFile1
 
 // @Filename: requireOfAnEmptyFile1_a.ts
-import fs = require('requireOfAnEmptyFile1_b');
+import fs = require('./requireOfAnEmptyFile1_b');
 
 // @Filename: requireOfAnEmptyFile1_b.ts
diff --git a/tests/cases/compiler/reuseInnerModuleMember.ts b/tests/cases/compiler/reuseInnerModuleMember.ts
index ebffcad6060..e2f9900e73f 100644
--- a/tests/cases/compiler/reuseInnerModuleMember.ts
+++ b/tests/cases/compiler/reuseInnerModuleMember.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: reuseInnerModuleMember_0.ts
 export module M { }
 
@@ -8,7 +8,7 @@ declare module bar {
     interface alpha { }
 }
 
-import f = require('reuseInnerModuleMember_0');
+import f = require('./reuseInnerModuleMember_0');
 module bar {
     var x: alpha;
 }
diff --git a/tests/cases/compiler/staticInstanceResolution3.ts b/tests/cases/compiler/staticInstanceResolution3.ts
index ae8cefc8102..bc4586b2adf 100644
--- a/tests/cases/compiler/staticInstanceResolution3.ts
+++ b/tests/cases/compiler/staticInstanceResolution3.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: staticInstanceResolution3_0.ts
 export class Promise {
     static timeout(delay: number): Promise {
@@ -8,5 +8,5 @@ export class Promise {
 
 // @Filename: staticInstanceResolution3_1.ts
 ///<reference path='staticInstanceResolution3_0.ts'/>
-import WinJS = require('staticInstanceResolution3_0');
+import WinJS = require('./staticInstanceResolution3_0');
 WinJS.Promise.timeout(10);
\ No newline at end of file
diff --git a/tests/cases/compiler/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.ts b/tests/cases/compiler/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.ts
index 28a9e821131..70be28f74eb 100644
--- a/tests/cases/compiler/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.ts
+++ b/tests/cases/compiler/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @declaration: true
 // @Filename: file1.ts
 export function foo() {
@@ -7,5 +7,5 @@ var classes = undefined;
 }
 
 // @Filename: file2.ts
-import f = require('file1');
+import f = require('./file1');
 f.foo();
diff --git a/tests/cases/compiler/typeofAmbientExternalModules.ts b/tests/cases/compiler/typeofAmbientExternalModules.ts
index df3283bfb45..b6b8237dac6 100644
--- a/tests/cases/compiler/typeofAmbientExternalModules.ts
+++ b/tests/cases/compiler/typeofAmbientExternalModules.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: typeofAmbientExternalModules_0.ts
 export class C { foo: string; }
 
@@ -9,8 +9,8 @@ export = D;
 // @Filename: typeofAmbientExternalModules_2.ts
 ///<reference path='typeofAmbientExternalModules_0.ts'/>
 ///<reference path='typeofAmbientExternalModules_1.ts'/>
-import ext = require('typeofAmbientExternalModules_0');
-import exp = require('typeofAmbientExternalModules_1');
+import ext = require('./typeofAmbientExternalModules_0');
+import exp = require('./typeofAmbientExternalModules_1');
 
 var y1: typeof ext = ext;
 y1 = exp;
diff --git a/tests/cases/compiler/typeofExternalModules.ts b/tests/cases/compiler/typeofExternalModules.ts
index fe3dfad5d86..32475215e24 100644
--- a/tests/cases/compiler/typeofExternalModules.ts
+++ b/tests/cases/compiler/typeofExternalModules.ts
@@ -1,4 +1,4 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: typeofExternalModules_external.ts
 export class C { }
 
@@ -7,8 +7,8 @@ class D { }
 export = D;
 
 // @Filename: typeofExternalModules_core.ts
-import ext = require('typeofExternalModules_external');
-import exp = require('typeofExternalModules_exportAssign');
+import ext = require('./typeofExternalModules_external');
+import exp = require('./typeofExternalModules_exportAssign');
 
 var y1: typeof ext = ext;
 y1 = exp;
diff --git a/tests/cases/compiler/unusedImportDeclaration.ts b/tests/cases/compiler/unusedImportDeclaration.ts
index 263b355f69c..71fe5aae5a3 100644
--- a/tests/cases/compiler/unusedImportDeclaration.ts
+++ b/tests/cases/compiler/unusedImportDeclaration.ts
@@ -1,5 +1,5 @@
-//@module: commonjs
-//@declaration: true
+// @module: commonjs
+// @declaration: true
 // @Filename: unusedImportDeclaration_testerB.ts
 class TesterB {
     me: string;
@@ -7,7 +7,7 @@ class TesterB {
 export = TesterB;
 
 // @Filename: unusedImportDeclaration_testerA.ts
-import B = require("unusedImportDeclaration_testerB");
+import B = require("./unusedImportDeclaration_testerB");
 var thingy: B = {
     me: "A"
 };
diff --git a/tests/cases/compiler/visibilityOfCrossModuleTypeUsage.ts b/tests/cases/compiler/visibilityOfCrossModuleTypeUsage.ts
index ff9610a2f65..ee22e3a4172 100644
--- a/tests/cases/compiler/visibilityOfCrossModuleTypeUsage.ts
+++ b/tests/cases/compiler/visibilityOfCrossModuleTypeUsage.ts
@@ -1,9 +1,9 @@
-//@module: commonjs
+// @module: commonjs
 //visibilityOfCrossModuleTypeUsage
 
 // @Filename: visibilityOfCrossModuleTypeUsage_commands.ts
-import fs = require('visibilityOfCrossModuleTypeUsage_fs');
-import server = require('visibilityOfCrossModuleTypeUsage_server');
+import fs = require('./visibilityOfCrossModuleTypeUsage_fs');
+import server = require('./visibilityOfCrossModuleTypeUsage_server');
 
 export interface IConfiguration {
     workspace: server.IWorkspace;
@@ -19,7 +19,7 @@ export interface IWorkspace {
 }
 
 // @Filename: visibilityOfCrossModuleTypeUsage_fs.ts
-import commands = require('visibilityOfCrossModuleTypeUsage_commands');
+import commands = require('./visibilityOfCrossModuleTypeUsage_commands');
 function run(configuration: commands.IConfiguration) {
     var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/voidAsNonAmbiguousReturnType.ts b/tests/cases/compiler/voidAsNonAmbiguousReturnType.ts
index d20f9941fbf..c00ef99e1aa 100644
--- a/tests/cases/compiler/voidAsNonAmbiguousReturnType.ts
+++ b/tests/cases/compiler/voidAsNonAmbiguousReturnType.ts
@@ -1,11 +1,11 @@
-//@module: commonjs
+// @module: commonjs
 // @Filename: voidAsNonAmbiguousReturnType_0.ts
 export function mkdirSync(path: string, mode?: number): void;
 export function mkdirSync(path: string, mode?: string): void {}
 
 // @Filename: voidAsNonAmbiguousReturnType_1.ts
 ///<reference path='voidAsNonAmbiguousReturnType_0.ts'/>
-import fs = require("voidAsNonAmbiguousReturnType_0");
+import fs = require("./voidAsNonAmbiguousReturnType_0");
 
 function main() {
  fs.mkdirSync('test'); // should not error - return types are the same
diff --git a/tests/cases/conformance/es6/modules/multipleDefaultExports01.ts b/tests/cases/conformance/es6/modules/multipleDefaultExports01.ts
index 84172248e93..e6a467820b4 100644
--- a/tests/cases/conformance/es6/modules/multipleDefaultExports01.ts
+++ b/tests/cases/conformance/es6/modules/multipleDefaultExports01.ts
@@ -14,6 +14,6 @@ var x = 10;
 export default x;
 
 // @filename: m2.ts
-import Entity from "m1"
+import Entity from "./m1"
 
 Entity();
\ No newline at end of file
diff --git a/tests/cases/conformance/es6/modules/multipleDefaultExports02.ts b/tests/cases/conformance/es6/modules/multipleDefaultExports02.ts
index 1e9c8dabc13..d642b72b6f3 100644
--- a/tests/cases/conformance/es6/modules/multipleDefaultExports02.ts
+++ b/tests/cases/conformance/es6/modules/multipleDefaultExports02.ts
@@ -11,6 +11,6 @@ export default function bar() {
 }
 
 // @filename: m2.ts
-import Entity from "m1"
+import Entity from "./m1"
 
 Entity();
\ No newline at end of file
diff --git a/tests/cases/conformance/externalModules/topLevelFileModule.ts b/tests/cases/conformance/externalModules/topLevelFileModule.ts
index 7f694f6f98d..e6680889d26 100644
--- a/tests/cases/conformance/externalModules/topLevelFileModule.ts
+++ b/tests/cases/conformance/externalModules/topLevelFileModule.ts
@@ -6,6 +6,6 @@ export var x: number;
 export declare var y: number;
 
 // @Filename: foo_1.ts
-import foo = require("vs/foo_0");
-import fum = require("vs/fum");
+import foo = require("./vs/foo_0");
+import fum = require("./vs/fum");
 var z = foo.x + fum.y;
diff --git a/tests/cases/conformance/externalModules/topLevelModuleDeclarationAndFile.ts b/tests/cases/conformance/externalModules/topLevelModuleDeclarationAndFile.ts
index db0e2ce742c..456527acfae 100644
--- a/tests/cases/conformance/externalModules/topLevelModuleDeclarationAndFile.ts
+++ b/tests/cases/conformance/externalModules/topLevelModuleDeclarationAndFile.ts
@@ -1,5 +1,5 @@
 // @module: commonjs
-// @Filename: vs/foo_0.ts
+// @Filename: vs/foo_0/index.ts
 export var x: number = 42;
 
 // @Filename: foo_1.ts