diff --git a/NuGet.config b/NuGet.config
index ec7cd3735e..a6026c9cf9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <add key="AspNetVNext" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
diff --git a/test/E2ETests/compiler/shared/Mocks/Common/CustomStateDataFormat.cs b/shared/Mocks/Common/CustomStateDataFormat.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/Common/CustomStateDataFormat.cs
rename to shared/Mocks/Common/CustomStateDataFormat.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/Common/Helpers.cs b/shared/Mocks/Common/Helpers.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/Common/Helpers.cs
rename to shared/Mocks/Common/Helpers.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs b/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
rename to shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/Facebook/TestFacebookEvents.cs b/shared/Mocks/Facebook/TestFacebookEvents.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/Facebook/TestFacebookEvents.cs
rename to shared/Mocks/Facebook/TestFacebookEvents.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs b/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
rename to shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/Google/TestGoogleEvents.cs b/shared/Mocks/Google/TestGoogleEvents.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/Google/TestGoogleEvents.cs
rename to shared/Mocks/Google/TestGoogleEvents.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs b/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
rename to shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs b/shared/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs
rename to shared/Mocks/MicrosoftAccount/TestMicrosoftAccountEvents.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/OpenIdConnect/CustomStringDataFormat.cs b/shared/Mocks/OpenIdConnect/CustomStringDataFormat.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/OpenIdConnect/CustomStringDataFormat.cs
rename to shared/Mocks/OpenIdConnect/CustomStringDataFormat.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/OpenIdConnect/OpenIdConnectBackChannelHttpHandler.cs b/shared/Mocks/OpenIdConnect/OpenIdConnectBackChannelHttpHandler.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/OpenIdConnect/OpenIdConnectBackChannelHttpHandler.cs
rename to shared/Mocks/OpenIdConnect/OpenIdConnectBackChannelHttpHandler.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs b/shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs
rename to shared/Mocks/OpenIdConnect/TestOpenIdConnectEvents.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/OpenIdConnect/keys.json b/shared/Mocks/OpenIdConnect/keys.json
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/OpenIdConnect/keys.json
rename to shared/Mocks/OpenIdConnect/keys.json
diff --git a/test/E2ETests/compiler/shared/Mocks/OpenIdConnect/openid-configuration.json b/shared/Mocks/OpenIdConnect/openid-configuration.json
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/OpenIdConnect/openid-configuration.json
rename to shared/Mocks/OpenIdConnect/openid-configuration.json
diff --git a/test/E2ETests/compiler/shared/Mocks/Readme.md b/shared/Mocks/Readme.md
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/Readme.md
rename to shared/Mocks/Readme.md
diff --git a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs b/shared/Mocks/StartupOpenIdConnectTesting.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs
rename to shared/Mocks/StartupOpenIdConnectTesting.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs b/shared/Mocks/StartupSocialTesting.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs
rename to shared/Mocks/StartupSocialTesting.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/Twitter/CustomTwitterStateDataFormat.cs b/shared/Mocks/Twitter/CustomTwitterStateDataFormat.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/Twitter/CustomTwitterStateDataFormat.cs
rename to shared/Mocks/Twitter/CustomTwitterStateDataFormat.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/Twitter/TestTwitterEvents.cs b/shared/Mocks/Twitter/TestTwitterEvents.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/Twitter/TestTwitterEvents.cs
rename to shared/Mocks/Twitter/TestTwitterEvents.cs
diff --git a/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs b/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
similarity index 100%
rename from test/E2ETests/compiler/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
rename to shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
diff --git a/src/MusicStore/project.json b/src/MusicStore/project.json
index e51f8c7ae4..9a53494e2d 100644
--- a/src/MusicStore/project.json
+++ b/src/MusicStore/project.json
@@ -6,7 +6,7 @@
     "version": "1.0.0-*",
     "compilationOptions": { "warningsAsErrors": true, "define": [ "DEMO", "TESTING" ] },
     "compile": [
-        "../../test/E2ETests/compiler/shared/**/*.cs"
+        "../../shared/**/*.cs"
     ],
     "publishExclude": "*.cmd",
     "webroot": "wwwroot",
