diff --git a/build/VStudio/installer/Product.wxs b/build/VStudio/installer/Product.wxs
index 1faaa706..89c25421 100644
--- a/build/VStudio/installer/Product.wxs
+++ b/build/VStudio/installer/Product.wxs
@@ -262,17 +262,15 @@
                 <Component Id="C.passthrough.c">
                     <File Name="passthrough.c" KeyPath="yes" />
                 </Component>
-                <Directory Id="SMPDIR.passthrough.passthrough" Name="passthrough">
-                    <Component Id="C.passthrough.sln">
-                        <File Name="passthrough.sln" KeyPath="yes" />
-                    </Component>
-                    <Component Id="C.passthrough.vcxproj">
-                        <File Name="passthrough.vcxproj" KeyPath="yes" />
-                    </Component>
-                    <Component Id="C.passthrough.vcxproj.filters">
-                        <File Name="passthrough.vcxproj.filters" KeyPath="yes" />
-                    </Component>
-                </Directory>
+                <Component Id="C.passthrough.sln">
+                    <File Name="passthrough.sln" KeyPath="yes" />
+                </Component>
+                <Component Id="C.passthrough.vcxproj">
+                    <File Name="passthrough.vcxproj" KeyPath="yes" />
+                </Component>
+                <Component Id="C.passthrough.vcxproj.filters">
+                    <File Name="passthrough.vcxproj.filters" KeyPath="yes" />
+                </Component>
             </Directory>
         </DirectoryRef>
         <DirectoryRef Id="SYMDIR">
diff --git a/tst/passthrough/passthrough/.gitignore b/tst/passthrough/.gitignore
similarity index 100%
rename from tst/passthrough/passthrough/.gitignore
rename to tst/passthrough/.gitignore
diff --git a/tst/passthrough/passthrough.c b/tst/passthrough/passthrough.c
index 03b22a90..5a0d5385 100644
--- a/tst/passthrough/passthrough.c
+++ b/tst/passthrough/passthrough.c
@@ -895,7 +895,6 @@ static NTSTATUS WinFspLoad(VOID)
 #endif
 #define FSP_DLLPATH                     "bin\\" FSP_DLLNAME
 
-    LONG WINAPI __HrLoadAllImportsForDll(CONST CHAR *);
     WCHAR PathBuf[MAX_PATH - (sizeof L"" FSP_DLLPATH / sizeof(WCHAR) - 1)];
     DWORD Size;
     LONG Result;
@@ -916,10 +915,6 @@ static NTSTATUS WinFspLoad(VOID)
         Module = LoadLibraryW(PathBuf);
         if (0 == Module)
             return STATUS_DLL_NOT_FOUND;
-
-        Result = __HrLoadAllImportsForDll(FSP_DLLNAME);
-        if (0 > Result)
-            return STATUS_DELAY_LOAD_FAILED;
     }
 
     return STATUS_SUCCESS;
diff --git a/tst/passthrough/passthrough/passthrough.sln b/tst/passthrough/passthrough.sln
similarity index 100%
rename from tst/passthrough/passthrough/passthrough.sln
rename to tst/passthrough/passthrough.sln
diff --git a/tst/passthrough/passthrough/passthrough.vcxproj b/tst/passthrough/passthrough.vcxproj
similarity index 97%
rename from tst/passthrough/passthrough/passthrough.vcxproj
rename to tst/passthrough/passthrough.vcxproj
index 88aa1816..d900c845 100644
--- a/tst/passthrough/passthrough/passthrough.vcxproj
+++ b/tst/passthrough/passthrough.vcxproj
@@ -18,6 +18,9 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="passthrough.c" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9E0E5997-7316-4818-A130-00B3AF1AD354}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -173,9 +176,6 @@
       <DelayLoadDLLs>winfsp-$(PlatformTarget).dll</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\passthrough.c" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/tst/passthrough/passthrough/passthrough.vcxproj.filters b/tst/passthrough/passthrough.vcxproj.filters
similarity index 88%
rename from tst/passthrough/passthrough/passthrough.vcxproj.filters
rename to tst/passthrough/passthrough.vcxproj.filters
index 95c934cb..44a05b3b 100644
--- a/tst/passthrough/passthrough/passthrough.vcxproj.filters
+++ b/tst/passthrough/passthrough.vcxproj.filters
@@ -7,7 +7,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\passthrough.c">
+    <ClCompile Include="passthrough.c">
       <Filter>Source</Filter>
     </ClCompile>
   </ItemGroup>