diff --git a/.gitattributes b/.gitattributes
index 37a0d6958..8097faf37 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 *       text=auto
 *       text eol=lf
 *.png   -text
+*.exe   -text
diff --git a/build_test_all.cmd b/build_test_all.cmd
index adabea327..93eec2623 100644
--- a/build_test_all.cmd
+++ b/build_test_all.cmd
@@ -8,6 +8,9 @@ if "%target_platform%"=="" set target_platform=x64
 if "%target_configuration%"=="" set target_configuration=Release
 if "%target_version%"=="" set target_version=1.2.3.4
 
+call nuget restore cppwinrt.sln
+call nuget restore natvis\cppwinrtvisualizer.sln
+
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd
 
 if "%target_platform%"=="arm" goto :eof
@@ -18,10 +21,11 @@ _build\%target_platform%\%target_configuration%\cppwinrt.exe -in local -out _bui
 call msbuild /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% natvis\cppwinrtvisualizer.sln
 
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test
+call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_win7
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_fast
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_slow
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_module_lock_custom
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\test_module_lock_none
 call msbuild /m /p:Configuration=%target_configuration%,Platform=%target_platform%,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:test\old_tests\test_old
 
-rem call run_tests.cmd %target_platform% %target_configuration% %target_version%
+call run_tests.cmd %target_platform% %target_configuration%
diff --git a/nuget.exe b/nuget.exe
new file mode 100644
index 000000000..31fc9885e
Binary files /dev/null and b/nuget.exe differ