diff --git a/test/E2ETests/project.json b/test/E2ETests/project.json
index b4e94f79d4..7ffc5a56a2 100644
--- a/test/E2ETests/project.json
+++ b/test/E2ETests/project.json
@@ -1,26 +1,29 @@
 {
-    "compilationOptions": {
-        "warningsAsErrors": true
-    },
-    "commands": {
-        "test": "xunit.runner.aspnet"
-    },
-    "dependencies": {
-        "Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*",
-        "Microsoft.AspNet.Server.IIS": "1.0.0-*",
-        "Microsoft.AspNet.Server.Testing": "1.0.0-*",
-        "Microsoft.AspNet.WebUtilities": "1.0.0-*",
-        "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
-        "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-        "xunit.runner.aspnet": "2.0.0-aspnet-*"
-    },
-    "frameworks": {
-        "dnx451": {
-            "frameworkAssemblies": {
-                "System.Data": "",
-                "System.Net.Http": "",
-                "System.Xml": ""
-            }
-        }
+  "compilationOptions": {
+    "warningsAsErrors": true
+  },
+  "compile": [
+    "../../shared/**/*.cs"
+  ],
+  "commands": {
+    "test": "xunit.runner.aspnet"
+  },
+  "dependencies": {
+    "Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*",
+    "Microsoft.AspNet.Server.IIS": "1.0.0-*",
+    "Microsoft.AspNet.Server.Testing": "1.0.0-*",
+    "Microsoft.AspNet.WebUtilities": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-*",
+    "xunit.runner.aspnet": "2.0.0-aspnet-*"
+  },
+  "frameworks": {
+    "dnx451": {
+      "frameworkAssemblies": {
+        "System.Data": "",
+        "System.Net.Http": "",
+        "System.Xml": ""
+      }
     }
+  }
 }
\ No newline at end of file
diff --git a/test/RemoteTest.ps1 b/test/RemoteTest.ps1
index 61d1127d4d..c99c88b235 100644
--- a/test/RemoteTest.ps1
+++ b/test/RemoteTest.ps1
@@ -14,7 +14,7 @@ Write-Host "Test folder:  $serverFolder"
 $projectName = (get-item $projectFile).Directory.Name
 Write-Host "Test project: $projectName"
 
-Invoke-Expression "..\tools\BundleAndDeploy.ps1 -projectFile $projectFile -server $server -serverFolder $serverFolder -userName $userName -password $password"
+Invoke-Expression "..\tools\BundleAndDeploy.ps1 -projectFile $projectFile -server $server -serverFolder $serverFolder -userName $userName -password `"$password`""
 
 $pass = ConvertTo-SecureString $password -AsPlainText -Force
 $cred = New-Object System.Management.Automation.PSCredential ($userName, $pass);
@@ -28,7 +28,7 @@ $remoteScript = {
     dir 
     $env:DNX_TRACE=1
     
-    $output = & .\test.cmd 2>&1
+    $output = & .\approot\test.cmd 2>&1
     $output
     $lastexitcode
 }
@@ -38,8 +38,10 @@ $remoteJob = Invoke-Command -ComputerName $server -Credential $cred -ScriptBlock
 Wait-Job $remoteJob
 Write-Host "<<<< Remote execution code completed >>>>"
 
+Write-Host ">>>> Remote execution output <<<<"
 $remoteResult = Receive-Job $remoteJob
 $remoteResult
+Write-Host "<<<< End of remote execution output >>>>"
 
 $finalExitCode = $remoteResult[$remoteResult.Length-1]
 exit $finalExitCode
diff --git a/tools/BundleAndDeploy.ps1 b/tools/BundleAndDeploy.ps1
index 77d1404441..bbc0ed394c 100644
--- a/tools/BundleAndDeploy.ps1
+++ b/tools/BundleAndDeploy.ps1
@@ -55,7 +55,7 @@ try
     Write-Host "Bundling the application..."
     cd "$workDir"
     dnvm use default -r CoreCLR -arch x64
-    dnu publish --runtime active
+    dnu publish --runtime active --no-source
     if ($lastexitcode -ne 0) {
         Write-Error "Failed to bundle the application"
         exit 1