diff --git a/src/AspNetCore/Src/applicationinfo.cpp b/src/AspNetCore/Src/applicationinfo.cpp
index e63e633a93..4661d922df 100644
--- a/src/AspNetCore/Src/applicationinfo.cpp
+++ b/src/AspNetCore/Src/applicationinfo.cpp
@@ -198,7 +198,7 @@ APPLICATION_INFO::FindRequestHandlerAssembly()
 {
     HRESULT hr = S_OK;
     BOOL    fLocked = FALSE;
-    STACK_STRU(struFileName, 256);
+    STACK_STRU(struFileName, 300); // >MAX_PATH
 
     if (g_fAspnetcoreRHLoadedError)
     {
@@ -296,7 +296,7 @@ APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation(STRU* struFilename)
     // let's still load with full path to avoid security issue
     while (!fDone)
     {
-        DWORD dwReturnedSize = GetModuleFileName(NULL, struFilename->QueryStr(), dwSize);
+        DWORD dwReturnedSize = GetModuleFileNameW(g_hModule, struFilename->QueryStr(), dwSize);
         if (dwReturnedSize == 0)
         {
             hr = HRESULT_FROM_WIN32(GetLastError());
diff --git a/src/AspNetCore/Src/precomp.hxx b/src/AspNetCore/Src/precomp.hxx
index b0c2c5cc4e..1395dbf2e3 100644
--- a/src/AspNetCore/Src/precomp.hxx
+++ b/src/AspNetCore/Src/precomp.hxx
@@ -141,15 +141,16 @@ HRESULT_FROM_GETLASTERROR()
            : E_FAIL;
 }
 
-extern PVOID    g_pModuleId;
-extern BOOL     g_fAspnetcoreRHAssemblyLoaded;
-extern BOOL     g_fAspnetcoreRHLoadedError;
-extern BOOL     g_fEnableReferenceCountTracing;
-extern DWORD    g_dwActiveServerProcesses;
-extern HMODULE  g_hAspnetCoreRH;
-extern SRWLOCK  g_srwLock;
-extern PCWSTR   g_pwzAspnetcoreRequestHandlerName;
+extern PVOID        g_pModuleId;
+extern BOOL         g_fAspnetcoreRHAssemblyLoaded;
+extern BOOL         g_fAspnetcoreRHLoadedError;
+extern BOOL         g_fEnableReferenceCountTracing;
+extern DWORD        g_dwActiveServerProcesses;
+extern HINSTANCE    g_hModule;
+extern HMODULE      g_hAspnetCoreRH;
+extern SRWLOCK      g_srwLock;
+extern PCWSTR       g_pwzAspnetcoreRequestHandlerName;
 
 extern PFN_ASPNETCORE_CREATE_APPLICATION      g_pfnAspNetCoreCreateApplication;
 extern PFN_ASPNETCORE_CREATE_REQUEST_HANDLER  g_pfnAspNetCoreCreateRequestHandler;
-#pragma warning( error : 4091)
\ No newline at end of file
+#pragma warning( error : 4091)
diff --git a/test/IISIntegration.FunctionalTests/HelloWorldTest.cs b/test/IISIntegration.FunctionalTests/HelloWorldTest.cs
index 0a27bb285f..e11475cd89 100644
--- a/test/IISIntegration.FunctionalTests/HelloWorldTest.cs
+++ b/test/IISIntegration.FunctionalTests/HelloWorldTest.cs
@@ -20,13 +20,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         {
         }
 
-        [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
+        [Fact]
         public Task HelloWorld_IISExpress_Clr_X64_Portable()
         {
             return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable);
         }
 
-        [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
+        [Fact]
         public Task HelloWorld_IISExpress_CoreClr_X64_Portable()
         {
             return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable);
diff --git a/test/IISIntegration.FunctionalTests/HttpsTest.cs b/test/IISIntegration.FunctionalTests/HttpsTest.cs
index d0e866c02c..cd41bad911 100644
--- a/test/IISIntegration.FunctionalTests/HttpsTest.cs
+++ b/test/IISIntegration.FunctionalTests/HttpsTest.cs
@@ -25,13 +25,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         {
         }
 
-        [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
+        [Fact]
         public Task Https_HelloWorld_CLR_X64()
         {
             return HttpsHelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44396);
         }
 
-        [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
+        [Fact]
         public Task Https_HelloWorld_CoreCLR_X64_Portable()
         {
             return HttpsHelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44394);
@@ -93,13 +93,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
             }
         }
 
-        [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
+        [Fact]
         public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable()
         {
             return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false);
         }
 
-        [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
+        [Fact]
         public Task Https_HelloWorld_NoClientCert_Clr_X64()
         {
             return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44398, sendClientCert: false);
@@ -138,7 +138,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
                     ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Https.config") : null,
                     SiteName = "HttpsTestSite", // This is configured in the Https.config
                     TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0",
-                    ApplicationType = applicationType
+                    ApplicationType = applicationType,
+                    Configuration =
+#if DEBUG
+                        "Debug"
+#else
+                        "Release"
+#endif
                 };
 
                 using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory))
diff --git a/test/IISIntegration.FunctionalTests/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/NtlmAuthentationTest.cs
index f5f8fd7aa1..dd081ac4ec 100644
--- a/test/IISIntegration.FunctionalTests/NtlmAuthentationTest.cs
+++ b/test/IISIntegration.FunctionalTests/NtlmAuthentationTest.cs
@@ -25,13 +25,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         {
         }
 
-        [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
+        [Fact]
         public Task NtlmAuthentication_Clr_X64()
         {
             return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051);
         }
 
-        [Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
+        [Fact]
         public Task NtlmAuthentication_CoreClr_X64_Portable()
         {
             return NtlmAuthentication(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 5052);