diff --git a/test/Microsoft.AspNet.Mvc.Abstractions.Test/Microsoft.AspNet.Mvc.Abstractions.Test.xproj b/test/Microsoft.AspNet.Mvc.Abstractions.Test/Microsoft.AspNet.Mvc.Abstractions.Test.xproj
index f815ebafa1..52e8a764de 100644
--- a/test/Microsoft.AspNet.Mvc.Abstractions.Test/Microsoft.AspNet.Mvc.Abstractions.Test.xproj
+++ b/test/Microsoft.AspNet.Mvc.Abstractions.Test/Microsoft.AspNet.Mvc.Abstractions.Test.xproj
@@ -13,5 +13,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj
index 28b82f4506..e146dc562f 100644
--- a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj
+++ b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/Microsoft.AspNet.Mvc.ApiExplorer.Test.xproj
@@ -4,7 +4,6 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>4c2ad8ab-8ac0-46c4-80c6-c5577c7255f6</ProjectGuid>
@@ -12,9 +11,11 @@
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelExpression.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelExpression.cs
deleted file mode 100644
index 380961ed86..0000000000
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/ModelExpression.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.AspNet.Mvc.Rendering
-{
-    // This is here to mimic the real ModelExpression type defined in Microsoft.AspNet.Mvc.Core.
-    public class ModelExpression
-    {
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json
index acce35554a..657c84496e 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json
@@ -1,5 +1,5 @@
 {
-    "resources": "TestFiles/**",
+    "resource": "TestFiles/**",
     "dependencies": {
         "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
         "Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*",
diff --git a/test/WebSites/FilesWebSite/project.json b/test/WebSites/FilesWebSite/project.json
index 1352a364a1..de2b6a03d4 100644
--- a/test/WebSites/FilesWebSite/project.json
+++ b/test/WebSites/FilesWebSite/project.json
@@ -3,7 +3,7 @@
         "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001",
         "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000"
     },
-    "resources": "EmbeddedResources/**",
+    "resource": "EmbeddedResources/**",
     "dependencies": {
         "Kestrel": "1.0.0-*",
         "Microsoft.AspNet.FileProviders.Embedded": "1.0.0-*",
diff --git a/test/WebSites/RazorEmbeddedViewsWebSite/project.json b/test/WebSites/RazorEmbeddedViewsWebSite/project.json
index 2a10f79961..887eb052a3 100644
--- a/test/WebSites/RazorEmbeddedViewsWebSite/project.json
+++ b/test/WebSites/RazorEmbeddedViewsWebSite/project.json
@@ -3,7 +3,7 @@
         "web": "Microsoft.AspNet.Hosting server=Microsoft.AspNet.Server.WebListener server.urls=http://localhost:5001",
         "kestrel": "Microsoft.AspNet.Hosting --server Kestrel --server.urls http://localhost:5000"
     },
-    "resources": "EmbeddedResources/**",
+    "resource": "EmbeddedResources/**",
     "dependencies": {
         "Kestrel": "1.0.0-*",
         "Microsoft.AspNet.FileProviders.Embedded": "1.0.0-*",