diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
index 44de0d8c2..14605e2de 100644
--- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
+++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
-    <OutputPath>bin\$(Configuration)\netcoreapp1.0</OutputPath>
+    <OutputPath>bin\$(Configuration)</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/dotnet/commands/dotnet-new/Program.cs b/src/dotnet/commands/dotnet-new/Program.cs
index cd0adaaad..396253a46 100644
--- a/src/dotnet/commands/dotnet-new/Program.cs
+++ b/src/dotnet/commands/dotnet-new/Program.cs
@@ -95,9 +95,12 @@ namespace Microsoft.DotNet.Tools.New
         {
             string projectJsonFile = Path.Combine(projectDirectory, "project.json");
 
-            File.Move(
-                Path.Combine(projectDirectory, "project.json.template"),
-                projectJsonFile);
+            if(File.Exists(Path.Combine(projectDirectory, "project.json.template")))
+            {
+                File.Move(
+                    Path.Combine(projectDirectory, "project.json.template"),
+                    projectJsonFile);
+            }
         }
 
         private static void ReplaceFileTemplateNames(string projectDirectory)
diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs
index 24a85fa11..d0767a870 100644
--- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs
+++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs
@@ -21,7 +21,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
                     .Should()
                     .Pass();
 
-                new RestoreCommand()
+                new Restore3Command()
                     .WithWorkingDirectory(projectDirectory)
                     .Execute()
                     .Should()
@@ -35,7 +35,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
 
                 new Run3Command()
                     .WithWorkingDirectory(projectDirectory)
-                    .ExecuteWithCapturedOutput()
+                    .ExecuteWithCapturedOutput("--framework netcoreapp1.0")
                     .Should()
                     .Pass()
                     .And
diff --git a/test/dotnet-publish3.Tests/GivenDotnetPublish3PublishesProjects.cs b/test/dotnet-publish3.Tests/GivenDotnetPublish3PublishesProjects.cs
index 2585a8d13..4d6a14b3f 100644
--- a/test/dotnet-publish3.Tests/GivenDotnetPublish3PublishesProjects.cs
+++ b/test/dotnet-publish3.Tests/GivenDotnetPublish3PublishesProjects.cs
@@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Cli.Publish3.Tests
 
             new Publish3Command()
                 .WithWorkingDirectory(testProjectDirectory)
-                .Execute()
+                .Execute("--framework netcoreapp1.0")
                 .Should()
                 .Pass();
 
diff --git a/test/dotnet-run3.Tests/GivenDotnetRun3RunsCsProj.cs b/test/dotnet-run3.Tests/GivenDotnetRun3RunsCsProj.cs
index b42135e87..a756f1a5d 100644
--- a/test/dotnet-run3.Tests/GivenDotnetRun3RunsCsProj.cs
+++ b/test/dotnet-run3.Tests/GivenDotnetRun3RunsCsProj.cs
@@ -31,7 +31,7 @@ namespace Microsoft.DotNet.Cli.Run3.Tests
 
             new Run3Command()
                 .WithWorkingDirectory(testProjectDirectory)
-                .ExecuteWithCapturedOutput()
+                .ExecuteWithCapturedOutput("--framework netcoreapp1.0")
                 .Should()
                 .Pass()
                 .And
@@ -55,7 +55,7 @@ namespace Microsoft.DotNet.Cli.Run3.Tests
 
             new Run3Command()
                 .WithWorkingDirectory(testProjectDirectory)
-                .ExecuteWithCapturedOutput()
+                .ExecuteWithCapturedOutput("--framework netcoreapp1.0")
                 .Should()
                 .Pass()
                 .And