diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters
index 4919eeee..c47f77b9 100644
--- a/test/vs2019/etl.vcxproj.filters
+++ b/test/vs2019/etl.vcxproj.filters
@@ -2915,30 +2915,15 @@
     <ClCompile Include="..\sanity-check\crc32_xfer.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
-    <ClCompile Include="..\sanity-check\correlation.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\covariance.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\crc16.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\crc16_a.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
     <ClCompile Include="..\sanity-check\crc16_arc.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\sanity-check\crc16_aug_ccitt.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\crc16_buypass.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\sanity-check\crc16_ccitt.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\crc16_cdma2000.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
@@ -2957,18 +2942,12 @@
     <ClCompile Include="..\sanity-check\crc16_en13757.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\sanity-check\crc16_genibus.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\crc16_maxim.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
     <ClCompile Include="..\sanity-check\crc16_mcrf4xx.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\sanity-check\crc16_modbus.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\crc16_profibus.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
@@ -2984,36 +2963,18 @@
     <ClCompile Include="..\sanity-check\crc16_tms37157.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\sanity-check\crc16_usb.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\crc32_d.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
     <ClCompile Include="..\sanity-check\crc32_jamcrc.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\sanity-check\crc32_mpeg2.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\crc32_q.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
     <ClCompile Include="..\sanity-check\crc32_xfer.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\sanity-check\crc64_ecma.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\crc8_cdma2000.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\crc8_darc.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\crc8_dvbs2.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\crc8_ebu.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
@@ -3026,39 +2987,9 @@
     <ClCompile Include="..\sanity-check\crc8_maxim.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\sanity-check\crc8_rohc.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\crc8_wcdma.h.t.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\sanity-check\gamma.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\variant.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\variant_pool.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\vector.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\version.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\visitor.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\wformat_spec.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\wstring.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sanity-check\wstring_stream.h.t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_byte.cpp">
       <Filter>Tests\Binary</Filter>
     </ClCompile>
@@ -3227,6 +3158,75 @@
     <ClCompile Include="..\sanity-check\message_timer_locked.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
+    <ClCompile Include="..\sanity-check\correlation.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\covariance.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc8_cdma2000.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc8_darc.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc8_dvbs2.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc8_rohc.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc16.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc16_aug_ccitt.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc16_ccitt.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc16_genibus.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc16_modbus.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc16_usb.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc32_mpeg2.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\crc64_ecma.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\gamma.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\variant.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\variant_pool.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\vector.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\version.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\visitor.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\wformat_spec.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\wstring.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sanity-check\wstring_stream.h.t.cpp">
+      <Filter>Tests\Sanity Checks</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\library.properties">