diff --git a/test/vs2017/etl.vcxproj b/test/vs2017/etl.vcxproj
index 56fdcb83..d38c27c9 100644
--- a/test/vs2017/etl.vcxproj
+++ b/test/vs2017/etl.vcxproj
@@ -19,7 +19,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>unittest</RootNamespace>
     <ProjectName>etl</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/test/vs2017/etl.vcxproj.filters b/test/vs2017/etl.vcxproj.filters
index e37d92fc..6be3e083 100644
--- a/test/vs2017/etl.vcxproj.filters
+++ b/test/vs2017/etl.vcxproj.filters
@@ -39,93 +39,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\AssertException.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\CheckMacros.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\Checks.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\CompositeTestReporter.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\Config.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\CurrentTest.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\DeferredTestReporter.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\DeferredTestResult.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\ExceptionMacros.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\ExecuteTest.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\HelperMacros.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\MemoryOutStream.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\ReportAssert.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\ReportAssertImpl.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\Test.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\TestDetails.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\TestList.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\TestMacros.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\TestReporter.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\TestReporterStdout.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\TestResults.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\TestRunner.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\TestSuite.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\TimeConstraint.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\TimeHelpers.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\UnitTest++.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\UnitTestPP.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\XmlTestReporter.h">
-      <Filter>UnitTest++</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.h">
-      <Filter>UnitTest++\Win32</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\doxygen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -441,62 +354,95 @@
     <ClInclude Include="..\..\src\reference_flat_set.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\AssertException.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\CheckMacros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\Checks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\CompositeTestReporter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\CurrentTest.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\DeferredTestReporter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\DeferredTestResult.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\ExceptionMacros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\ExecuteTest.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\HelperMacros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\MemoryOutStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\ReportAssert.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\ReportAssertImpl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\Test.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\TestDetails.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\TestList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\TestMacros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\TestReporter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\TestReporterStdout.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\TestResults.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\TestRunner.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\TestSuite.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\TimeConstraint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\TimeHelpers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\UnitTest++.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\UnitTestPP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unittest-cpp\UnitTest++\XmlTestReporter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\AssertException.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\Checks.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\CompositeTestReporter.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\CurrentTest.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\DeferredTestReporter.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\DeferredTestResult.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\MemoryOutStream.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\ReportAssert.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\Test.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\TestDetails.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\TestList.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\TestReporter.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\TestReporterStdout.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\TestResults.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\TestRunner.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\TimeConstraint.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\XmlTestReporter.cpp">
-      <Filter>UnitTest++</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp">
-      <Filter>UnitTest++\Win32</Filter>
-    </ClCompile>
     <ClCompile Include="..\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -764,6 +710,60 @@
     <ClCompile Include="..\test_reference_flat_set.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\AssertException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\Checks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\CompositeTestReporter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\CurrentTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\DeferredTestReporter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\DeferredTestResult.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\MemoryOutStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\ReportAssert.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\Test.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\TestDetails.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\TestList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\TestReporter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\TestReporterStdout.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\TestResults.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\TestRunner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\TimeConstraint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittest-cpp\UnitTest++\XmlTestReporter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Doxyfile">