From 3bdb33ccd4dbe5baa3162ca3d3778df1883db093 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Tue, 3 Jul 2018 16:46:39 -0700
Subject: [PATCH 1/4] Sync native calls

---
 .../Core/IISHttpContext.FeatureCollection.cs  |  9 ++-
 .../Core/IISHttpContext.cs                    | 20 ++---
 .../Core/IO/AsyncIOEngine.cs                  | 10 ++-
 .../Core/IO/WebSocketsAsyncIOEngine.cs        | 79 +++++++++++--------
 .../NativeMethods.cs                          | 13 +--
 5 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs
index 05c376de0e..a2cd22d113 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs
+++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs
@@ -182,7 +182,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
 
         bool IHttpResponseFeature.HasStarted => HasResponseStarted;
 
-        bool IHttpUpgradeFeature.IsUpgradableRequest => _server.IsWebSocketAvailable(_pInProcessHandler);
+        bool IHttpUpgradeFeature.IsUpgradableRequest => true;
 
         bool IFeatureCollection.IsReadOnly => false;
 
@@ -205,7 +205,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
                     return null;
                 }
 
-                return NativeMethods.HttpTryGetServerVariable(_pInProcessHandler, variableName, out var value) ? value : null;
+                lock (_contextLock)
+                {
+                    return NativeMethods.HttpTryGetServerVariable(_pInProcessHandler, variableName, out var value) ? value : null;
+                }
             }
         }
 
@@ -265,7 +268,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
             _hasRequestReadingStarted = false;
 
             // Upgrade async will cause the stream processing to go into duplex mode
-            AsyncIO = new WebSocketsAsyncIOEngine(_pInProcessHandler);
+            AsyncIO = new WebSocketsAsyncIOEngine(_contextLock, _pInProcessHandler);
 
             await InitializeResponse(flushHeaders: true);
 
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs
index 1866967527..15c69432ed 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs
+++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.cs
@@ -28,7 +28,6 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
         private const int PauseWriterThreshold = 65536;
         private const int ResumeWriterTheshold = PauseWriterThreshold / 2;
 
-
         protected readonly IntPtr _pInProcessHandler;
 
         private readonly IISServerOptions _options;
@@ -38,8 +37,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
 
         private int _statusCode;
         private string _reasonPhrase;
-        private readonly object _onStartingSync = new object();
-        private readonly object _onCompletedSync = new object();
+        // Used to synchronize callback registration and native method calls
+        private readonly object _contextLock = new object();
 
         protected Stack<KeyValuePair<Func<object, Task>, object>> _onStarting;
         protected Stack<KeyValuePair<Func<object, Task>, object>> _onCompleted;
@@ -241,7 +240,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
             // If at this point request was not upgraded just start a normal IO engine
             if (AsyncIO == null)
             {
-                AsyncIO = new AsyncIOEngine(_pInProcessHandler);
+                AsyncIO = new AsyncIOEngine(_contextLock, _pInProcessHandler);
             }
         }
 
