diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationTestFixture.cs b/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationTestFixture.cs
index 47023fe0ca..0e321955bc 100644
--- a/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationTestFixture.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationTestFixture.cs
@@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Mvc.Testing
         /// <param name="solutionRelativePath">The path to the project folder relative to the solution file of your
         /// application. The folder of the first .sln file found traversing up the folder hierarchy from the test execution
         /// folder is considered as the base path.</param>
-        public WebApplicationTestFixture(string solutionRelativePath)
+        protected WebApplicationTestFixture(string solutionRelativePath)
             : this("*.sln", solutionRelativePath)
         {
         }
@@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Mvc.Testing
         /// <param name="solutionRelativePath">The path to the project folder relative to the solution file of your
         /// application. The folder of the first sln file that matches the <paramref name="solutionSearchPattern"/>
         /// found traversing up the folder hierarchy from the test execution folder is considered as the base path.</param>
-        public WebApplicationTestFixture(string solutionSearchPattern, string solutionRelativePath)
+        protected WebApplicationTestFixture(string solutionSearchPattern, string solutionRelativePath)
         {
             EnsureDepsFile();
 
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json b/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json
index 25e53f15f2..7a73a41bfd 100644
--- a/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json
+++ b/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json
@@ -1,140 +1,2 @@
 {
-  "AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Testing, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
-  "Types": [
-    {
-      "Name": "Microsoft.AspNetCore.Mvc.Testing.WebApplicationTestFixture<T0>",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "ImplementedInterfaces": [
-        "System.IDisposable"
-      ],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "CreateWebHostBuilder",
-          "Parameters": [],
-          "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
-          "Virtual": true,
-          "Visibility": "Protected",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "CreateServer",
-          "Parameters": [
-            {
-              "Name": "builder",
-              "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder"
-            }
-          ],
-          "ReturnType": "Microsoft.AspNetCore.TestHost.TestServer",
-          "Virtual": true,
-          "Visibility": "Protected",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "ConfigureWebHost",
-          "Parameters": [
-            {
-              "Name": "builder",
-              "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Protected",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_Client",
-          "Parameters": [],
-          "ReturnType": "System.Net.Http.HttpClient",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "CreateClient",
-          "Parameters": [],
-          "ReturnType": "System.Net.Http.HttpClient",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "CreateClient",
-          "Parameters": [
-            {
-              "Name": "baseAddress",
-              "Type": "System.Uri"
-            },
-            {
-              "Name": "handlers",
-              "Type": "System.Net.Http.DelegatingHandler[]",
-              "IsParams": true
-            }
-          ],
-          "ReturnType": "System.Net.Http.HttpClient",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "Dispose",
-          "Parameters": [],
-          "ReturnType": "System.Void",
-          "Sealed": true,
-          "Virtual": true,
-          "ImplementedInterface": "System.IDisposable",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [],
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "solutionRelativePath",
-              "Type": "System.String"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "solutionSearchPattern",
-              "Type": "System.String"
-            },
-            {
-              "Name": "solutionRelativePath",
-              "Type": "System.String"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": [
-        {
-          "ParameterName": "TStartup",
-          "ParameterPosition": 0,
-          "Class": true,
-          "BaseTypeOrInterfaces": []
-        }
-      ]
-    }
-  ]
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets b/src/Microsoft.AspNetCore.Mvc.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets
index 3c845461e2..c1637af208 100644
--- a/src/Microsoft.AspNetCore.Mvc.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets
+++ b/src/Microsoft.AspNetCore.Mvc.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets
@@ -15,18 +15,6 @@
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.0' ">
-    <!-- Work around https://github.com/dotnet/sdk/issues/926. Align with bitness of the web site projects. -->
-    <PlatformTarget>x86</PlatformTarget>
-
-    <!--
-      Work around https://github.com/Microsoft/vstest/issues/428 aka https://github.com/aspnet/Mvc/issues/5873.
-      Create the appropriate binding redirects.
-    -->
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-  </PropertyGroup>
-
   <Target Name="CopyAditionalFiles" AfterTargets="Build" Condition="'$(TargetFramework)'!=''">
     <ItemGroup>
       <DepsFilePaths Include="$([System.IO.Path]::ChangeExtension('%(_ResolvedProjectReferencePaths.FullPath)', '.deps.json'))" />