Index: msbuild.proj
===================================================================
diff -u -rd6c3523b8a96c26c0c448dc35964d172661e9be5 -r8c7dd924e354ba961910136e6b7d090921e98b0d
--- msbuild.proj	(.../msbuild.proj)	(revision d6c3523b8a96c26c0c448dc35964d172661e9be5)
+++ msbuild.proj	(.../msbuild.proj)	(revision 8c7dd924e354ba961910136e6b7d090921e98b0d)
@@ -13,4 +13,10 @@
         <MSBuild Projects="ch.vc140.sln" Properties="Configuration=Release;Platform=x64" StopOnFirstFailure="true"></MSBuild>
         <MSBuild Projects="ch.vc140.sln" Properties="Configuration=Release;Platform=Win32" StopOnFirstFailure="true"></MSBuild>
     </Target>
+    <Target Name="UnitTests">
+        <MSBuild Projects="ch.vc140.sln" Targets="Build" Properties="Configuration=Testing Debug;Platform=x64" StopOnFirstFailure="true"></MSBuild>
+        <MSBuild Projects="ch.vc140.sln" Targets="Build" Properties="Configuration=Testing Debug;Platform=Win32" StopOnFirstFailure="true"></MSBuild>
+        <MSBuild Projects="ch.vc140.sln" Targets="Build" Properties="Configuration=Testing Release;Platform=x64" StopOnFirstFailure="true"></MSBuild>
+        <MSBuild Projects="ch.vc140.sln" Targets="Build" Properties="Configuration=Testing Release;Platform=Win32" StopOnFirstFailure="true"></MSBuild>
+    </Target>
 </Project>
\ No newline at end of file
Index: src/ch/ch.vc140.vcxproj
===================================================================
diff -u -r50ad2dc9f0b42ba432bb54e4a042582277410773 -r8c7dd924e354ba961910136e6b7d090921e98b0d
--- src/ch/ch.vc140.vcxproj	(.../ch.vc140.vcxproj)	(revision 50ad2dc9f0b42ba432bb54e4a042582277410773)
+++ src/ch/ch.vc140.vcxproj	(.../ch.vc140.vcxproj)	(revision 8c7dd924e354ba961910136e6b7d090921e98b0d)
@@ -247,7 +247,7 @@
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
-"$(TargetPath)"
+"$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -328,7 +328,7 @@
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
-"$(TargetPath)"
+"$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -407,7 +407,7 @@
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
-"$(TargetPath)"
+"$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -486,7 +486,7 @@
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
-"$(TargetPath)"
+"$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
Index: src/chext/chext.vc140.vcxproj
===================================================================
diff -u -rbfc7a8378a96c5b58def559b343918fca32f05a6 -r8c7dd924e354ba961910136e6b7d090921e98b0d
--- src/chext/chext.vc140.vcxproj	(.../chext.vc140.vcxproj)	(revision bfc7a8378a96c5b58def559b343918fca32f05a6)
+++ src/chext/chext.vc140.vcxproj	(.../chext.vc140.vcxproj)	(revision 8c7dd924e354ba961910136e6b7d090921e98b0d)
@@ -254,27 +254,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -349,27 +336,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -444,27 +418,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -541,27 +502,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
Index: src/ictranslate/ictranslate.vc140.vcxproj
===================================================================
diff -u -r01c23a9670213cb44390d6370123de6fe26b9f66 -r8c7dd924e354ba961910136e6b7d090921e98b0d
--- src/ictranslate/ictranslate.vc140.vcxproj	(.../ictranslate.vc140.vcxproj)	(revision 01c23a9670213cb44390d6370123de6fe26b9f66)
+++ src/ictranslate/ictranslate.vc140.vcxproj	(.../ictranslate.vc140.vcxproj)	(revision 8c7dd924e354ba961910136e6b7d090921e98b0d)
@@ -239,7 +239,7 @@
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
-"$(TargetPath)"
+"$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -306,7 +306,7 @@
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
-"$(TargetPath)"
+"$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -379,7 +379,7 @@
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
-"$(TargetPath)"
+"$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -452,7 +452,7 @@
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
-"$(TargetPath)"
+"$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
Index: src/libchcore/libchcore.vc140.vcxproj
===================================================================
diff -u -rbfc7a8378a96c5b58def559b343918fca32f05a6 -r8c7dd924e354ba961910136e6b7d090921e98b0d
--- src/libchcore/libchcore.vc140.vcxproj	(.../libchcore.vc140.vcxproj)	(revision bfc7a8378a96c5b58def559b343918fca32f05a6)
+++ src/libchcore/libchcore.vc140.vcxproj	(.../libchcore.vc140.vcxproj)	(revision 8c7dd924e354ba961910136e6b7d090921e98b0d)
@@ -223,27 +223,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -305,27 +292,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -381,27 +355,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -463,27 +424,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
Index: src/libicpf/libicpf.vc140.vcxproj
===================================================================
diff -u -rb5982438edac1abb34f8f5013ba073fd01523afc -r8c7dd924e354ba961910136e6b7d090921e98b0d
--- src/libicpf/libicpf.vc140.vcxproj	(.../libicpf.vc140.vcxproj)	(revision b5982438edac1abb34f8f5013ba073fd01523afc)
+++ src/libicpf/libicpf.vc140.vcxproj	(.../libicpf.vc140.vcxproj)	(revision 8c7dd924e354ba961910136e6b7d090921e98b0d)
@@ -221,27 +221,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -305,27 +292,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -381,27 +355,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -463,27 +424,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
Index: src/libictranslate/libictranslate.vc140.vcxproj
===================================================================
diff -u -r01c23a9670213cb44390d6370123de6fe26b9f66 -r8c7dd924e354ba961910136e6b7d090921e98b0d
--- src/libictranslate/libictranslate.vc140.vcxproj	(.../libictranslate.vc140.vcxproj)	(revision 01c23a9670213cb44390d6370123de6fe26b9f66)
+++ src/libictranslate/libictranslate.vc140.vcxproj	(.../libictranslate.vc140.vcxproj)	(revision 8c7dd924e354ba961910136e6b7d090921e98b0d)
@@ -244,27 +244,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -335,27 +322,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -428,27 +402,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -523,27 +484,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>