@@ -341,7 +340,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
 
         public void OnStarting(Func<object, Task> callback, object state)
         {
-            lock (_onStartingSync)
+            lock (_contextLock)
             {
                 if (HasResponseStarted)
                 {
@@ -358,7 +357,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
 
         public void OnCompleted(Func<object, Task> callback, object state)
         {
-            lock (_onCompletedSync)
+            lock (_contextLock)
             {
                 if (_onCompleted == null)
                 {
@@ -371,7 +370,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
         protected async Task FireOnStarting()
         {
             Stack<KeyValuePair<Func<object, Task>, object>> onStarting = null;
-            lock (_onStartingSync)
+            lock (_contextLock)
             {
                 onStarting = _onStarting;
                 _onStarting = null;
@@ -395,7 +394,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
         protected async Task FireOnCompleted()
         {
             Stack<KeyValuePair<Func<object, Task>, object>> onCompleted = null;
-            lock (_onCompletedSync)
+            lock (_contextLock)
             {
                 onCompleted = _onCompleted;
                 _onCompleted = null;
@@ -438,11 +437,6 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
             NativeMethods.HttpPostCompletion(_pInProcessHandler, 0);
         }
 
-        public void IndicateCompletion(NativeMethods.REQUEST_NOTIFICATION_STATUS notificationStatus)
-        {
-            NativeMethods.HttpIndicateCompletion(_pInProcessHandler, notificationStatus);
-        }
-
         internal void OnAsyncCompletion(int hr, int bytes)
         {
             AsyncIO.NotifyCompletion(hr, bytes);
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs
index 614367255a..b07d411630 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs
+++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs
@@ -12,6 +12,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO
 {
     internal partial class AsyncIOEngine : IAsyncIOEngine
     {
+        private readonly object _contextSync;
         private readonly IntPtr _handler;
 
         private bool _stopped;
@@ -23,8 +24,9 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO
         private AsyncWriteOperation _cachedAsyncWriteOperation;
         private AsyncFlushOperation _cachedAsyncFlushOperation;
 
-        public AsyncIOEngine(IntPtr handler)
+        public AsyncIOEngine(object contextSync, IntPtr handler)
         {
+            this._contextSync = contextSync;
             _handler = handler;
         }
 
@@ -46,7 +48,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO
 
         private void Run(AsyncIOOperation ioOperation)
         {
-            lock (this)
+            lock (_contextSync)
             {
                 if (_stopped)
                 {
@@ -99,7 +101,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO
             AsyncIOOperation.AsyncContinuation continuation;
             AsyncIOOperation.AsyncContinuation? nextContinuation = null;
 
-            lock (this)
+            lock (_contextSync)
             {
                 Debug.Assert(_runningOperation != null);
 
@@ -135,7 +137,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO
 
         public void Dispose()
         {
-            lock (this)
+            lock (_contextSync)
             {
                 _stopped = true;
                 NativeMethods.HttpTryCancelIO(_handler);
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs
index 0c04523cb0..38c737dbce 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs
+++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/WebSocketsAsyncIOEngine.cs
@@ -10,6 +10,8 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO
 {
     internal partial class WebSocketsAsyncIOEngine: IAsyncIOEngine
     {
+        private readonly object _contextLock;
+
         private readonly IntPtr _handler;
 
         private bool _isInitialized;
@@ -22,55 +24,65 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO
 
         private AsyncInitializeOperation _cachedAsyncInitializeOperation;
 
-        public WebSocketsAsyncIOEngine(IntPtr handler)
+        public WebSocketsAsyncIOEngine(object contextLock, IntPtr handler)
         {
+            _contextLock = contextLock;
             _handler = handler;
         }
 
         public ValueTask<int> ReadAsync(Memory<byte> memory)
         {
-            ThrowIfNotInitialized();
+            lock (_contextLock)
+            {
+                ThrowIfNotInitialized();
 
-            var read = GetReadOperation();
-            read.Initialize(_handler, memory);
-            read.Invoke();
-            return new ValueTask<int>(read, 0);
+                var read = GetReadOperation();
+                read.Initialize(_handler, memory);
+                read.Invoke();
+                return new ValueTask<int>(read, 0);   
+            }
         }
 
         public ValueTask<int> WriteAsync(ReadOnlySequence<byte> data)
         {
-            ThrowIfNotInitialized();
+            lock (_contextLock)
+            {
+                ThrowIfNotInitialized();
 
-            var write = GetWriteOperation();
-            write.Initialize(_handler, data);
-            write.Invoke();
-            return new ValueTask<int>(write, 0);
+                var write = GetWriteOperation();
+                write.Initialize(_handler, data);
+                write.Invoke();
+                return new ValueTask<int>(write, 0);
+            }
         }
 
         public ValueTask FlushAsync()
         {
-            if (_isInitialized)
+            lock (_contextLock)
             {
-                return new ValueTask(Task.CompletedTask);
+                if (_isInitialized)
+                {
+                    return new ValueTask(Task.CompletedTask);
+                }
+
+                NativeMethods.HttpEnableWebsockets(_handler);
+
+                var init = GetInitializeOperation();
+                init.Initialize(_handler);
+
+                var continuation = init.Invoke();
+
+                if (continuation != null)
+                {
+                    _isInitialized = true;
+                }
+                else
+                {
+                    _initializationFlush = init;
+                }
+
+                return new ValueTask(init, 0);
             }
-
-            NativeMethods.HttpEnableWebsockets(_handler);
-
-            var init = GetInitializeOperation();
-            init.Initialize(_handler);
-
-            var continuation = init.Invoke();
-
-            if (continuation != null)
-            {
-                _isInitialized = true;
-            }
-            else
-            {
-                _initializationFlush = init;
-            }
-
-            return new ValueTask(init, 0);
         }
 
         public void NotifyCompletion(int hr, int bytes)
@@ -100,7 +112,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO
 
         public void Dispose()
         {
-            NativeMethods.HttpTryCancelIO(_handler);
+            lock (_contextLock)
+            {
+                NativeMethods.HttpTryCancelIO(_handler);
+            }
         }
 
         private WebSocketReadOperation GetReadOperation() =>
diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs
index 55b8084e59..de7bcb0562 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs
+++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs
@@ -70,9 +70,6 @@ namespace Microsoft.AspNetCore.Server.IIS
         [DllImport(AspNetCoreModuleDll)]
         private static extern int http_stop_incoming_requests(IntPtr pInProcessApplication);
 
-        [DllImport(AspNetCoreModuleDll)]
-        private static extern unsafe HttpApiTypes.HTTP_RESPONSE_V2* http_get_raw_response(IntPtr pInProcessHandler);
-
         [DllImport(AspNetCoreModuleDll, CharSet = CharSet.Ansi)]
         private static extern int http_set_response_status_code(IntPtr pInProcessHandler, ushort statusCode, string pszReason);
 
@@ -138,10 +135,6 @@ namespace Microsoft.AspNetCore.Server.IIS
             Validate(http_set_completion_status(pInProcessHandler, rquestNotificationStatus));
         }
 
-        public static void HttpIndicateCompletion(IntPtr pInProcessHandler, REQUEST_NOTIFICATION_STATUS notificationStatus)
-        {
-            http_indicate_completion(pInProcessHandler, notificationStatus);
-        }
         public static void HttpRegisterCallbacks(IntPtr pInProcessApplication, PFN_REQUEST_HANDLER requestCallback, PFN_SHUTDOWN_HANDLER shutdownCallback, PFN_ASYNC_COMPLETION asyncCallback, IntPtr pvRequestContext, IntPtr pvShutdownContext)
         {
             Validate(register_callbacks(pInProcessApplication, requestCallback, shutdownCallback, asyncCallback, pvRequestContext, pvShutdownContext));
@@ -156,6 +149,7 @@ namespace Microsoft.AspNetCore.Server.IIS
         {
             return http_flush_response_bytes(pInProcessHandler, out fCompletionExpected);
         }
+
         public static unsafe HttpApiTypes.HTTP_REQUEST_V2* HttpGetRawRequest(IntPtr pInProcessHandler)
         {
             return http_get_raw_request(pInProcessHandler);
@@ -171,11 +165,6 @@ namespace Microsoft.AspNetCore.Server.IIS
             Validate(http_stop_incoming_requests(pInProcessApplication));
         }
 
-        public static unsafe HttpApiTypes.HTTP_RESPONSE_V2* HttpGetRawResponse(IntPtr pInProcessHandler)
-        {
-            return http_get_raw_response(pInProcessHandler);
-        }
-
         public static void HttpSetResponseStatusCode(IntPtr pInProcessHandler, ushort statusCode, string pszReason)
         {
             Validate(http_set_response_status_code(pInProcessHandler, statusCode, pszReason));

From b280597c689e5e4ae457d8050cda999b5b93f738 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Thu, 5 Jul 2018 09:01:47 -0700
Subject: [PATCH 2/4] fb

---
 .../Core/IISHttpContext.FeatureCollection.cs                    | 1 +
 src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs
index a2cd22d113..4c2d4342b9 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs
+++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpContext.FeatureCollection.cs
@@ -205,6 +205,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
                     return null;
                 }
 
+                // Synchronize access to native methods that might run in parallel with IO loops
                 lock (_contextLock)
                 {
                     return NativeMethods.HttpTryGetServerVariable(_pInProcessHandler, variableName, out var value) ? value : null;
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs
index b07d411630..e7a01b331d 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs
+++ b/src/Microsoft.AspNetCore.Server.IIS/Core/IO/AsyncIOEngine.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core.IO
 
         public AsyncIOEngine(object contextSync, IntPtr handler)
         {
-            this._contextSync = contextSync;
+            _contextSync = contextSync;
             _handler = handler;
         }
 

From 5f02de1e2c9963bc4e108c1309f0477b5250f738 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Fri, 6 Jul 2018 11:36:51 -0700
Subject: [PATCH 3/4] Test

---
 .../AspNetCore/src/applicationinfo.cpp        |  6 -----
 .../Inprocess/ServerVariablesTest.cs          | 26 +++++++++++++++++++
 test/WebSites/InProcessWebSite/Startup.cs     | 16 ++++++++++++
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp
index ccbd586f3e..2919b7cf4c 100644
--- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp
+++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp
@@ -187,12 +187,6 @@ APPLICATION_INFO::EnsureApplicationCreated(
     // one optimization for failure scenario is to reduce the lock scope
     SRWExclusiveLock lock(m_srwLock);
 
-    if (m_fDoneAppCreation)
-    {
-        // application is NULL and CreateApplication failed previously
-        FINISHED(E_APPLICATION_ACTIVATION_EXEC_FAILURE);
-    }
-    else
     {
         if (m_pApplication != NULL)
         {
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs b/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs
index 56b04c208e..020ef00213 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs
+++ b/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs
@@ -1,6 +1,8 @@
 // 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.
 
+using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
@@ -38,5 +40,29 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         {
             Assert.DoesNotContain(@"\\?\", await _fixture.Client.GetStringAsync("/BasePath"));
         }
+
+        [ConditionalFact]
+        public async Task GetServerVariableDoesNotCrash()
+        {
+            async Task RunRequests()
+            {
+                var client = new HttpClient() { BaseAddress = _fixture.Client.BaseAddress };
+
+                for (int j = 0; j < 10; j++)
+                {
+                    var response = await client.GetStringAsync("/GetServerVariableStress");
+                    Assert.StartsWith("Response Begin", response);
+                    Assert.EndsWith("Response End", response);
+                }
+            }
+
+            List<Task> tasks = new List<Task>();
+            for (int i = 0; i < 10; i++)
+            {
+                tasks.Add(Task.Run(RunRequests));
+            }
+
+            await Task.WhenAll(tasks);
+        }
     }
 }
diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/test/WebSites/InProcessWebSite/Startup.cs
index 3aaba9b44f..2bf89384f8 100644
--- a/test/WebSites/InProcessWebSite/Startup.cs
+++ b/test/WebSites/InProcessWebSite/Startup.cs
@@ -738,5 +738,21 @@ namespace IISTestSite
                 ctx.RequestServices.GetService<IApplicationLifetime>().StopApplication();
             });
         }
+
+        private async Task GetServerVariableStress(HttpContext context)
+        {
+            // This test simulates the scenario where native Flush call is being
+            // executed on background thread while request thread calls GetServerVariable
+            // concurrent native calls may cause native object corruption
+
+            await context.Response.WriteAsync("Response Begin");
+            for (int i = 0; i < 1000; i++)
+            {
+                await context.Response.WriteAsync(context.GetIISServerVariable("REMOTE_PORT"));
+                await context.Response.Body.FlushAsync();
+            }
+            await context.Response.WriteAsync("Response End");
+        }
+
     }
 }

From 8ad64d2a35bd4cfb73aa4de3ddce86b7a19e76bb Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Fri, 6 Jul 2018 16:16:29 -0700
Subject: [PATCH 4/4] Port IISExpress tests to run on both IIS and IISExpress
 (#1010)

---
 IISIntegration.NoV1.sln                       |  17 +-
 IISIntegration.sln                            |  17 +-
 .../IIS.Performance/IIS.Performance.csproj    |   4 +-
 .../IIS.Performance/StartupTimeBenchmark.cs   |   2 +-
 build/repo.props                              |   5 -
 .../AspNetCoreModuleTests.vcxproj             | 178 -----
 test/AspNetCoreModuleTests/stdafx.h           |  56 --
 .../AppHostConfig/HostableWebCore.config}     |   0
 .../AppHostConfig/IIS.config                  | 741 ++++++++++++++++++
 .../AppHostConfig/IISExpress.config}          |  11 -
 .../Inprocess/EnvironmentVariableTests.cs     |   2 -
 .../Inprocess/FeatureCollectionTests.cs       |   3 -
 .../Inprocess/HelloWorldTests.cs              |   3 -
 .../InvalidReadWriteOperationTests.cs         |   2 -
 .../Inprocess/LargeResponseBodyTests.cs       |   2 -
 .../Inprocess/ResponseHeaderTests.cs          |   3 -
 .../Inprocess/ResponseInvalidOrderingTests.cs |   1 -
 .../Inprocess/ServerVariablesTest.cs          |   1 -
 .../Inprocess/SynchronousReadAndWriteTests.cs |   1 -
 .../OutOfProcess/HelloWorldTest.cs            |  13 +-
 .../Properties/AssemblyInfo.cs                |   3 +-
 .../Utilities/FunctionalTestsBase.cs          |   8 +-
 .../Utilities/Helpers.cs                      |   2 +-
 .../Utilities/IISApplication.cs               |  68 +-
 .../Utilities/IISDeployer.cs                  |   6 +-
 .../Utilities/IISDeploymentResult.cs          |   0
 .../Utilities/IISFunctionalTestBase.cs        |  15 +-
 .../Utilities/IISTestSiteCollection.cs        |   0
 .../Utilities/IISTestSiteFixture.cs           |  13 +-
 .../Utilities/LoggingHandler.cs               |   0
 .../Utilities/RetryHandler.cs                 |   0
 ...pIfHostableWebCoreNotAvailibleAttribute.cs |   0
 .../Utilities/TestConnections.cs              |   0
 .../Utilities/TestIISUriHelper.cs             |   0
 .../Utilities/TestServer.cs                   |   4 +-
 test/IIS.FunctionalTests/DeployerSelector.cs  |  12 +
 .../IIS.FunctionalTests.csproj}               |  18 +-
 .../SkipIISTestAttribute.cs}                  |   5 +-
 .../DeployerSelector.cs                       |  12 +
 .../IISExpress.FunctionalTests.csproj         |  55 ++
 .../InProcess}/AppOfflineTests.cs             |   6 +-
 .../InProcess}/AuthenticationTests.cs         |  26 +-
 .../InProcess}/LoggingTests.cs                |   7 +-
 .../InProcess}/ShutdownTests.cs               |   4 +-
 .../InProcess}/StartupExceptionTests.cs       |  12 +-
 .../InProcess}/StartupTests.cs                |   7 +-
 .../InProcess}/TestServerTest.cs              |   2 +-
 .../InProcess}/WebSocketTests.cs              |   0
 .../OutOfProcess/GlobalVersionTests.cs        |   4 +-
 .../OutOfProcess/HttpsTest.cs                 |   5 +-
 .../OutOfProcess/NtlmAuthentationTest.cs      |   9 +-
 .../OutOfProcess/WindowsAuthTests.cs          |  45 ++
 .../SkipIISTestAttribute.cs                   |  17 +
 .../UpgradeFeatureDetectionTests.cs           |  26 +-
 .../Inprocess/IISTests.cs                     |  40 -
 .../InProcessWebSite/Startup.WebSockets.cs    |   2 +-
 test/WebSites/OutOfProcessWebSite/Startup.cs  |   1 +
 test/WebSites/StressTestWebSite/Startup.cs    |   2 +-
 test/WebSites/shared/WebSockets/Constants.cs  |   2 +-
 .../shared/WebSockets/HandshakeHelpers.cs     |   2 +-
 60 files changed, 1087 insertions(+), 415 deletions(-)
 delete mode 100644 test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj
 delete mode 100644 test/AspNetCoreModuleTests/stdafx.h
 rename test/{IISIntegration.FunctionalTests/AppHostConfig/TestServer.config => Common.FunctionalTests/AppHostConfig/HostableWebCore.config} (100%)
 create mode 100644 test/Common.FunctionalTests/AppHostConfig/IIS.config
 rename test/{IISIntegration.FunctionalTests/AppHostConfig/Http.config => Common.FunctionalTests/AppHostConfig/IISExpress.config} (99%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/EnvironmentVariableTests.cs (95%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/FeatureCollectionTests.cs (89%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/HelloWorldTests.cs (89%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/InvalidReadWriteOperationTests.cs (97%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/LargeResponseBodyTests.cs (92%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/ResponseHeaderTests.cs (96%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/ResponseInvalidOrderingTests.cs (95%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/ServerVariablesTest.cs (98%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Inprocess/SynchronousReadAndWriteTests.cs (99%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/OutOfProcess/HelloWorldTest.cs (85%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Properties/AssemblyInfo.cs (72%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/FunctionalTestsBase.cs (79%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/Helpers.cs (97%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISApplication.cs (83%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISDeployer.cs (93%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISDeploymentResult.cs (100%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISFunctionalTestBase.cs (66%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISTestSiteCollection.cs (100%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/IISTestSiteFixture.cs (75%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/LoggingHandler.cs (100%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/RetryHandler.cs (100%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs (100%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/TestConnections.cs (100%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/TestIISUriHelper.cs (100%)
 rename test/{IISIntegration.FunctionalTests => Common.FunctionalTests}/Utilities/TestServer.cs (97%)
 create mode 100644 test/IIS.FunctionalTests/DeployerSelector.cs
 rename test/{IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj => IIS.FunctionalTests/IIS.FunctionalTests.csproj} (90%)
 rename test/{IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs => IIS.FunctionalTests/SkipIISTestAttribute.cs} (92%)
 create mode 100644 test/IISExpress.FunctionalTests/DeployerSelector.cs
 create mode 100644 test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
 rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/AppOfflineTests.cs (95%)
 rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/AuthenticationTests.cs (71%)
 rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/LoggingTests.cs (95%)
 rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/ShutdownTests.cs (86%)
 rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/StartupExceptionTests.cs (91%)
 rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/StartupTests.cs (96%)
 rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/TestServerTest.cs (95%)
 rename test/{IISIntegration.FunctionalTests/Inprocess => IISExpress.FunctionalTests/InProcess}/WebSocketTests.cs (100%)
 rename test/{IISIntegration.FunctionalTests => IISExpress.FunctionalTests}/OutOfProcess/GlobalVersionTests.cs (97%)
 rename test/{IISIntegration.FunctionalTests => IISExpress.FunctionalTests}/OutOfProcess/HttpsTest.cs (97%)
 rename test/{IISIntegration.FunctionalTests => IISExpress.FunctionalTests}/OutOfProcess/NtlmAuthentationTest.cs (88%)
 create mode 100644 test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs
 create mode 100644 test/IISExpress.FunctionalTests/SkipIISTestAttribute.cs
 rename test/{IISIntegration.FunctionalTests => IISExpress.FunctionalTests}/UpgradeFeatureDetectionTests.cs (81%)
 delete mode 100644 test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs

diff --git a/IISIntegration.NoV1.sln b/IISIntegration.NoV1.sln
index c2bd1b9ade..04bda53889 100644
--- a/IISIntegration.NoV1.sln
+++ b/IISIntegration.NoV1.sln
@@ -49,7 +49,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E
 		build\testsite.props = build\testsite.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISIntegration.FunctionalTests", "test\IISIntegration.FunctionalTests\IISIntegration.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests", "test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67}
 	EndProjectSection
@@ -109,6 +109,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.v
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{D182103F-8405-4647-B158-C36F598657EF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -353,6 +355,18 @@ Global
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Build.0 = Release|Win32
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|x64.Build.0 = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Debug|x86.Build.0 = Debug|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|x64.ActiveCfg = Release|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|x64.Build.0 = Release|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{D182103F-8405-4647-B158-C36F598657EF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -381,6 +395,7 @@ Global
 		{340C59FC-C682-4CBA-81F8-791821EC8EDE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
 		{CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
 		{1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
+		{D182103F-8405-4647-B158-C36F598657EF} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5}
diff --git a/IISIntegration.sln b/IISIntegration.sln
index 86393ab4b7..d3e7ca4de0 100644
--- a/IISIntegration.sln
+++ b/IISIntegration.sln
@@ -49,7 +49,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E
 		build\testsite.props = build\testsite.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISIntegration.FunctionalTests", "test\IISIntegration.FunctionalTests\IISIntegration.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IISExpress.FunctionalTests", "test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj", "{4E3E1F5C-CD52-4CC0-A35F-D1FA1685D2FA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7F87406C-A3C8-4139-A68D-E4C344294A67} = {7F87406C-A3C8-4139-A68D-E4C344294A67}
 	EndProjectSection
@@ -116,6 +116,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "test\gtest\gtest.v
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandlerLib", "src\AspNetCoreModuleV2\RequestHandlerLib\RequestHandlerLib.vcxproj", "{1533E271-F61B-441B-8B74-59FB61DF0552}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -380,6 +382,18 @@ Global
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x64.Build.0 = Release|x64
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.ActiveCfg = Release|Win32
 		{1533E271-F61B-441B-8B74-59FB61DF0552}.Release|x86.Build.0 = Release|Win32
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x64.Build.0 = Debug|Any CPU
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Debug|x86.Build.0 = Debug|Any CPU
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x64.ActiveCfg = Release|Any CPU
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x64.Build.0 = Release|Any CPU
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x86.ActiveCfg = Release|Any CPU
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -411,6 +425,7 @@ Global
 		{340C59FC-C682-4CBA-81F8-791821EC8EDE} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520}
 		{CAC1267B-8778-4257-AAC6-CAF481723B01} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
 		{1533E271-F61B-441B-8B74-59FB61DF0552} = {06CA2C2B-83B0-4D83-905A-E0C74790009E}
+		{1F0C8D9B-F47B-41F3-9FC9-6954B6DC7712} = {EF30B533-D715-421A-92B7-92FEF460AC9C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5}
diff --git a/benchmarks/IIS.Performance/IIS.Performance.csproj b/benchmarks/IIS.Performance/IIS.Performance.csproj
index 179e042514..87102ca7ed 100644
--- a/benchmarks/IIS.Performance/IIS.Performance.csproj
+++ b/benchmarks/IIS.Performance/IIS.Performance.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="..\..\test\IISIntegration.FunctionalTests\AppHostConfig\*.config" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="..\..\test\Common.FunctionalTests\AppHostConfig\*.config" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
-    <ProjectReference Include="..\..\test\IISIntegration.FunctionalTests\IISIntegration.FunctionalTests.csproj" />
+    <ProjectReference Include="..\..\test\IISExpress.FunctionalTests\IISExpress.FunctionalTests.csproj" />
     <ProjectReference Include="..\..\test\WebSites\**\*.csproj">
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/benchmarks/IIS.Performance/StartupTimeBenchmark.cs b/benchmarks/IIS.Performance/StartupTimeBenchmark.cs
index 4e16e33b49..ef66b6b671 100644
--- a/benchmarks/IIS.Performance/StartupTimeBenchmark.cs
+++ b/benchmarks/IIS.Performance/StartupTimeBenchmark.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Performance
                 RuntimeFlavor.CoreClr,
                 RuntimeArchitecture.x64)
             {
-                ServerConfigTemplateContent = File.ReadAllText("Http.config"),
+                ServerConfigTemplateContent = File.ReadAllText("IISExpress.config"),
                 SiteName = "HttpTestSite",
                 TargetFramework = "netcoreapp2.1",
                 ApplicationType = ApplicationType.Portable,
diff --git a/build/repo.props b/build/repo.props
index 93ca7cd881..ba3cca9388 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -9,11 +9,6 @@
   <ItemGroup>
     <ExcludeFromTest Include="$(RepositoryRoot)test\TestSites\*.csproj" />
     <ExcludeFromTest Include="$(RepositoryRoot)test\IISTestSite\*.csproj" />
-    <ExcludeFromTest Include="$(RepositoryRoot)test\IISIntegration.FunctionalTests\*.csproj" Condition="'$(OS)' != 'Windows_NT'" />
-    <ExcludeFromTest Include="$(RepositoryRoot)test\IISIntegration.IISServerFunctionalTests\*.csproj" Condition="'$(OS)' != 'Windows_NT'" />
-    <ExcludeFromTest Include="$(RepositoryRoot)test\AspNetCoreModule.TestSites.Standard\*.csproj" />
-    <ExcludeFromTest Include="$(RepositoryRoot)test\WebSocketClientEXE\*.csproj" />
-    <ExcludeFromTest Include="$(RepositoryRoot)test\AspNetCoreModule.Test\*.csproj" Condition="'$(OS)' != 'Windows_NT'" />
     <ExcludeSolutions Include="$(RepositoryRoot)IISIntegration.NoV1.sln" />
   </ItemGroup>
 
diff --git a/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj b/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj
deleted file mode 100644
index fe6851d189..0000000000
--- a/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{0692D963-DB10-4387-B3EA-460FBB9BD9A3}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>AspNetCoreModuleTests</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
-    <ProjectSubType>NativeUnitTestProject</ProjectSubType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\CommonLib;..\..\src\AspNetCoreModuleV2\IISLib</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\CommonLib;..\..\src\AspNetCoreModuleV2\IISLib</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\CommonLib;..\..\src\AspNetCoreModuleV2\IISLib</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);..\..\src\AspNetCoreModuleV2\CommonLib;..\..\src\AspNetCoreModuleV2\IISLib</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <UseFullPaths>true</UseFullPaths>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="hostfxr_utility_tests.cpp" />
-    <ClCompile Include="utility_tests.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\AspNetCoreModuleV2\CommonLib\CommonLib.vcxproj">
-      <Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj">
-      <Project>{4787a64f-9a3e-4867-a55a-70cb4b2b2ffe}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project=".\NativeTests.targets" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/test/AspNetCoreModuleTests/stdafx.h b/test/AspNetCoreModuleTests/stdafx.h
deleted file mode 100644
index 67bd5aa27b..0000000000
--- a/test/AspNetCoreModuleTests/stdafx.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#pragma once
-
-#include "targetver.h"
-
-#define WIN32_LEAN_AND_MEAN
-
-#include <Windows.h>
-#include <atlbase.h>
-#include <pdh.h>
-#include <vector>
-#include <Shlobj.h>
-#include <httpserv.h>
-#include <winhttp.h>
-#include <httptrace.h>
-#include <cstdlib>
-#include <wchar.h>
-#include <io.h>
-#include <stdio.h>
-
-#include <hashfn.h>
-#include <hashtable.h>
-#include "stringa.h"
-#include "stringu.h"
-#include "dbgutil.h"
-#include "ahutil.h"
-#include "multisz.h"
-#include "multisza.h"
-#include "base64.h"
-#include <listentry.h>
-#include <datetime.h>
-#include <reftrace.h>
-#include <acache.h>
-#include <time.h>
-
-#include "..\..\src\AspNetCoreModuleV2\IISLib\hashtable.h"
-#include "..\..\src\AspNetCoreModuleV2\IISLib\stringu.h"
-#include "..\..\src\AspNetCoreModuleV2\IISLib\stringa.h"
-#include "..\..\src\AspNetCoreModuleV2\IISLib\multisz.h"
-#include "..\..\src\AspNetCoreModuleV2\IISLib\dbgutil.h"
-#include "..\..\src\AspNetCoreModuleV2\IISLib\ahutil.h"
-#include "..\..\src\AspNetCoreModuleV2\IISLib\hashfn.h"
-
-#include "..\..\src\AspNetCoreModuleV2\CommonLib\hostfxr_utility.h"
-#include "..\..\src\AspNetCoreModuleV2\CommonLib\environmentvariablehash.h"
-#include "..\..\src\AspNetCoreModuleV2\CommonLib\aspnetcoreconfig.h"
-#include "..\..\src\AspNetCoreModuleV2\CommonLib\application.h"
-#include "..\..\src\AspNetCoreModuleV2\CommonLib\utility.h"
-#include "..\..\src\AspNetCoreModuleV2\CommonLib\debugutil.h"
-#include "..\..\src\AspNetCoreModuleV2\CommonLib\requesthandler.h"
-#include "..\..\src\AspNetCoreModuleV2\CommonLib\resources.h"
-#include "..\..\src\AspNetCoreModuleV2\CommonLib\aspnetcore_msg.h"
-
-#include "CppUnitTest.h"
diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config b/test/Common.FunctionalTests/AppHostConfig/HostableWebCore.config
similarity index 100%
rename from test/IISIntegration.FunctionalTests/AppHostConfig/TestServer.config
rename to test/Common.FunctionalTests/AppHostConfig/HostableWebCore.config
diff --git a/test/Common.FunctionalTests/AppHostConfig/IIS.config b/test/Common.FunctionalTests/AppHostConfig/IIS.config
new file mode 100644
index 0000000000..4d30d2ad0f
--- /dev/null
+++ b/test/Common.FunctionalTests/AppHostConfig/IIS.config
@@ -0,0 +1,741 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    IIS configuration sections.
+
+    For schema documentation, see
+    %windir%\system32\inetsrv\config\schema\IIS_schema.xml.
+    
+    Please make a backup of this file before making any changes to it.
+
+-->
+
+<configuration>
+
+    <!--
+
+        The <configSections> section controls the registration of sections.
+        Section is the basic unit of deployment, locking, searching and
+        containment for configuration settings.
+        
+        Every section belongs to one section group.
+        A section group is a container of logically-related sections.
+        
+        Sections cannot be nested.
+        Section groups may be nested.
+        
+        <section
+            name=""  [Required, Collection Key] [XML name of the section]
+            allowDefinition="Everywhere" [MachineOnly|MachineToApplication|AppHostOnly|Everywhere] [Level where it can be set]
+            overrideModeDefault="Allow"  [Allow|Deny] [Default delegation mode]
+            allowLocation="true"  [true|false] [Allowed in location tags]
+        />
+        
+        The recommended way to unlock sections is by using a location tag:
+        <location path="Default Web Site" overrideMode="Allow">
+            <system.webServer>
+                <asp />
+            </system.webServer>
+        </location>
+
+    -->
+    <configSections>
+        <sectionGroup name="system.applicationHost">
+            <section name="applicationPools" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+            <section name="configHistory" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+            <section name="customMetadata" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+            <section name="listenerAdapters" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+            <section name="log" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+            <section name="serviceAutoStartProviders" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+            <section name="sites" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+            <section name="webLimits" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+        </sectionGroup>
+
+        <sectionGroup name="system.webServer">
+            <section name="asp" overrideModeDefault="Deny" />
+            <section name="caching" overrideModeDefault="Allow" />
+            <section name="cgi" overrideModeDefault="Deny" />
+            <section name="defaultDocument" overrideModeDefault="Allow" />
+            <section name="directoryBrowse" overrideModeDefault="Allow" />
+            <section name="fastCgi" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+            <section name="globalModules" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+            <section name="handlers" overrideModeDefault="Deny" />
+            <section name="httpCompression" overrideModeDefault="Allow" />
+            <section name="httpErrors" overrideModeDefault="Allow" />
+            <section name="httpLogging" overrideModeDefault="Deny" />
+            <section name="httpProtocol" overrideModeDefault="Allow" />
+            <section name="httpRedirect" overrideModeDefault="Allow" />
+            <section name="httpTracing" overrideModeDefault="Deny" />
+            <section name="isapiFilters" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
+            <section name="modules" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
+            <section name="applicationInitialization" allowDefinition="MachineToApplication" overrideModeDefault="Allow" />
+            <section name="odbcLogging" overrideModeDefault="Deny" />
+            <sectionGroup name="security">
+                <section name="access" overrideModeDefault="Deny" />
+                <section name="applicationDependencies" overrideModeDefault="Deny" />
+                <sectionGroup name="authentication">
+                    <section name="anonymousAuthentication" overrideModeDefault="Deny" />
+                    <section name="basicAuthentication" overrideModeDefault="Deny" />
+                    <section name="clientCertificateMappingAuthentication" overrideModeDefault="Deny" />
+                    <section name="digestAuthentication" overrideModeDefault="Deny" />
+                    <section name="iisClientCertificateMappingAuthentication" overrideModeDefault="Deny" />
+                    <section name="windowsAuthentication" overrideModeDefault="Deny" />
+                </sectionGroup>
+                <section name="authorization" overrideModeDefault="Allow" />
+                <section name="ipSecurity" overrideModeDefault="Deny" />
+                <section name="dynamicIpSecurity" overrideModeDefault="Deny" />
+                <section name="isapiCgiRestriction" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
+                <section name="requestFiltering" overrideModeDefault="Allow" />
+            </sectionGroup>
+            <section name="serverRuntime" overrideModeDefault="Deny" />
+            <section name="serverSideInclude" overrideModeDefault="Deny" />
+            <section name="staticContent" overrideModeDefault="Allow" />
+            <sectionGroup name="tracing">
+                <section name="traceFailedRequests" overrideModeDefault="Allow" />
+                <section name="traceProviderDefinitions" overrideModeDefault="Deny" />
+            </sectionGroup>
+            <section name="urlCompression" overrideModeDefault="Allow" />
+            <section name="validation" overrideModeDefault="Allow" />
+            <sectionGroup name="webdav">
+                <section name="globalSettings" overrideModeDefault="Deny" />
+                <section name="authoring" overrideModeDefault="Deny" />
+                <section name="authoringRules" overrideModeDefault="Deny" />
+            </sectionGroup>
+            <section name="webSocket" overrideModeDefault="Deny" />
+            <section name="aspNetCore" overrideModeDefault="Allow" />
+        </sectionGroup>
+        <sectionGroup name="system.ftpServer">
+            <section name="log" overrideModeDefault="Deny" allowDefinition="AppHostOnly" />
+            <section name="firewallSupport" overrideModeDefault="Deny" allowDefinition="AppHostOnly" />
+            <section name="caching" overrideModeDefault="Deny" allowDefinition="AppHostOnly" />
+            <section name="providerDefinitions" overrideModeDefault="Deny" />
+            <sectionGroup name="security">
+                <section name="ipSecurity" overrideModeDefault="Deny" />
+                <section name="requestFiltering" overrideModeDefault="Deny" />
+                <section name="authorization" overrideModeDefault="Deny" />
+                <section name="authentication" overrideModeDefault="Deny" />
+            </sectionGroup>
+            <section name="serverRuntime" overrideModeDefault="Deny" allowDefinition="AppHostOnly" />
+        </sectionGroup>
+    </configSections>
+
+    <configProtectedData>
+        <providers>
+            <add name="IISWASOnlyRsaProvider" type="" description="Uses RsaCryptoServiceProvider to encrypt and decrypt" keyContainerName="iisWasKey" cspProviderName="" useMachineContainer="true" useOAEP="false" />
+            <add name="IISCngProvider" type="Microsoft.ApplicationHost.CngProtectedConfigurationProvider" description="Uses Win32 Crypto CNG to encrypt and decrypt" keyContainerName="iisCngConfigurationKey" useMachineContainer="true" />
+            <add name="IISWASOnlyCngProvider" type="Microsoft.ApplicationHost.CngProtectedConfigurationProvider" description="(WAS Only) Uses Win32 Crypto CNG to encrypt and decrypt" keyContainerName="iisCngWasKey" useMachineContainer="true" />
+            <add name="AesProvider" type="Microsoft.ApplicationHost.AesProtectedConfigurationProvider" description="Uses an AES session key to encrypt and decrypt" keyContainerName="iisConfigurationKey" cspProviderName="" useOAEP="false" useMachineContainer="true" sessionKey="AQIAAA5mAAAApAAAX3F7JKrgomyurjp+EzqF/rH26sw4/Bl57PAr0ZDqQJWRVT5LLg2T+nvdVUl0mbFYl2D9zwOqBWPEU29RgmvWDvGqNu6q/qDnRJ/pP/sDbArVJTnK/JQCJ9FuImmu6pz/Xbvq+aGG7FGxlZWOwMGYlnJBkDAseyOWTL8dYsGZ4xXo18NWaIJoimCKPqxUQCKf/arDeIopmx4QSLu9scbgYNHLdv8+pegkLVt5BdhR/xNTU6gb/eIemjy2SCYXASu/6M5Jki0plXyIvHf8Q+kwGSIkPvnCiUnE66koKA4dQ45rG4Ftb4wZ0gSa4bQVp6D6Svhu7fV7rOzBNdNreGF8qA==" />
+            <add name="IISWASOnlyAesProvider" type="Microsoft.ApplicationHost.AesProtectedConfigurationProvider" description="Uses an AES session key to encrypt and decrypt" keyContainerName="iisWasKey" cspProviderName="" useOAEP="false" useMachineContainer="true" sessionKey="AQIAAA5mAAAApAAAbu3YiDQwroP3yTqKR0m1fxXM6E9EBOZ5ZOg7LO1TJwYXCgQTB0hrm1TRAOxFhlPKtok3YVAyYMfazt7GXJ0O447FFg0abNIy4U/PZV/10evK5XvcoUy2qgddsa1EwOI7dqIrhe9T0A9+QtnHpYOqEFUhLj3ZGmhWsvyVBaenBGLWRuZ65Qwtd75/Hc2FcRaYpuDChjrz0OR/x8LKnGGkNMDwe3Ew9MIyImp8AjCGfGBTkevXqlmTOXfBHtWRsbQYlipz1jINc9EXGiPmIRPmLo4MnmQ/48jssL8QI91BRbL62kuQTxPwCZ+v0WzC3C+poF29V3CwjgydcrV5nZq/kw==" />
+        </providers>
+    </configProtectedData>
+
+    <system.applicationHost>
+
+        <applicationPools>
+            <add name="DefaultAppPool" autoStart="true" />
+            <applicationPoolDefaults managedRuntimeVersion="v4.0">
+                <processModel identityType="ApplicationPoolIdentity" loadUserProfile="true" setProfileEnvironment="false" />
+            </applicationPoolDefaults>
+        </applicationPools>
+
+        <!--
+
+          The <customMetadata> section is used internally by the Admin Base Objects
+          (ABO) Compatibility component. Please do not modify its content.
+
+        -->
+        <customMetadata />
+
+        <!--
+
+          The <listenerAdapters> section defines the protocols with which the
+          Windows Process Activation Service (WAS) binds.
+
+        -->
+        <listenerAdapters>
+            <add name="http" />
+        </listenerAdapters>
+
+        <log>
+            <centralBinaryLogFile enabled="true" directory="%SystemDrive%\inetpub\logs\LogFiles" />
+            <centralW3CLogFile enabled="true" directory="%SystemDrive%\inetpub\logs\LogFiles" />
+        </log>
+
+        <sites>
+            <site name="Default Web Site" id="1">
+                <application path="/">
+                    <virtualDirectory path="/" physicalPath="%SystemDrive%\inetpub\wwwroot" />
+                </application>
+                <bindings>
+                    <binding protocol="http" bindingInformation="*:80:" />
+                </bindings>
+            </site>
+            <siteDefaults>
+                <logFile logFormat="W3C" directory="%SystemDrive%\inetpub\logs\LogFiles" />
+                <traceFailedRequestsLogging directory="%SystemDrive%\inetpub\logs\FailedReqLogFiles" />
+            </siteDefaults>
+            <applicationDefaults applicationPool="DefaultAppPool" />
+            <virtualDirectoryDefaults allowSubDirConfig="true" />
+        </sites>
+
+        <webLimits />
+
+    </system.applicationHost>
+
+    <system.webServer>
+
+        <asp />
+
+        <caching enabled="true" enableKernelCache="true">
+        </caching>
+
+        <cgi />
+
+        <defaultDocument enabled="true">
+            <files>
+                <add value="Default.htm" />
+                <add value="Default.asp" />
+                <add value="index.htm" />
+                <add value="index.html" />
+                <add value="iisstart.htm" />
+            </files>
+        </defaultDocument>
+
+        <directoryBrowse enabled="false" />
+
+        <fastCgi />
+
+        <!--
+
+          The <globalModules> section defines all native-code modules.
+          To enable a module, specify it in the <modules> section.
+
+        -->
+        <globalModules>
+            <add name="HttpLoggingModule" image="%windir%\System32\inetsrv\loghttp.dll" />
+            <add name="UriCacheModule" image="%windir%\System32\inetsrv\cachuri.dll" />
+            <add name="FileCacheModule" image="%windir%\System32\inetsrv\cachfile.dll" />
+            <add name="TokenCacheModule" image="%windir%\System32\inetsrv\cachtokn.dll" />
+            <add name="HttpCacheModule" image="%windir%\System32\inetsrv\cachhttp.dll" />
+            <add name="StaticCompressionModule" image="%windir%\System32\inetsrv\compstat.dll" />
+            <add name="DefaultDocumentModule" image="%windir%\System32\inetsrv\defdoc.dll" />
+            <add name="DirectoryListingModule" image="%windir%\System32\inetsrv\dirlist.dll" />
+            <add name="ProtocolSupportModule" image="%windir%\System32\inetsrv\protsup.dll" />
+            <add name="StaticFileModule" image="%windir%\System32\inetsrv\static.dll" />
+            <add name="AnonymousAuthenticationModule" image="%windir%\System32\inetsrv\authanon.dll" />
+            <add name="RequestFilteringModule" image="%windir%\System32\inetsrv\modrqflt.dll" />
+            <add name="CustomErrorModule" image="%windir%\System32\inetsrv\custerr.dll" />
+            <add name="AspNetCoreModule" image="%SystemRoot%\system32\inetsrv\aspnetcore.dll" />
+            <!--<add name="WebSocketModule" image="%windir%\System32\inetsrv\iiswsock.dll" />-->
+        </globalModules>
+
+        <httpCompression directory="%SystemDrive%\inetpub\temp\IIS Temporary Compressed Files">
+            <scheme name="gzip" dll="%Windir%\system32\inetsrv\gzip.dll" />
+            <staticTypes>
+                <add mimeType="text/*" enabled="true" />
+                <add mimeType="message/*" enabled="true" />
+                <add mimeType="application/javascript" enabled="true" />
+                <add mimeType="application/atom+xml" enabled="true" />
+                <add mimeType="application/xaml+xml" enabled="true" />
+                <add mimeType="image/svg+xml" enabled="true" />
+                <add mimeType="*/*" enabled="false" />
+            </staticTypes>
+        </httpCompression>
+
+        <httpErrors lockAttributes="allowAbsolutePathsWhenDelegated,defaultPath">
+            <error statusCode="401" prefixLanguageFilePath="%SystemDrive%\inetpub\custerr" path="401.htm" />
+            <error statusCode="403" prefixLanguageFilePath="%SystemDrive%\inetpub\custerr" path="403.htm" />
+            <error statusCode="404" prefixLanguageFilePath="%SystemDrive%\inetpub\custerr" path="404.htm" />
+            <error statusCode="405" prefixLanguageFilePath="%SystemDrive%\inetpub\custerr" path="405.htm" />
+            <error statusCode="406" prefixLanguageFilePath="%SystemDrive%\inetpub\custerr" path="406.htm" />
+            <error statusCode="412" prefixLanguageFilePath="%SystemDrive%\inetpub\custerr" path="412.htm" />
+            <error statusCode="500" prefixLanguageFilePath="%SystemDrive%\inetpub\custerr" path="500.htm" />
+            <error statusCode="501" prefixLanguageFilePath="%SystemDrive%\inetpub\custerr" path="501.htm" />
+            <error statusCode="502" prefixLanguageFilePath="%SystemDrive%\inetpub\custerr" path="502.htm" />
+        </httpErrors>
+
+        <httpLogging dontLog="false" />
+
+        <httpProtocol>
+            <customHeaders>
+                <clear />
+            </customHeaders>
+            <redirectHeaders>
+                <clear />
+            </redirectHeaders>
+        </httpProtocol>
+
+        <httpRedirect />
+
+        <httpTracing />
+
+        <isapiFilters />
+
+        <modules>
+            <add name="HttpLoggingModule" lockItem="true" />
+            <add name="HttpCacheModule" lockItem="true" />
+            <add name="StaticCompressionModule" lockItem="true" />
+            <add name="DefaultDocumentModule" lockItem="true" />
+            <add name="DirectoryListingModule" lockItem="true" />
+            <add name="ProtocolSupportModule" lockItem="true" />
+            <add name="StaticFileModule" lockItem="true" />
+            <add name="AnonymousAuthenticationModule" lockItem="true" />
+            <add name="RequestFilteringModule" lockItem="true" />
+            <add name="CustomErrorModule" lockItem="true" />
+            <add name="AspNetCoreModule" />
+            <!--<add name="WebSocketModule" lockItem="true" />-->
+        </modules>
+
+        <odbcLogging />
+
+        <security>
+
+            <access sslFlags="None" />
+
+            <applicationDependencies />
+
+            <authentication>
+
+                <anonymousAuthentication enabled="true" userName="IUSR" />
+
+                <basicAuthentication />
+
+                <clientCertificateMappingAuthentication />
+
+                <digestAuthentication />
+
+                <iisClientCertificateMappingAuthentication />
+
+            </authentication>
+
+            <authorization />
+
+            <ipSecurity />
+
+            <isapiCgiRestriction />
+
+            <requestFiltering>
+                <fileExtensions allowUnlisted="true" applyToWebDAV="true" />
+                <verbs allowUnlisted="true" applyToWebDAV="true" />
+                <hiddenSegments applyToWebDAV="true">
+                    <add segment="web.config" />
+                </hiddenSegments>
+            </requestFiltering>
+
+        </security>
+
+        <serverRuntime />
+
+        <serverSideInclude />
+
+        <staticContent lockAttributes="isDocFooterFileName">
+            <mimeMap fileExtension=".323" mimeType="text/h323" />
+            <mimeMap fileExtension=".3g2" mimeType="video/3gpp2" />
+            <mimeMap fileExtension=".3gp2" mimeType="video/3gpp2" />
+            <mimeMap fileExtension=".3gp" mimeType="video/3gpp" />
+            <mimeMap fileExtension=".3gpp" mimeType="video/3gpp" />
+            <mimeMap fileExtension=".aaf" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".aac" mimeType="audio/aac" />
+            <mimeMap fileExtension=".aca" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".accdb" mimeType="application/msaccess" />
+            <mimeMap fileExtension=".accde" mimeType="application/msaccess" />
+            <mimeMap fileExtension=".accdt" mimeType="application/msaccess" />
+            <mimeMap fileExtension=".acx" mimeType="application/internet-property-stream" />
+            <mimeMap fileExtension=".adt" mimeType="audio/vnd.dlna.adts" />
+            <mimeMap fileExtension=".adts" mimeType="audio/vnd.dlna.adts" />
+            <mimeMap fileExtension=".afm" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".ai" mimeType="application/postscript" />
+            <mimeMap fileExtension=".aif" mimeType="audio/x-aiff" />
+            <mimeMap fileExtension=".aifc" mimeType="audio/aiff" />
+            <mimeMap fileExtension=".aiff" mimeType="audio/aiff" />
+            <mimeMap fileExtension=".appcache" mimeType="text/cache-manifest" />
+            <mimeMap fileExtension=".application" mimeType="application/x-ms-application" />
+            <mimeMap fileExtension=".art" mimeType="image/x-jg" />
+            <mimeMap fileExtension=".asd" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".asf" mimeType="video/x-ms-asf" />
+            <mimeMap fileExtension=".asi" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".asm" mimeType="text/plain" />
+            <mimeMap fileExtension=".asr" mimeType="video/x-ms-asf" />
+            <mimeMap fileExtension=".asx" mimeType="video/x-ms-asf" />
+            <mimeMap fileExtension=".atom" mimeType="application/atom+xml" />
+            <mimeMap fileExtension=".au" mimeType="audio/basic" />
+            <mimeMap fileExtension=".avi" mimeType="video/avi" />
+            <mimeMap fileExtension=".axs" mimeType="application/olescript" />
+            <mimeMap fileExtension=".bas" mimeType="text/plain" />
+            <mimeMap fileExtension=".bcpio" mimeType="application/x-bcpio" />
+            <mimeMap fileExtension=".bin" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".bmp" mimeType="image/bmp" />
+            <mimeMap fileExtension=".c" mimeType="text/plain" />
+            <mimeMap fileExtension=".cab" mimeType="application/vnd.ms-cab-compressed" />
+            <mimeMap fileExtension=".calx" mimeType="application/vnd.ms-office.calx" />
+            <mimeMap fileExtension=".cat" mimeType="application/vnd.ms-pki.seccat" />
+            <mimeMap fileExtension=".cdf" mimeType="application/x-cdf" />
+            <mimeMap fileExtension=".chm" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".class" mimeType="application/x-java-applet" />
+            <mimeMap fileExtension=".clp" mimeType="application/x-msclip" />
+            <mimeMap fileExtension=".cmx" mimeType="image/x-cmx" />
+            <mimeMap fileExtension=".cnf" mimeType="text/plain" />
+            <mimeMap fileExtension=".cod" mimeType="image/cis-cod" />
+            <mimeMap fileExtension=".cpio" mimeType="application/x-cpio" />
+            <mimeMap fileExtension=".cpp" mimeType="text/plain" />
+            <mimeMap fileExtension=".crd" mimeType="application/x-mscardfile" />
+            <mimeMap fileExtension=".crl" mimeType="application/pkix-crl" />
+            <mimeMap fileExtension=".crt" mimeType="application/x-x509-ca-cert" />
+            <mimeMap fileExtension=".csh" mimeType="application/x-csh" />
+            <mimeMap fileExtension=".css" mimeType="text/css" />
+            <mimeMap fileExtension=".csv" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".cur" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".dcr" mimeType="application/x-director" />
+            <mimeMap fileExtension=".deploy" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".der" mimeType="application/x-x509-ca-cert" />
+            <mimeMap fileExtension=".dib" mimeType="image/bmp" />
+            <mimeMap fileExtension=".dir" mimeType="application/x-director" />
+            <mimeMap fileExtension=".disco" mimeType="text/xml" />
+            <mimeMap fileExtension=".dll" mimeType="application/x-msdownload" />
+            <mimeMap fileExtension=".dll.config" mimeType="text/xml" />
+            <mimeMap fileExtension=".dlm" mimeType="text/dlm" />
+            <mimeMap fileExtension=".doc" mimeType="application/msword" />
+            <mimeMap fileExtension=".docm" mimeType="application/vnd.ms-word.document.macroEnabled.12" />
+            <mimeMap fileExtension=".docx" mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document" />
+            <mimeMap fileExtension=".dot" mimeType="application/msword" />
+            <mimeMap fileExtension=".dotm" mimeType="application/vnd.ms-word.template.macroEnabled.12" />
+            <mimeMap fileExtension=".dotx" mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.template" />
+            <mimeMap fileExtension=".dsp" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".dtd" mimeType="text/xml" />
+            <mimeMap fileExtension=".dvi" mimeType="application/x-dvi" />
+            <mimeMap fileExtension=".dvr-ms" mimeType="video/x-ms-dvr" />
+            <mimeMap fileExtension=".dwf" mimeType="drawing/x-dwf" />
+            <mimeMap fileExtension=".dwp" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".dxr" mimeType="application/x-director" />
+            <mimeMap fileExtension=".eml" mimeType="message/rfc822" />
+            <mimeMap fileExtension=".emz" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".eot" mimeType="application/vnd.ms-fontobject" />
+            <mimeMap fileExtension=".eps" mimeType="application/postscript" />
+            <mimeMap fileExtension=".esd" mimeType="application/vnd.ms-cab-compressed" />
+            <mimeMap fileExtension=".etx" mimeType="text/x-setext" />
+            <mimeMap fileExtension=".evy" mimeType="application/envoy" />
+            <mimeMap fileExtension=".exe" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".exe.config" mimeType="text/xml" />
+            <mimeMap fileExtension=".fdf" mimeType="application/vnd.fdf" />
+            <mimeMap fileExtension=".fif" mimeType="application/fractals" />
+            <mimeMap fileExtension=".fla" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".flr" mimeType="x-world/x-vrml" />
+            <mimeMap fileExtension=".flv" mimeType="video/x-flv" />
+            <mimeMap fileExtension=".gif" mimeType="image/gif" />
+            <mimeMap fileExtension=".gtar" mimeType="application/x-gtar" />
+            <mimeMap fileExtension=".gz" mimeType="application/x-gzip" />
+            <mimeMap fileExtension=".h" mimeType="text/plain" />
+            <mimeMap fileExtension=".hdf" mimeType="application/x-hdf" />
+            <mimeMap fileExtension=".hdml" mimeType="text/x-hdml" />
+            <mimeMap fileExtension=".hhc" mimeType="application/x-oleobject" />
+            <mimeMap fileExtension=".hhk" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".hhp" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".hlp" mimeType="application/winhlp" />
+            <mimeMap fileExtension=".hqx" mimeType="application/mac-binhex40" />
+            <mimeMap fileExtension=".hta" mimeType="application/hta" />
+            <mimeMap fileExtension=".htc" mimeType="text/x-component" />
+            <mimeMap fileExtension=".htm" mimeType="text/html" />
+            <mimeMap fileExtension=".html" mimeType="text/html" />
+            <mimeMap fileExtension=".htt" mimeType="text/webviewhtml" />
+            <mimeMap fileExtension=".hxt" mimeType="text/html" />
+            <mimeMap fileExtension=".ico" mimeType="image/x-icon" />
+            <mimeMap fileExtension=".ics" mimeType="text/calendar" />
+            <mimeMap fileExtension=".ief" mimeType="image/ief" />
+            <mimeMap fileExtension=".iii" mimeType="application/x-iphone" />
+            <mimeMap fileExtension=".inf" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".ins" mimeType="application/x-internet-signup" />
+            <mimeMap fileExtension=".isp" mimeType="application/x-internet-signup" />
+            <mimeMap fileExtension=".IVF" mimeType="video/x-ivf" />
+            <mimeMap fileExtension=".jar" mimeType="application/java-archive" />
+            <mimeMap fileExtension=".java" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".jck" mimeType="application/liquidmotion" />
+            <mimeMap fileExtension=".jcz" mimeType="application/liquidmotion" />
+            <mimeMap fileExtension=".jfif" mimeType="image/pjpeg" />
+            <mimeMap fileExtension=".jpb" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".jpe" mimeType="image/jpeg" />
+            <mimeMap fileExtension=".jpeg" mimeType="image/jpeg" />
+            <mimeMap fileExtension=".jpg" mimeType="image/jpeg" />
+            <mimeMap fileExtension=".js" mimeType="application/javascript" />
+            <mimeMap fileExtension=".json" mimeType="application/json" />
+            <mimeMap fileExtension=".jsonld" mimeType="application/ld+json" />
+            <mimeMap fileExtension=".jsx" mimeType="text/jscript" />
+            <mimeMap fileExtension=".latex" mimeType="application/x-latex" />
+            <mimeMap fileExtension=".less" mimeType="text/css" />
+            <mimeMap fileExtension=".lit" mimeType="application/x-ms-reader" />
+            <mimeMap fileExtension=".lpk" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".lsf" mimeType="video/x-la-asf" />
+            <mimeMap fileExtension=".lsx" mimeType="video/x-la-asf" />
+            <mimeMap fileExtension=".lzh" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".m13" mimeType="application/x-msmediaview" />
+            <mimeMap fileExtension=".m14" mimeType="application/x-msmediaview" />
+            <mimeMap fileExtension=".m1v" mimeType="video/mpeg" />
+            <mimeMap fileExtension=".m2ts" mimeType="video/vnd.dlna.mpeg-tts" />
+            <mimeMap fileExtension=".m3u" mimeType="audio/x-mpegurl" />
+            <mimeMap fileExtension=".m4a" mimeType="audio/mp4" />
+            <mimeMap fileExtension=".m4v" mimeType="video/mp4" />
+            <mimeMap fileExtension=".man" mimeType="application/x-troff-man" />
+            <mimeMap fileExtension=".manifest" mimeType="application/x-ms-manifest" />
+            <mimeMap fileExtension=".map" mimeType="text/plain" />
+            <mimeMap fileExtension=".mdb" mimeType="application/x-msaccess" />
+            <mimeMap fileExtension=".mdp" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".me" mimeType="application/x-troff-me" />
+            <mimeMap fileExtension=".mht" mimeType="message/rfc822" />
+            <mimeMap fileExtension=".mhtml" mimeType="message/rfc822" />
+            <mimeMap fileExtension=".mid" mimeType="audio/mid" />
+            <mimeMap fileExtension=".midi" mimeType="audio/mid" />
+            <mimeMap fileExtension=".mix" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".mmf" mimeType="application/x-smaf" />
+            <mimeMap fileExtension=".mno" mimeType="text/xml" />
+            <mimeMap fileExtension=".mny" mimeType="application/x-msmoney" />
+            <mimeMap fileExtension=".mov" mimeType="video/quicktime" />
+            <mimeMap fileExtension=".movie" mimeType="video/x-sgi-movie" />
+            <mimeMap fileExtension=".mp2" mimeType="video/mpeg" />
+            <mimeMap fileExtension=".mp3" mimeType="audio/mpeg" />
+            <mimeMap fileExtension=".mp4" mimeType="video/mp4" />
+            <mimeMap fileExtension=".mp4v" mimeType="video/mp4" />
+            <mimeMap fileExtension=".mpa" mimeType="video/mpeg" />
+            <mimeMap fileExtension=".mpe" mimeType="video/mpeg" />
+            <mimeMap fileExtension=".mpeg" mimeType="video/mpeg" />
+            <mimeMap fileExtension=".mpg" mimeType="video/mpeg" />
+            <mimeMap fileExtension=".mpp" mimeType="application/vnd.ms-project" />
+            <mimeMap fileExtension=".mpv2" mimeType="video/mpeg" />
+            <mimeMap fileExtension=".ms" mimeType="application/x-troff-ms" />
+            <mimeMap fileExtension=".msi" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".mso" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".mvb" mimeType="application/x-msmediaview" />
+            <mimeMap fileExtension=".mvc" mimeType="application/x-miva-compiled" />
+            <mimeMap fileExtension=".nc" mimeType="application/x-netcdf" />
+            <mimeMap fileExtension=".nsc" mimeType="video/x-ms-asf" />
+            <mimeMap fileExtension=".nws" mimeType="message/rfc822" />
+            <mimeMap fileExtension=".ocx" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".oda" mimeType="application/oda" />
+            <mimeMap fileExtension=".odc" mimeType="text/x-ms-odc" />
+            <mimeMap fileExtension=".ods" mimeType="application/oleobject" />
+            <mimeMap fileExtension=".oga" mimeType="audio/ogg" />
+            <mimeMap fileExtension=".ogg" mimeType="video/ogg" />
+            <mimeMap fileExtension=".ogv" mimeType="video/ogg" />
+            <mimeMap fileExtension=".one" mimeType="application/onenote" />
+            <mimeMap fileExtension=".onea" mimeType="application/onenote" />
+            <mimeMap fileExtension=".onetoc" mimeType="application/onenote" />
+            <mimeMap fileExtension=".onetoc2" mimeType="application/onenote" />
+            <mimeMap fileExtension=".onetmp" mimeType="application/onenote" />
+            <mimeMap fileExtension=".onepkg" mimeType="application/onenote" />
+            <mimeMap fileExtension=".osdx" mimeType="application/opensearchdescription+xml" />
+            <mimeMap fileExtension=".otf" mimeType="font/otf" />
+            <mimeMap fileExtension=".p10" mimeType="application/pkcs10" />
+            <mimeMap fileExtension=".p12" mimeType="application/x-pkcs12" />
+            <mimeMap fileExtension=".p7b" mimeType="application/x-pkcs7-certificates" />
+            <mimeMap fileExtension=".p7c" mimeType="application/pkcs7-mime" />
+            <mimeMap fileExtension=".p7m" mimeType="application/pkcs7-mime" />
+            <mimeMap fileExtension=".p7r" mimeType="application/x-pkcs7-certreqresp" />
+            <mimeMap fileExtension=".p7s" mimeType="application/pkcs7-signature" />
+            <mimeMap fileExtension=".pbm" mimeType="image/x-portable-bitmap" />
+            <mimeMap fileExtension=".pcx" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".pcz" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".pdf" mimeType="application/pdf" />
+            <mimeMap fileExtension=".pfb" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".pfm" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".pfx" mimeType="application/x-pkcs12" />
+            <mimeMap fileExtension=".pgm" mimeType="image/x-portable-graymap" />
+            <mimeMap fileExtension=".pko" mimeType="application/vnd.ms-pki.pko" />
+            <mimeMap fileExtension=".pma" mimeType="application/x-perfmon" />
+            <mimeMap fileExtension=".pmc" mimeType="application/x-perfmon" />
+            <mimeMap fileExtension=".pml" mimeType="application/x-perfmon" />
+            <mimeMap fileExtension=".pmr" mimeType="application/x-perfmon" />
+            <mimeMap fileExtension=".pmw" mimeType="application/x-perfmon" />
+            <mimeMap fileExtension=".png" mimeType="image/png" />
+            <mimeMap fileExtension=".pnm" mimeType="image/x-portable-anymap" />
+            <mimeMap fileExtension=".pnz" mimeType="image/png" />
+            <mimeMap fileExtension=".pot" mimeType="application/vnd.ms-powerpoint" />
+            <mimeMap fileExtension=".potm" mimeType="application/vnd.ms-powerpoint.template.macroEnabled.12" />
+            <mimeMap fileExtension=".potx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.template" />
+            <mimeMap fileExtension=".ppam" mimeType="application/vnd.ms-powerpoint.addin.macroEnabled.12" />
+            <mimeMap fileExtension=".ppm" mimeType="image/x-portable-pixmap" />
+            <mimeMap fileExtension=".pps" mimeType="application/vnd.ms-powerpoint" />
+            <mimeMap fileExtension=".ppsm" mimeType="application/vnd.ms-powerpoint.slideshow.macroEnabled.12" />
+            <mimeMap fileExtension=".ppsx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.slideshow" />
+            <mimeMap fileExtension=".ppt" mimeType="application/vnd.ms-powerpoint" />
+            <mimeMap fileExtension=".pptm" mimeType="application/vnd.ms-powerpoint.presentation.macroEnabled.12" />
+            <mimeMap fileExtension=".pptx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.presentation" />
+            <mimeMap fileExtension=".prf" mimeType="application/pics-rules" />
+            <mimeMap fileExtension=".prm" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".prx" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".ps" mimeType="application/postscript" />
+            <mimeMap fileExtension=".psd" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".psm" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".psp" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".pub" mimeType="application/x-mspublisher" />
+            <mimeMap fileExtension=".qt" mimeType="video/quicktime" />
+            <mimeMap fileExtension=".qtl" mimeType="application/x-quicktimeplayer" />
+            <mimeMap fileExtension=".qxd" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".ra" mimeType="audio/x-pn-realaudio" />
+            <mimeMap fileExtension=".ram" mimeType="audio/x-pn-realaudio" />
+            <mimeMap fileExtension=".rar" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".ras" mimeType="image/x-cmu-raster" />
+            <mimeMap fileExtension=".rf" mimeType="image/vnd.rn-realflash" />
+            <mimeMap fileExtension=".rgb" mimeType="image/x-rgb" />
+            <mimeMap fileExtension=".rm" mimeType="application/vnd.rn-realmedia" />
+            <mimeMap fileExtension=".rmi" mimeType="audio/mid" />
+            <mimeMap fileExtension=".roff" mimeType="application/x-troff" />
+            <mimeMap fileExtension=".rpm" mimeType="audio/x-pn-realaudio-plugin" />
+            <mimeMap fileExtension=".rtf" mimeType="application/rtf" />
+            <mimeMap fileExtension=".rtx" mimeType="text/richtext" />
+            <mimeMap fileExtension=".scd" mimeType="application/x-msschedule" />
+            <mimeMap fileExtension=".sct" mimeType="text/scriptlet" />
+            <mimeMap fileExtension=".sea" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".setpay" mimeType="application/set-payment-initiation" />
+            <mimeMap fileExtension=".setreg" mimeType="application/set-registration-initiation" />
+            <mimeMap fileExtension=".sgml" mimeType="text/sgml" />
+            <mimeMap fileExtension=".sh" mimeType="application/x-sh" />
+            <mimeMap fileExtension=".shar" mimeType="application/x-shar" />
+            <mimeMap fileExtension=".sit" mimeType="application/x-stuffit" />
+            <mimeMap fileExtension=".sldm" mimeType="application/vnd.ms-powerpoint.slide.macroEnabled.12" />
+            <mimeMap fileExtension=".sldx" mimeType="application/vnd.openxmlformats-officedocument.presentationml.slide" />
+            <mimeMap fileExtension=".smd" mimeType="audio/x-smd" />
+            <mimeMap fileExtension=".smi" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".smx" mimeType="audio/x-smd" />
+            <mimeMap fileExtension=".smz" mimeType="audio/x-smd" />
+            <mimeMap fileExtension=".snd" mimeType="audio/basic" />
+            <mimeMap fileExtension=".snp" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".spc" mimeType="application/x-pkcs7-certificates" />
+            <mimeMap fileExtension=".spl" mimeType="application/futuresplash" />
+            <mimeMap fileExtension=".spx" mimeType="audio/ogg" />
+            <mimeMap fileExtension=".src" mimeType="application/x-wais-source" />
+            <mimeMap fileExtension=".ssm" mimeType="application/streamingmedia" />
+            <mimeMap fileExtension=".sst" mimeType="application/vnd.ms-pki.certstore" />
+            <mimeMap fileExtension=".stl" mimeType="application/vnd.ms-pki.stl" />
+            <mimeMap fileExtension=".sv4cpio" mimeType="application/x-sv4cpio" />
+            <mimeMap fileExtension=".sv4crc" mimeType="application/x-sv4crc" />
+            <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
+            <mimeMap fileExtension=".svgz" mimeType="image/svg+xml" />
+            <mimeMap fileExtension=".swf" mimeType="application/x-shockwave-flash" />
+            <mimeMap fileExtension=".t" mimeType="application/x-troff" />
+            <mimeMap fileExtension=".tar" mimeType="application/x-tar" />
+            <mimeMap fileExtension=".tcl" mimeType="application/x-tcl" />
+            <mimeMap fileExtension=".tex" mimeType="application/x-tex" />
+            <mimeMap fileExtension=".texi" mimeType="application/x-texinfo" />
+            <mimeMap fileExtension=".texinfo" mimeType="application/x-texinfo" />
+            <mimeMap fileExtension=".tgz" mimeType="application/x-compressed" />
+            <mimeMap fileExtension=".thmx" mimeType="application/vnd.ms-officetheme" />
+            <mimeMap fileExtension=".thn" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".tif" mimeType="image/tiff" />
+            <mimeMap fileExtension=".tiff" mimeType="image/tiff" />
+            <mimeMap fileExtension=".toc" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".tr" mimeType="application/x-troff" />
+            <mimeMap fileExtension=".trm" mimeType="application/x-msterminal" />
+            <mimeMap fileExtension=".ts" mimeType="video/vnd.dlna.mpeg-tts" />
+            <mimeMap fileExtension=".tsv" mimeType="text/tab-separated-values" />
+            <mimeMap fileExtension=".ttf" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".tts" mimeType="video/vnd.dlna.mpeg-tts" />
+            <mimeMap fileExtension=".txt" mimeType="text/plain" />
+            <mimeMap fileExtension=".u32" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".uls" mimeType="text/iuls" />
+            <mimeMap fileExtension=".ustar" mimeType="application/x-ustar" />
+            <mimeMap fileExtension=".vbs" mimeType="text/vbscript" />
+            <mimeMap fileExtension=".vcf" mimeType="text/x-vcard" />
+            <mimeMap fileExtension=".vcs" mimeType="text/plain" />
+            <mimeMap fileExtension=".vdx" mimeType="application/vnd.ms-visio.viewer" />
+            <mimeMap fileExtension=".vml" mimeType="text/xml" />
+            <mimeMap fileExtension=".vsd" mimeType="application/vnd.visio" />
+            <mimeMap fileExtension=".vss" mimeType="application/vnd.visio" />
+            <mimeMap fileExtension=".vst" mimeType="application/vnd.visio" />
+            <mimeMap fileExtension=".vsto" mimeType="application/x-ms-vsto" />
+            <mimeMap fileExtension=".vsw" mimeType="application/vnd.visio" />
+            <mimeMap fileExtension=".vsx" mimeType="application/vnd.visio" />
+            <mimeMap fileExtension=".vtx" mimeType="application/vnd.visio" />
+            <mimeMap fileExtension=".wav" mimeType="audio/wav" />
+            <mimeMap fileExtension=".wax" mimeType="audio/x-ms-wax" />
+            <mimeMap fileExtension=".wbmp" mimeType="image/vnd.wap.wbmp" />
+            <mimeMap fileExtension=".wcm" mimeType="application/vnd.ms-works" />
+            <mimeMap fileExtension=".wdb" mimeType="application/vnd.ms-works" />
+            <mimeMap fileExtension=".webm" mimeType="video/webm" />
+            <mimeMap fileExtension=".wks" mimeType="application/vnd.ms-works" />
+            <mimeMap fileExtension=".wm" mimeType="video/x-ms-wm" />
+            <mimeMap fileExtension=".wma" mimeType="audio/x-ms-wma" />
+            <mimeMap fileExtension=".wmd" mimeType="application/x-ms-wmd" />
+            <mimeMap fileExtension=".wmf" mimeType="application/x-msmetafile" />
+            <mimeMap fileExtension=".wml" mimeType="text/vnd.wap.wml" />
+            <mimeMap fileExtension=".wmlc" mimeType="application/vnd.wap.wmlc" />
+            <mimeMap fileExtension=".wmls" mimeType="text/vnd.wap.wmlscript" />
+            <mimeMap fileExtension=".wmlsc" mimeType="application/vnd.wap.wmlscriptc" />
+            <mimeMap fileExtension=".wmp" mimeType="video/x-ms-wmp" />
+            <mimeMap fileExtension=".wmv" mimeType="video/x-ms-wmv" />
+            <mimeMap fileExtension=".wmx" mimeType="video/x-ms-wmx" />
+            <mimeMap fileExtension=".wmz" mimeType="application/x-ms-wmz" />
+            <mimeMap fileExtension=".woff" mimeType="font/x-woff" />
+            <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
+            <mimeMap fileExtension=".wps" mimeType="application/vnd.ms-works" />
+            <mimeMap fileExtension=".wri" mimeType="application/x-mswrite" />
+            <mimeMap fileExtension=".wrl" mimeType="x-world/x-vrml" />
+            <mimeMap fileExtension=".wrz" mimeType="x-world/x-vrml" />
+            <mimeMap fileExtension=".wsdl" mimeType="text/xml" />
+            <mimeMap fileExtension=".wtv" mimeType="video/x-ms-wtv" />
+            <mimeMap fileExtension=".wvx" mimeType="video/x-ms-wvx" />
+            <mimeMap fileExtension=".x" mimeType="application/directx" />
+            <mimeMap fileExtension=".xaf" mimeType="x-world/x-vrml" />
+            <mimeMap fileExtension=".xaml" mimeType="application/xaml+xml" />
+            <mimeMap fileExtension=".xap" mimeType="application/x-silverlight-app" />
+            <mimeMap fileExtension=".xbap" mimeType="application/x-ms-xbap" />
+            <mimeMap fileExtension=".xbm" mimeType="image/x-xbitmap" />
+            <mimeMap fileExtension=".xdr" mimeType="text/plain" />
+            <mimeMap fileExtension=".xht" mimeType="application/xhtml+xml" />
+            <mimeMap fileExtension=".xhtml" mimeType="application/xhtml+xml" />
+            <mimeMap fileExtension=".xla" mimeType="application/vnd.ms-excel" />
+            <mimeMap fileExtension=".xlam" mimeType="application/vnd.ms-excel.addin.macroEnabled.12" />
+            <mimeMap fileExtension=".xlc" mimeType="application/vnd.ms-excel" />
+            <mimeMap fileExtension=".xlm" mimeType="application/vnd.ms-excel" />
+            <mimeMap fileExtension=".xls" mimeType="application/vnd.ms-excel" />
+            <mimeMap fileExtension=".xlsb" mimeType="application/vnd.ms-excel.sheet.binary.macroEnabled.12" />
+            <mimeMap fileExtension=".xlsm" mimeType="application/vnd.ms-excel.sheet.macroEnabled.12" />
+            <mimeMap fileExtension=".xlsx" mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" />
+            <mimeMap fileExtension=".xlt" mimeType="application/vnd.ms-excel" />
+            <mimeMap fileExtension=".xltm" mimeType="application/vnd.ms-excel.template.macroEnabled.12" />
+            <mimeMap fileExtension=".xltx" mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.template" />
+            <mimeMap fileExtension=".xlw" mimeType="application/vnd.ms-excel" />
+            <mimeMap fileExtension=".xml" mimeType="text/xml" />
+            <mimeMap fileExtension=".xof" mimeType="x-world/x-vrml" />
+            <mimeMap fileExtension=".xpm" mimeType="image/x-xpixmap" />
+            <mimeMap fileExtension=".xps" mimeType="application/vnd.ms-xpsdocument" />
+            <mimeMap fileExtension=".xsd" mimeType="text/xml" />
+            <mimeMap fileExtension=".xsf" mimeType="text/xml" />
+            <mimeMap fileExtension=".xsl" mimeType="text/xml" />
+            <mimeMap fileExtension=".xslt" mimeType="text/xml" />
+            <mimeMap fileExtension=".xsn" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".xtp" mimeType="application/octet-stream" />
+            <mimeMap fileExtension=".xwd" mimeType="image/x-xwindowdump" />
+            <mimeMap fileExtension=".z" mimeType="application/x-compress" />
+            <mimeMap fileExtension=".zip" mimeType="application/x-zip-compressed" />
+        </staticContent>
+
+        <tracing>
+
+            <traceFailedRequests />
+
+            <traceProviderDefinitions>
+                <add name="WWW Server" guid="{3a2a4e84-4c21-4981-ae10-3fda0d9b0f83}">
+                    <areas>
+                        <add name="ANCM" value="65536" />
+                    </areas>
+                </add>
+            </traceProviderDefinitions>
+
+        </tracing>
+
+        <urlCompression />
+
+        <validation />
+        <!--<webSocket />-->
+
+    </system.webServer>
+    <location path="" overrideMode="Allow">
+        <system.webServer>
+
+        <handlers accessPolicy="Read, Script">
+            <add name="TRACEVerbHandler" path="*" verb="TRACE" modules="ProtocolSupportModule" requireAccess="None" />
+            <add name="OPTIONSVerbHandler" path="*" verb="OPTIONS" modules="ProtocolSupportModule" requireAccess="None" />
+            <add name="StaticFile" path="*" verb="*" modules="StaticFileModule,DefaultDocumentModule,DirectoryListingModule" resourceType="Either" requireAccess="Read" />
+        </handlers>
+        </system.webServer>
+    </location>
+
+</configuration>
diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config b/test/Common.FunctionalTests/AppHostConfig/IISExpress.config
similarity index 99%
rename from test/IISIntegration.FunctionalTests/AppHostConfig/Http.config
rename to test/Common.FunctionalTests/AppHostConfig/IISExpress.config
index b0de53397c..9dfe324091 100644
--- a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config
+++ b/test/Common.FunctionalTests/AppHostConfig/IISExpress.config
@@ -344,7 +344,6 @@
             <add value="NTLM" />
           </providers>
         </windowsAuthentication>
-
       </authentication>
 
       <authorization>
@@ -1033,14 +1032,4 @@
       </handlers>
     </system.webServer>
   </location>
-  <location path="HttpTestSite">
-    <system.webServer>
-      <security>
-        <authentication>
-          <anonymousAuthentication enabled="true" />
-          <windowsAuthentication enabled="true" />
-        </authentication>
-      </security>
-    </system.webServer>
-  </location>
 </configuration>
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs
similarity index 95%
rename from test/IISIntegration.FunctionalTests/Inprocess/EnvironmentVariableTests.cs
rename to test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs
index 16467095d8..413aa4c35f 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/EnvironmentVariableTests.cs
+++ b/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs
@@ -2,14 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [Collection(IISTestSiteCollection.Name)]
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class EnvironmentVariableTests
     {
         private readonly IISTestSiteFixture _fixture;
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/FeatureCollectionTests.cs b/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs
similarity index 89%
rename from test/IISIntegration.FunctionalTests/Inprocess/FeatureCollectionTests.cs
rename to test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs
index b946446db7..e31dc3dbaa 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/FeatureCollectionTests.cs
+++ b/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs
@@ -1,16 +1,13 @@
 // 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.
 
-using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [Collection(IISTestSiteCollection.Name)]
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class FeatureCollectionTest
     {
         private readonly IISTestSiteFixture _fixture;
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/HelloWorldTests.cs b/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs
similarity index 89%
rename from test/IISIntegration.FunctionalTests/Inprocess/HelloWorldTests.cs
rename to test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs
index ebc67312df..1b2ad70600 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/HelloWorldTests.cs
+++ b/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs
@@ -1,16 +1,13 @@
 // 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.
 
-using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [Collection(IISTestSiteCollection.Name)]
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class HelloWorldInProcessTests
     {
         private readonly IISTestSiteFixture _fixture;
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs b/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs
similarity index 97%
rename from test/IISIntegration.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs
rename to test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs
index ae27eb426e..95c05308bd 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs
+++ b/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs
@@ -3,14 +3,12 @@
 
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [Collection(IISTestSiteCollection.Name)]
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class InvalidReadWriteOperationTests
     {
         private readonly IISTestSiteFixture _fixture;
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/LargeResponseBodyTests.cs b/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs
similarity index 92%
rename from test/IISIntegration.FunctionalTests/Inprocess/LargeResponseBodyTests.cs
rename to test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs
index 3578718ef6..40db2cfdb8 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/LargeResponseBodyTests.cs
+++ b/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs
@@ -2,14 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [Collection(IISTestSiteCollection.Name)]
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class LargeResponseBodyTests
     {
         private readonly IISTestSiteFixture _fixture;
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs
similarity index 96%
rename from test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs
rename to test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs
index 09e3688fbf..3f433b155f 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/ResponseHeaderTests.cs
+++ b/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs
@@ -1,11 +1,9 @@
 // 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.
 
-using System;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Net.Http.Headers;
 using Xunit;
@@ -13,7 +11,6 @@ using Xunit;
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [Collection(IISTestSiteCollection.Name)]
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class ResponseHeaders
     {
         private readonly IISTestSiteFixture _fixture;
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs b/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs
similarity index 95%
rename from test/IISIntegration.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs
rename to test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs
index 1bf0f1a483..c39e155e77 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs
+++ b/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs
@@ -9,7 +9,6 @@ using Xunit;
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [Collection(IISTestSiteCollection.Name)]
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class ResponseInvalidOrderingTest
     {
         private readonly IISTestSiteFixture _fixture;
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs b/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs
similarity index 98%
rename from test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs
rename to test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs
index 020ef00213..74af2e00cb 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/ServerVariablesTest.cs
+++ b/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs
@@ -11,7 +11,6 @@ using Xunit;
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [Collection(IISTestSiteCollection.Name)]
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class ServerVariablesTest
     {
         private readonly IISTestSiteFixture _fixture;
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
similarity index 99%
rename from test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
rename to test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
index 122b67f005..9b57d4996b 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
+++ b/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
@@ -13,7 +13,6 @@ using Xunit;
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [Collection(IISTestSiteCollection.Name)]
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class SynchronousReadAndWriteTests
     {
         private readonly IISTestSiteFixture _fixture;
diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs
similarity index 85%
rename from test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs
rename to test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs
index 659487f51d..876b8e010f 100644
--- a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs
+++ b/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs
@@ -1,8 +1,9 @@
 // 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.
 
+using System.IO;
 using System.Threading.Tasks;
-using IISIntegration.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
@@ -17,7 +18,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         }
 
         public static TestMatrix TestVariants
-            => TestMatrix.ForServers(ServerType.IISExpress)
+            => TestMatrix.ForServers(DeployerSelector.ServerType)
                 .WithTfms(Tfm.NetCoreApp22, Tfm.Net461)
                 .WithAllApplicationTypes()
                 .WithAllAncmVersions();
@@ -26,9 +27,11 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         [MemberData(nameof(TestVariants))]
         public async Task HelloWorld(TestVariant variant)
         {
+            // The default in hosting sets windows auth to true.
+            // Set it to the IISExpress.config file
             var deploymentParameters = new DeploymentParameters(variant)
             {
-                ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(),
+                ApplicationPath = Helpers.GetOutOfProcessTestSitesPath()
             };
 
             var deploymentResult = await DeployAsync(deploymentParameters);
@@ -53,9 +56,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
             response = await deploymentResult.HttpClient.GetAsync("/Auth");
             responseText = await response.Content.ReadAsStringAsync();
 
-            // We adapted the Http.config file to be used for inprocess too. We specify WindowsAuth is enabled
-            // We now expect that windows auth is enabled rather than disabled.
-            Assert.True("backcompat;Windows".Equals(responseText) || "latest;Windows".Equals(responseText), "Auth");
+            Assert.True("backcompat;Windows".Equals(responseText) || "latest;null".Equals(responseText), "Auth");
         }
     }
 }
diff --git a/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs b/test/Common.FunctionalTests/Properties/AssemblyInfo.cs
similarity index 72%
rename from test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs
rename to test/Common.FunctionalTests/Properties/AssemblyInfo.cs
index a150572c1f..a3ad8b187e 100644
--- a/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs
+++ b/test/Common.FunctionalTests/Properties/AssemblyInfo.cs
@@ -1,7 +1,8 @@
 // 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.
 
-// All functional tests in this project require a version of IIS express with an updated schema
+using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests;
 using Xunit;
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
+[assembly: RequiresIIS]
diff --git a/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs
similarity index 79%
rename from test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs
rename to test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs
index a30387f0dd..c2a9c3682a 100644
--- a/test/IISIntegration.FunctionalTests/Utilities/FunctionalTestsBase.cs
+++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs
@@ -1,6 +1,7 @@
 // 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.
 
+using System.IO;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit.Abstractions;
@@ -24,14 +25,15 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
                 parameters.EnvironmentVariables[DebugEnvironmentVariable] = "4";
             }
 
-            // Currently hosting throws if the Servertype = IIS.
             if (parameters.ServerType == ServerType.IIS)
             {
+                // Currently hosting throws if the Servertype = IIS.
                 _deployer = new IISDeployer(parameters, LoggerFactory);
             }
-            else
+            else if (parameters.ServerType == ServerType.IISExpress)
             {
-                _deployer = ApplicationDeployerFactory.Create(parameters, LoggerFactory);
+                parameters.ServerConfigTemplateContent = parameters.ServerConfigTemplateContent ?? File.ReadAllText("IISExpress.config");
+                _deployer = new IISExpressDeployer(parameters, LoggerFactory);
             }
 
             var result = await _deployer.DeployAsync();
diff --git a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs b/test/Common.FunctionalTests/Utilities/Helpers.cs
similarity index 97%
rename from test/IISIntegration.FunctionalTests/Utilities/Helpers.cs
rename to test/Common.FunctionalTests/Utilities/Helpers.cs
index cfee3377f2..6915d955ec 100644
--- a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs
+++ b/test/Common.FunctionalTests/Utilities/Helpers.cs
@@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         // Defaults to inprocess specific deployment parameters
         public static DeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite")
         {
-            return new DeploymentParameters(Helpers.GetTestWebSitePath(site), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
+            return new DeploymentParameters(Helpers.GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
             {
                 TargetFramework = Tfm.NetCoreApp22,
                 ApplicationType = ApplicationType.Portable,
diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs b/test/Common.FunctionalTests/Utilities/IISApplication.cs
similarity index 83%
rename from test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs
rename to test/Common.FunctionalTests/Utilities/IISApplication.cs
index faba405c06..662f9315a6 100644
--- a/test/IISIntegration.FunctionalTests/Utilities/IISApplication.cs
+++ b/test/Common.FunctionalTests/Utilities/IISApplication.cs
@@ -19,13 +19,13 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
     /// </summary>
     internal class IISApplication
     {
-        private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(2);
-        private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(100);
+        private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(5);
+        private static readonly TimeSpan _retryDelay = TimeSpan.FromMilliseconds(200);
         private readonly ServerManager _serverManager = new ServerManager();
         private readonly DeploymentParameters _deploymentParameters;
         private readonly ILogger _logger;
         private readonly string _ancmVersion;
-        private readonly object _syncLock = new object();
+        private readonly string _ancmDllName;
         private readonly string _apphostConfigBackupPath;
         private static readonly string _apphostConfigPath = Path.Combine(
                                                                 Environment.SystemDirectory,
@@ -38,6 +38,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
             _deploymentParameters = deploymentParameters;
             _logger = logger;
             _ancmVersion = deploymentParameters.AncmVersion.ToString();
+            _ancmDllName = deploymentParameters.AncmVersion == AncmVersion.AspNetCoreModuleV2 ? "aspnetcorev2.dll" : "aspnetcore.dll";
             WebSiteName = CreateTestSiteName();
             AppPoolName = $"{WebSiteName}Pool";
             _apphostConfigBackupPath = Path.Combine(
@@ -56,12 +57,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
             // Backup currently deployed apphost.config file
             using (_logger.BeginScope("StartIIS"))
             {
-                AddTemporaryAppHostConfig();
                 var port = uri.Port;
                 if (port == 0)
                 {
                     throw new NotSupportedException("Cannot set port 0 for IIS.");
                 }
+                AddTemporaryAppHostConfig();
 
                 ConfigureAppPool(contentRoot);
 
@@ -177,32 +178,60 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
 
         private void AddTemporaryAppHostConfig()
         {
-            File.Copy(_apphostConfigPath, _apphostConfigBackupPath);
+            RetryFileOperation(() => File.Move(_apphostConfigPath, _apphostConfigBackupPath),
+                e => _logger.LogWarning($"Failed to backup apphost.config: {e.Message}"));
+
             _logger.LogInformation($"Backed up {_apphostConfigPath} to {_apphostConfigBackupPath}");
+
+            RetryFileOperation(
+                () => File.WriteAllText(_apphostConfigPath, _deploymentParameters.ServerConfigTemplateContent ?? File.ReadAllText("IIS.config")),
+                e => _logger.LogWarning($"Failed to copy IIS.config to apphost.config: {e.Message}"));
+
+            _logger.LogInformation($"Copied contents of IIS.config to {_apphostConfigPath}");
         }
 
         private void RestoreAppHostConfig()
         {
-            RetryHelper.RetryOperation(
-                () => File.Delete(_apphostConfigPath),
-                e => _logger.LogWarning($"Failed to delete directory : {e.Message}"),
-                retryCount: 3,
-                retryDelayMilliseconds: 100);
+            if (File.Exists(_apphostConfigPath))
+            {
+                RetryFileOperation(
+                    () => File.Delete(_apphostConfigPath),
+                    e => _logger.LogWarning($"Failed to delete file : {e.Message}"));
+            }
+
+            RetryFileOperation(
+                () => File.Move(_apphostConfigBackupPath, _apphostConfigPath),
+                e => _logger.LogError($"Failed to backup apphost.config: {e.Message}"));
 
-            File.Move(_apphostConfigBackupPath, _apphostConfigPath);
             _logger.LogInformation($"Restored {_apphostConfigPath}.");
         }
 
+        private void RetryFileOperation(Action retryBlock, Action<Exception> exceptionBlock)
+        {
+            RetryHelper.RetryOperation(retryBlock,
+                exceptionBlock,
+                retryCount: 10,
+                retryDelayMilliseconds: 100);
+        }
+
         private ApplicationPool ConfigureAppPool(string contentRoot)
         {
-            var pool = _serverManager.ApplicationPools.Add(AppPoolName);
-            pool.ProcessModel.IdentityType = ProcessModelIdentityType.LocalSystem;
-            pool.ManagedRuntimeVersion = string.Empty;
+            try
+            {
+                var pool = _serverManager.ApplicationPools.Add(AppPoolName);
+                pool.ProcessModel.IdentityType = ProcessModelIdentityType.LocalSystem;
+                pool.ManagedRuntimeVersion = string.Empty;
 
-            AddEnvironmentVariables(contentRoot, pool);
+                AddEnvironmentVariables(contentRoot, pool);
 
-            _logger.LogInformation($"Configured AppPool {AppPoolName}");
-            return pool;
+                _logger.LogInformation($"Configured AppPool {AppPoolName}");
+                return pool;
+            }
+            catch (COMException comException)
+            {
+                _logger.LogError(File.ReadAllText(_apphostConfigPath));
+                throw comException;
+            }
         }
 
         private void AddEnvironmentVariables(string contentRoot, ApplicationPool pool)
@@ -215,6 +244,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
                 {
                     AddEnvironmentVariableToAppPool(envCollection, tuple.Key, tuple.Value);
                 }
+                AddEnvironmentVariableToAppPool(envCollection, "ASPNETCORE_MODULE_DEBUG_FILE", $"{WebSiteName}.txt");
             }
             catch (COMException comException)
             {
@@ -301,11 +331,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
 
         private string GetAncmLocation(string dllRoot)
         {
-            var arch = _deploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? @"x64\aspnetcorev2.dll" : @"x86\aspnetcorev2.dll";
+            var arch = _deploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? $@"x64\{_ancmDllName}" : $@"x86\{_ancmDllName}";
             var ancmFile = Path.Combine(dllRoot, arch);
             if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile)))
             {
-                ancmFile = Path.Combine(dllRoot, "aspnetcorev2.dll");
+                ancmFile = Path.Combine(dllRoot, _ancmDllName);
                 if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile)))
                 {
                     throw new FileNotFoundException("AspNetCoreModule could not be found.", ancmFile);
diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISDeployer.cs b/test/Common.FunctionalTests/Utilities/IISDeployer.cs
similarity index 93%
rename from test/IISIntegration.FunctionalTests/Utilities/IISDeployer.cs
rename to test/Common.FunctionalTests/Utilities/IISDeployer.cs
index 4f0d5252c9..f3f9d8e7b9 100644
--- a/test/IISIntegration.FunctionalTests/Utilities/IISDeployer.cs
+++ b/test/Common.FunctionalTests/Utilities/IISDeployer.cs
@@ -49,6 +49,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
                 StartTimer();
 
                 var contentRoot = string.Empty;
+                if (string.IsNullOrEmpty(DeploymentParameters.ServerConfigTemplateContent))
+                {
+                    DeploymentParameters.ServerConfigTemplateContent = File.ReadAllText("IIS.config");
+                }
+
                 _application = new IISApplication(DeploymentParameters, Logger);
 
                 // For now, only support using published output 
@@ -90,6 +95,5 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
                 Logger.LogInformation(line);
             }
         }
-
     }
 }
diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs b/test/Common.FunctionalTests/Utilities/IISDeploymentResult.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Utilities/IISDeploymentResult.cs
rename to test/Common.FunctionalTests/Utilities/IISDeploymentResult.cs
diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs b/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs
similarity index 66%
rename from test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs
rename to test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs
index 9c6ba61513..d4c74c551b 100644
--- a/test/IISIntegration.FunctionalTests/Utilities/IISFunctionalTestBase.cs
+++ b/test/Common.FunctionalTests/Utilities/IISFunctionalTestBase.cs
@@ -5,10 +5,11 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Xml.Linq;
+using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Xunit.Abstractions;
 
-namespace IISIntegration.FunctionalTests.Utilities
+namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities
 {
     public class IISFunctionalTestBase : FunctionalTestsBase
     {
@@ -18,7 +19,7 @@ namespace IISIntegration.FunctionalTests.Utilities
 
         protected string GetServerConfig(Action<XElement> transform)
         {
-            var doc = XDocument.Load("AppHostConfig/Http.config");
+            var doc = XDocument.Load(DeployerSelector.ServerType == ServerType.IIS ? "IIS.config" : "IISExpress.config");
             transform?.Invoke(doc.Root);
             return doc.ToString();
         }
@@ -36,5 +37,15 @@ namespace IISIntegration.FunctionalTests.Utilities
                         .SetAttributeValue("sslFlags", "Ssl, SslNegotiateCert");
                 });
         }
+
+        protected string GetWindowsAuthConfig()
+        {
+            return GetServerConfig(
+                element => {
+                    element.Descendants("windowsAuthentication")
+                        .Single()
+                        .SetAttributeValue("enabled", "true");
+                });
+        }
     }
 }
diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteCollection.cs b/test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Utilities/IISTestSiteCollection.cs
rename to test/Common.FunctionalTests/Utilities/IISTestSiteCollection.cs
diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs
similarity index 75%
rename from test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs
rename to test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs
index 3cbaefa9e6..d19dad36d0 100644
--- a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs
+++ b/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
             var logging = AssemblyTestLog.ForAssembly(typeof(IISTestSiteFixture).Assembly);
 
             var deploymentParameters = new DeploymentParameters(Helpers.GetInProcessTestSitesPath(),
-                ServerType.IISExpress,
+                DeployerSelector.ServerType,
                 RuntimeFlavor.CoreClr,
                 RuntimeArchitecture.x64)
             {
@@ -30,7 +30,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
                 PublishApplicationBeforeDeployment = true,
             };
 
-            _deployer = ApplicationDeployerFactory.Create(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture)));
+            if (deploymentParameters.ServerType == ServerType.IIS)
+            {
+                // Currently hosting throws if the Servertype = IIS.
+                _deployer = new IISDeployer(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture)));
+            }
+            else if (deploymentParameters.ServerType == ServerType.IISExpress)
+            {
+                _deployer = new IISExpressDeployer(deploymentParameters, logging.CreateLoggerFactory(null, nameof(IISTestSiteFixture)));
+            }
+
             DeploymentResult = _deployer.DeployAsync().Result;
             Client = DeploymentResult.HttpClient;
             BaseUri = DeploymentResult.ApplicationBaseUri;
diff --git a/test/IISIntegration.FunctionalTests/Utilities/LoggingHandler.cs b/test/Common.FunctionalTests/Utilities/LoggingHandler.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Utilities/LoggingHandler.cs
rename to test/Common.FunctionalTests/Utilities/LoggingHandler.cs
diff --git a/test/IISIntegration.FunctionalTests/Utilities/RetryHandler.cs b/test/Common.FunctionalTests/Utilities/RetryHandler.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Utilities/RetryHandler.cs
rename to test/Common.FunctionalTests/Utilities/RetryHandler.cs
diff --git a/test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/test/Common.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs
rename to test/Common.FunctionalTests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs
diff --git a/test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs b/test/Common.FunctionalTests/Utilities/TestConnections.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Utilities/TestConnections.cs
rename to test/Common.FunctionalTests/Utilities/TestConnections.cs
diff --git a/test/IISIntegration.FunctionalTests/Utilities/TestIISUriHelper.cs b/test/Common.FunctionalTests/Utilities/TestIISUriHelper.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Utilities/TestIISUriHelper.cs
rename to test/Common.FunctionalTests/Utilities/TestIISUriHelper.cs
diff --git a/test/IISIntegration.FunctionalTests/Utilities/TestServer.cs b/test/Common.FunctionalTests/Utilities/TestServer.cs
similarity index 97%
rename from test/IISIntegration.FunctionalTests/Utilities/TestServer.cs
rename to test/Common.FunctionalTests/Utilities/TestServer.cs
index 6cd61b1459..5eaaaf3440 100644
--- a/test/IISIntegration.FunctionalTests/Utilities/TestServer.cs
+++ b/test/Common.FunctionalTests/Utilities/TestServer.cs
@@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 
         private static readonly SemaphoreSlim WebCoreLock = new SemaphoreSlim(1, 1);
 
-        // Currently this is hardcoded in TestServer.config
+        // Currently this is hardcoded in HostableWebCore.config
         private static readonly int BasePort = 50691;
         private static readonly Uri BaseUri = new Uri("http://localhost:" + BasePort);
 
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
             LoadLibrary(AspNetCoreModuleDll);
 
             set_main_handler(Main);
-            var startResult = WebCoreActivate(Path.GetFullPath("AppHostConfig/TestServer.config"), null, "Instance");
+            var startResult = WebCoreActivate(Path.GetFullPath("HostableWebCore.config"), null, "Instance");
             if (startResult != 0)
             {
                 throw new InvalidOperationException($"Error while running WebCoreActivate: {startResult}");
diff --git a/test/IIS.FunctionalTests/DeployerSelector.cs b/test/IIS.FunctionalTests/DeployerSelector.cs
new file mode 100644
index 0000000000..2032b716b9
--- /dev/null
+++ b/test/IIS.FunctionalTests/DeployerSelector.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+
+namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
+{
+    public static class DeployerSelector
+    {
+        public static ServerType ServerType => ServerType.IIS;
+    }
+}
diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
similarity index 90%
rename from test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj
rename to test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
index 544cde26ee..718053f101 100644
--- a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj
+++ b/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
@@ -5,10 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="AppHostConfig\*.config" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="Properties\launchSettings.json">
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </Content>
+    <Content Include="..\Common.FunctionalTests\AppHostConfig\*.config" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
@@ -19,6 +16,10 @@
     </ProjectReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\Common.FunctionalTests\**\*.cs" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
     <None Include="$(MSBuildThisFileDirectory)..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
     <None Include="$(MSBuildThisFileDirectory)..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
@@ -26,9 +27,6 @@
     <None Include="$(MSBuildThisFileDirectory)..\..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="AppHostConfig\TestServer.config" />
-  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(MicrosoftAspNetCoreServerIntegrationTestingPackageVersion)" />
@@ -45,7 +43,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Update="AppHostConfig\TestServer.config">
+    <None Remove="AppHostConfig\HostableWebCore.config" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Content Update="AppHostConfig\HostableWebCore.config">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
   </ItemGroup>
diff --git a/test/IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs b/test/IIS.FunctionalTests/SkipIISTestAttribute.cs
similarity index 92%
rename from test/IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs
rename to test/IIS.FunctionalTests/SkipIISTestAttribute.cs
index aa6c3abd75..6602d1125c 100644
--- a/test/IISIntegration.FunctionalTests/Utilities/SkipIfIISCannotRunAttribute.cs
+++ b/test/IIS.FunctionalTests/SkipIISTestAttribute.cs
@@ -7,13 +7,12 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Xml.Linq;
-using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
-    public sealed class SkipIfIISCannotRunAttribute : Attribute, ITestCondition
+    public sealed class RequiresIISAttribute : Attribute, ITestCondition
     {
         private static readonly bool _isMet;
         public static readonly string _skipReason;
@@ -21,7 +20,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         public bool IsMet => _isMet;
         public string SkipReason => _skipReason;
 
-        static SkipIfIISCannotRunAttribute()
+        static RequiresIISAttribute()
         {
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
diff --git a/test/IISExpress.FunctionalTests/DeployerSelector.cs b/test/IISExpress.FunctionalTests/DeployerSelector.cs
new file mode 100644
index 0000000000..5344cbacf0
--- /dev/null
+++ b/test/IISExpress.FunctionalTests/DeployerSelector.cs
@@ -0,0 +1,12 @@
+// 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.
+
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+
+namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
+{
+    public static class DeployerSelector
+    {
+        public static ServerType ServerType => ServerType.IISExpress;
+    }
+}
diff --git a/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
new file mode 100644
index 0000000000..718053f101
--- /dev/null
+++ b/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
@@ -0,0 +1,55 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="..\Common.FunctionalTests\AppHostConfig\*.config" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.IIS\Microsoft.AspNetCore.Server.IIS.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
+    <ProjectReference Include="..\WebSites\**\*.csproj">
+      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Common.FunctionalTests\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+    <None Include="$(MSBuildThisFileDirectory)..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
+    <None Include="$(MSBuildThisFileDirectory)..\..\src\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
+    <None Include="$(MSBuildThisFileDirectory)..\..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
+    <None Include="$(MSBuildThisFileDirectory)..\..\src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.pdb" CopyToOutputDirectory="PreserveNewest" Visible="true" Link="%(FileName)%(Extension)" />
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(MicrosoftAspNetCoreServerIntegrationTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.Web.Administration" Version="$(MicrosoftWebAdministrationPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
+    <PackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="AppHostConfig\HostableWebCore.config" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Content Update="AppHostConfig\HostableWebCore.config">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs b/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs
similarity index 95%
rename from test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs
rename to test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs
index d88fad5d21..5cfd7fe7c0 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/AppOfflineTests.cs
+++ b/test/IISExpress.FunctionalTests/InProcess/AppOfflineTests.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using IISIntegration.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
@@ -14,11 +14,11 @@ using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
-namespace IISIntegration.FunctionalTests.Inprocess
+namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Inprocess
 {
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class AppOfflineTests : IISFunctionalTestBase
     {
+        // TODO these will differ between IIS and IISExpress
         [ConditionalFact]
         public async Task AppOfflineDroppedWhileSiteIsDown_SiteReturns503()
         {
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs
similarity index 71%
rename from test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs
rename to test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs
index a9cc151e6f..c3540d51ee 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs
+++ b/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs
@@ -4,50 +4,48 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Testing.xunit;
-using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
-    [Collection(IISTestSiteCollection.Name)]
-    [SkipIfIISExpressSchemaMissingInProcess]
-    public class AuthenticationTests
+    public class AuthenticationTests : IISFunctionalTestBase
     {
-        private readonly IISTestSiteFixture _fixture;
-        public AuthenticationTests(IISTestSiteFixture fixture)
-        {
-            _fixture = fixture;
-        }
 
         [ConditionalFact]
         public async Task Authentication_InProcess()
         {
-            var response = await _fixture.Client.GetAsync("/AuthenticationAnonymous");
+            var deploymentParameters = Helpers.GetBaseDeploymentParameters();
+            deploymentParameters.ServerConfigTemplateContent = GetWindowsAuthConfig();
+
+            var deploymentResult = await DeployAsync(deploymentParameters);
+
+            var response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationAnonymous");
 
             var responseText = await response.Content.ReadAsStringAsync();
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.Equal("Anonymous?True", responseText);
 
-            response = await _fixture.Client.GetAsync("/AuthenticationRestricted");
+            response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationRestricted");
             responseText = await response.Content.ReadAsStringAsync();
             Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
             Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString());
             Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString());
 
-            response = await _fixture.Client.GetAsync("/AuthenticationRestrictedNTLM");
+            response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationRestrictedNTLM");
             responseText = await response.Content.ReadAsStringAsync();
             Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
             Assert.Contains("NTLM", response.Headers.WwwAuthenticate.ToString());
             // Note we can't restrict a challenge to a specific auth type, the native auth modules always add themselves.
             Assert.Contains("Negotiate", response.Headers.WwwAuthenticate.ToString());
 
-            response = await _fixture.Client.GetAsync("/AuthenticationForbidden");
+            response = await deploymentResult.RetryingHttpClient.GetAsync("/AuthenticationForbidden");
             responseText = await response.Content.ReadAsStringAsync();
             Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode);
 
             var httpClientHandler = new HttpClientHandler() { UseDefaultCredentials = true };
-            var httpClient = _fixture.DeploymentResult.CreateHttpClient(httpClientHandler);
+            var httpClient = deploymentResult.DeploymentResult.CreateHttpClient(httpClientHandler);
 
             response = await httpClient.GetAsync("/AuthenticationAnonymous");
             responseText = await response.Content.ReadAsStringAsync();
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs b/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs
similarity index 95%
rename from test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs
rename to test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs
index 611434f560..856bf1669f 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/LoggingTests.cs
+++ b/test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs
@@ -5,8 +5,9 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using IISIntegration.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
@@ -14,7 +15,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     public class LoggingTests : IISFunctionalTestBase
     {
-        [Theory]
+        [ConditionalTheory]
         [InlineData("CheckErrLogFile")]
         [InlineData("CheckLogFile")]
         public async Task CheckStdoutLogging(string path)
@@ -66,7 +67,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
             }
         }
 
-        [Fact]
+        [ConditionalFact]
         public async Task StartupMessagesAreLoggedIntoDebugLogFile()
         {
             var tempFile = Path.GetTempFileName();
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/ShutdownTests.cs b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs
similarity index 86%
rename from test/IISIntegration.FunctionalTests/Inprocess/ShutdownTests.cs
rename to test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs
index 9b1eb28eab..69eacfbc43 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/ShutdownTests.cs
+++ b/test/IISExpress.FunctionalTests/InProcess/ShutdownTests.cs
@@ -2,15 +2,13 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using IISIntegration.FunctionalTests.Utilities;
-using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class ShutdownTests : IISFunctionalTestBase
     {
 
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupExceptionTests.cs
similarity index 91%
rename from test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs
rename to test/IISExpress.FunctionalTests/InProcess/StartupExceptionTests.cs
index 0b09c7a465..00b75c3a7c 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/StartupExceptionTests.cs
+++ b/test/IISExpress.FunctionalTests/InProcess/StartupExceptionTests.cs
@@ -4,15 +4,17 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
-using IISIntegration.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
+
     public class StartupExceptionTests : IISFunctionalTestBase
     {
         // TODO FileNotFound here.
-        [Theory]
+        [ConditionalTheory]
         [InlineData("CheckLogFile")]
         [InlineData("CheckErrLogFile")]
         public async Task CheckStdoutWithRandomNumber(string path)
@@ -33,13 +35,15 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
             Assert.Contains(TestSink.Writes, context => context.Message.Contains($"Random number: {randomNumberString}"));
         }
 
-        [Theory]
+        [ConditionalTheory]
         [InlineData("CheckLargeStdErrWrites")]
         [InlineData("CheckLargeStdOutWrites")]
         [InlineData("CheckOversizedStdErrWrites")]
         [InlineData("CheckOversizedStdOutWrites")]
         public async Task CheckStdoutWithLargeWrites(string path)
         {
+            // Need a web.config
+            // Also publish issues.
             var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite");
             deploymentParameters.EnvironmentVariables["ASPNETCORE_INPROCESS_STARTUP_VALUE"] = path;
 
@@ -54,7 +58,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
             Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 4096)));
         }
 
-        [Fact]
+        [ConditionalFact]
         public async Task Gets500_30_ErrorPage()
         {
             var deploymentParameters = Helpers.GetBaseDeploymentParameters("StartupExceptionWebsite");
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs
similarity index 96%
rename from test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs
rename to test/IISExpress.FunctionalTests/InProcess/StartupTests.cs
index eda231066a..14bdceb024 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs
+++ b/test/IISExpress.FunctionalTests/InProcess/StartupTests.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using IISIntegration.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.CommandLineUtils;
@@ -15,7 +15,6 @@ using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
-    [SkipIfIISExpressSchemaMissingInProcess]
     public class StartupTests : IISFunctionalTestBase
     {
         private readonly string _dotnetLocation = DotNetMuxer.MuxerPathOrDefault();
@@ -98,7 +97,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         }
 
         public static TestMatrix TestVariants
-            => TestMatrix.ForServers(ServerType.IISExpress)
+            => TestMatrix.ForServers(DeployerSelector.ServerType)
                 .WithTfms(Tfm.NetCoreApp22)
                 .WithAllApplicationTypes()
                 .WithAncmV2InProcess();
@@ -136,7 +135,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         // Defaults to inprocess specific deployment parameters
         public static DeploymentParameters GetBaseDeploymentParameters(string site = "InProcessWebSite")
         {
-            return new DeploymentParameters(Helpers.GetTestWebSitePath(site), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
+            return new DeploymentParameters(Helpers.GetTestWebSitePath(site), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
             {
                 TargetFramework = Tfm.NetCoreApp22,
                 ApplicationType = ApplicationType.Portable,
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs b/test/IISExpress.FunctionalTests/InProcess/TestServerTest.cs
similarity index 95%
rename from test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs
rename to test/IISExpress.FunctionalTests/InProcess/TestServerTest.cs
index 4b4d3f25c8..a9a7b89fe7 100644
--- a/test/IISIntegration.FunctionalTests/Inprocess/TestServerTest.cs
+++ b/test/IISExpress.FunctionalTests/InProcess/TestServerTest.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using IISIntegration.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs b/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Inprocess/WebSocketTests.cs
rename to test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
similarity index 97%
rename from test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
rename to test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
index 2bef2b3c16..3edfdafb22 100644
--- a/test/IISIntegration.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
+++ b/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using IISIntegration.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Xunit;
 using Xunit.Abstractions;
@@ -141,7 +141,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 
         private DeploymentParameters GetGlobalVersionBaseDeploymentParameters()
         {
-            return new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
+            return new DeploymentParameters(Helpers.GetOutOfProcessTestSitesPath(), DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
             {
                 TargetFramework = Tfm.NetCoreApp22,
                 ApplicationType = ApplicationType.Portable,
diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs
similarity index 97%
rename from test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs
rename to test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs
index 15f3c5f3b9..543481ee14 100644
--- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs
+++ b/test/IISExpress.FunctionalTests/OutOfProcess/HttpsTest.cs
@@ -4,7 +4,7 @@
 using System.Net.Http;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
-using IISIntegration.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.Common;
 using Microsoft.AspNetCore.Testing.xunit;
@@ -16,6 +16,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
     // IIS Express preregisteres 44300-44399 ports with SSL bindings.
     // So these tests always have to use ports in this range, and we can't rely on OS-allocated ports without a whole lot of ceremony around
     // creating self-signed certificates and registering SSL bindings with HTTP.sys
+    // Test specific to IISExpress
     public class HttpsTest : IISFunctionalTestBase
     {
         public HttpsTest(ITestOutputHelper output) : base(output)
@@ -23,7 +24,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         }
 
         public static TestMatrix TestVariants
-            => TestMatrix.ForServers(ServerType.IISExpress)
+            => TestMatrix.ForServers(DeployerSelector.ServerType)
                 .WithTfms(Tfm.NetCoreApp22, Tfm.Net461)
                 .WithAllAncmVersions();
 
diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
similarity index 88%
rename from test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
rename to test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
index 39ae2fe0e3..9aab93a56f 100644
--- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
+++ b/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
@@ -4,7 +4,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using IISIntegration.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
@@ -14,12 +14,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     public class NtlmAuthenticationTests : IISFunctionalTestBase
     {
+        // Test only runs on IISExpress today as our CI machines do not have
+        // Windows auth installed globally.
+        // TODO either enable windows auth on our CI or use containers to test this
+        // behavior
         public NtlmAuthenticationTests(ITestOutputHelper output) : base(output)
         {
         }
 
         public static TestMatrix TestVariants
-            => TestMatrix.ForServers(ServerType.IISExpress)
+            => TestMatrix.ForServers(DeployerSelector.ServerType)
                 .WithTfms(Tfm.NetCoreApp22, Tfm.Net461)
                 .WithAllAncmVersions();
 
@@ -31,6 +35,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
             {
                 ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(),
                 ApplicationBaseUriHint = $"http://localhost:0/",
+                ServerConfigTemplateContent = GetWindowsAuthConfig()
             };
 
             var result = await DeployAsync(deploymentParameters);
diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs b/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs
new file mode 100644
index 0000000000..83d6a8e20a
--- /dev/null
+++ b/test/IISExpress.FunctionalTests/OutOfProcess/WindowsAuthTests.cs
@@ -0,0 +1,45 @@
+// 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.
+
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing.xunit;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
+{
+    public class WindowsAuthTests : IISFunctionalTestBase
+    {
+        public WindowsAuthTests(ITestOutputHelper output = null) : base(output)
+        {
+        }
+
+        public static TestMatrix TestVariants
+            => TestMatrix.ForServers(DeployerSelector.ServerType)
+                .WithTfms(Tfm.NetCoreApp22, Tfm.Net461)
+                .WithAllApplicationTypes()
+                .WithAllAncmVersions();
+
+        [ConditionalTheory]
+        [MemberData(nameof(TestVariants))]
+        public async Task WindowsAuthTest(TestVariant variant)
+        {
+            var deploymentParameters = new DeploymentParameters(variant)
+            {
+                ApplicationPath = Helpers.GetOutOfProcessTestSitesPath(),
+                ServerConfigTemplateContent = GetWindowsAuthConfig()
+            };
+
+            // The default in hosting sets windows auth to true.
+            var deploymentResult = await DeployAsync(deploymentParameters);
+
+            var response = await deploymentResult.HttpClient.GetAsync("/Auth");
+            var responseText = await response.Content.ReadAsStringAsync();
+
+            Assert.True("backcompat;Windows".Equals(responseText) || "latest;Windows".Equals(responseText), "Auth");
+        }
+    }
+}
diff --git a/test/IISExpress.FunctionalTests/SkipIISTestAttribute.cs b/test/IISExpress.FunctionalTests/SkipIISTestAttribute.cs
new file mode 100644
index 0000000000..15bbb9c26c
--- /dev/null
+++ b/test/IISExpress.FunctionalTests/SkipIISTestAttribute.cs
@@ -0,0 +1,17 @@
+// 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.
+
+using System;
+using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing.xunit;
+
+namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
+{
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
+    public sealed class RequiresIISAttribute : Attribute, ITestCondition
+    {
+        public bool IsMet => IISExpressAncmSchema.SupportsInProcessHosting;
+
+        public string SkipReason => IISExpressAncmSchema.SkipReason;
+    }
+}
diff --git a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs b/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
similarity index 81%
rename from test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs
rename to test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
index bc54543067..dc64262d00 100644
--- a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs
+++ b/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using IISIntegration.FunctionalTests.Utilities;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -20,17 +20,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         {
         }
 
-        [Fact]
-        public Task UpgradeFeatureDetectionDisabled_InProcess_IISExpress()
+        [ConditionalFact]
+        public Task UpgradeFeatureDetectionDisabled_InProcess()
         {
+            // fails due to not modifying the apphost.config file.
             return UpgradeFeatureDetectionDeployer(
                 disableWebSocket: true,
                 Helpers.GetInProcessTestSitesPath(),
                 "Disabled", HostingModel.InProcess);
         }
 
-        [Fact]
-        public Task UpgradeFeatureDetectionEnabled_InProcess_IISExpress()
+        [ConditionalFact]
+        public Task UpgradeFeatureDetectionEnabled_InProcess()
         {
             return UpgradeFeatureDetectionDeployer(
                 disableWebSocket: false,
@@ -38,8 +39,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
                 _isWebsocketsSupported, HostingModel.InProcess);
         }
 
-        [Fact]
-        public Task UpgradeFeatureDetectionDisabled_OutOfProcess_IISExpress()
+        [ConditionalFact]
+        public Task UpgradeFeatureDetectionDisabled_OutOfProcess()
         {
             return UpgradeFeatureDetectionDeployer(
                 disableWebSocket: true,
@@ -47,8 +48,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
                 "Disabled", HostingModel.OutOfProcess);
         }
 
-        [Fact]
-        public Task UpgradeFeatureDetectionEnabled_OutOfProcess_IISExpress()
+        [ConditionalFact]
+        public Task UpgradeFeatureDetectionEnabled_OutOfProcess()
         {
             return UpgradeFeatureDetectionDeployer(
                 disableWebSocket: false,
@@ -58,17 +59,18 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 
         private async Task UpgradeFeatureDetectionDeployer(bool disableWebSocket, string sitePath, string expected, HostingModel hostingModel)
         {
-            var deploymentParameters = new DeploymentParameters(sitePath, ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
+            var deploymentParameters = new DeploymentParameters(sitePath, DeployerSelector.ServerType, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64)
             {
                 TargetFramework = Tfm.NetCoreApp22,
                 ApplicationType = ApplicationType.Portable,
                 AncmVersion = AncmVersion.AspNetCoreModuleV2,
                 HostingModel = hostingModel,
-                PublishApplicationBeforeDeployment = hostingModel == HostingModel.InProcess,
+                PublishApplicationBeforeDeployment = hostingModel == HostingModel.InProcess
             };
 
             if (disableWebSocket)
             {
+                // For IIS, we need to modify the apphost.config file
                 deploymentParameters.ServerConfigTemplateContent = GetServerConfig(
                     element => element.Descendants("webSocket")
                         .Single()
diff --git a/test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs
deleted file mode 100644
index 040f03fcad..0000000000
--- a/test/IISIntegration.FunctionalTests/Inprocess/IISTests.cs
+++ /dev/null
@@ -1,40 +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.
-
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
-{
-    [SkipIfIISCannotRun]
-    public class IISTests : FunctionalTestsBase
-    {
-        [ConditionalFact]
-        public Task HelloWorld_IIS_CoreClr_X64_Standalone()
-        {
-            return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Standalone);
-        }
-
-        [ConditionalFact]
-        public Task HelloWorld_IIS_CoreClr_X64_Portable()
-        {
-            return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable);
-        }
-
-        private async Task HelloWorld(RuntimeFlavor runtimeFlavor, ApplicationType applicationType)
-        {
-            var deploymentParameters = Helpers.GetBaseDeploymentParameters();
-            deploymentParameters.ServerType = ServerType.IIS;
-            deploymentParameters.ApplicationType = applicationType;
-
-            var deploymentResult = await DeployAsync(deploymentParameters);
-
-            var response = await deploymentResult.RetryingHttpClient.GetAsync("HelloWorld");
-            var responseText = await response.Content.ReadAsStringAsync();
-
-            Assert.Equal("Hello World", responseText);
-        }
-    }
-}
diff --git a/test/WebSites/InProcessWebSite/Startup.WebSockets.cs b/test/WebSites/InProcessWebSite/Startup.WebSockets.cs
index f3fcdb3a1d..e83ae2a72f 100644
--- a/test/WebSites/InProcessWebSite/Startup.WebSockets.cs
+++ b/test/WebSites/InProcessWebSite/Startup.WebSockets.cs
@@ -8,7 +8,7 @@ using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using IISIntegration.FunctionalTests;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
diff --git a/test/WebSites/OutOfProcessWebSite/Startup.cs b/test/WebSites/OutOfProcessWebSite/Startup.cs
index fc7021c992..185aecb7f4 100644
--- a/test/WebSites/OutOfProcessWebSite/Startup.cs
+++ b/test/WebSites/OutOfProcessWebSite/Startup.cs
@@ -98,6 +98,7 @@ namespace TestSites
             }
             catch(UnauthorizedAccessException)
             {
+                // TODO calling delete on the file will succeed when running with IIS
                 return context.Response.WriteAsync("Hello World");
             }
 
diff --git a/test/WebSites/StressTestWebSite/Startup.cs b/test/WebSites/StressTestWebSite/Startup.cs
index 41eea8728c..68f6eb1f77 100644
--- a/test/WebSites/StressTestWebSite/Startup.cs
+++ b/test/WebSites/StressTestWebSite/Startup.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using System.Threading;
 using System.Text;
 using System.Net.WebSockets;
-using IISIntegration.FunctionalTests;
+using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
diff --git a/test/WebSites/shared/WebSockets/Constants.cs b/test/WebSites/shared/WebSockets/Constants.cs
index 3a27d854f5..95b53003cc 100644
--- a/test/WebSites/shared/WebSockets/Constants.cs
+++ b/test/WebSites/shared/WebSockets/Constants.cs
@@ -1,7 +1,7 @@
 // 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 IISIntegration.FunctionalTests
+namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
     public static class Constants
     {
diff --git a/test/WebSites/shared/WebSockets/HandshakeHelpers.cs b/test/WebSites/shared/WebSockets/HandshakeHelpers.cs
index d477f9113b..b079ea3f85 100644
--- a/test/WebSites/shared/WebSockets/HandshakeHelpers.cs
+++ b/test/WebSites/shared/WebSockets/HandshakeHelpers.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace IISIntegration.FunctionalTests
+namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
     internal static class HandshakeHelpers
     {