From 2353672b644ee36e2ef8ed9ba6c824cf5b126f74 Mon Sep 17 00:00:00 2001
From: John Wellbelove <jwellbelove@users.noreply.github.com>
Date: Sat, 22 Jan 2022 21:11:18 +0000
Subject: [PATCH] Renamed compile time state machine classes

---
 include/etl/state_chart.h                     |   18 +-
 test/CMakeLists.txt                           |    4 +-
 test/test_state_chart_compile_time.cpp        |   14 +-
 ...chart_compile_time_with_data_parameter.cpp |    2 +-
 test/vs2019/etl.vcxproj.filters               | 1682 +++++++++--------
 5 files changed, 885 insertions(+), 835 deletions(-)

diff --git a/include/etl/state_chart.h b/include/etl/state_chart.h
index d3c4b8f8..7907a545 100644
--- a/include/etl/state_chart.h
+++ b/include/etl/state_chart.h
@@ -196,7 +196,7 @@ namespace etl
             const etl::state_chart_traits::state<TObject>*            State_Table_Begin,
             size_t                                                    State_Table_Size,
             etl::state_chart_traits::state_id_t                       Initial_State>
-  class state_chart_ctv : public istate_chart<void>
+  class state_chart_ct : public istate_chart<void>
   {
   public:  
 
@@ -209,7 +209,7 @@ namespace etl
     //*************************************************************************
     /// Constructor.
     //*************************************************************************
-    ETL_CONSTEXPR state_chart_ctv()
+    ETL_CONSTEXPR state_chart_ct()
       : current_state_id(Initial_State)
       , started(false)
     {
@@ -271,7 +271,7 @@ namespace etl
     /// that satisfies the conditions for executing the action.
     /// \param event_id The id of the event to process.
     //*************************************************************************
-    virtual void process_event(event_id_t event_id/*, parameter_t data*/) ETL_OVERRIDE
+    virtual void process_event(event_id_t event_id) ETL_OVERRIDE
     {
       if (started)
       {
@@ -379,8 +379,8 @@ namespace etl
     };
 
     // Disabled
-    state_chart_ctv(const state_chart_ctv&) ETL_DELETE;
-    state_chart_ctv& operator =(const state_chart_ctv&) ETL_DELETE;
+    state_chart_ct(const state_chart_ct&) ETL_DELETE;
+    state_chart_ct& operator =(const state_chart_ct&) ETL_DELETE;
 
     state_id_t current_state_id; ///< The current state id.
     bool       started;          ///< Set if the state chart has been started.
@@ -399,7 +399,7 @@ namespace etl
             const etl::state_chart_traits::state<TObject>*                  State_Table_Begin,
             size_t                                                          State_Table_Size,
             etl::state_chart_traits::state_id_t                             Initial_State>
-  class state_chart_ct : public istate_chart<TParameter>
+  class state_chart_ctp : public istate_chart<TParameter>
   {
   public:
 
@@ -412,7 +412,7 @@ namespace etl
     //*************************************************************************
     /// Constructor.
     //*************************************************************************
-    ETL_CONSTEXPR state_chart_ct()
+    ETL_CONSTEXPR state_chart_ctp()
       : current_state_id(Initial_State)
       , started(false)
     {
@@ -586,8 +586,8 @@ namespace etl
     };
 
     // Disabled
-    state_chart_ct(const state_chart_ct&) ETL_DELETE;
-    state_chart_ct& operator =(const state_chart_ct&) ETL_DELETE;
+    state_chart_ctp(const state_chart_ctp&) ETL_DELETE;
+    state_chart_ctp& operator =(const state_chart_ctp&) ETL_DELETE;
 
     state_id_t current_state_id; ///< The current state id.
     bool       started;          ///< Set if the state chart has been started.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f8a755c8..ca5cc316 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -224,6 +224,8 @@ set(TEST_SOURCE_FILES
 	test_state_chart.cpp
 	test_state_chart_with_data_parameter.cpp
 	test_state_chart_with_rvalue_data_parameter.cpp
+	test_state_chart_compile_time.cpp
+	test_state_chart_compile_time_with_data_parameter.cpp
 	test_string_char.cpp
 	test_string_char_external_buffer.cpp
 	test_string_stream.cpp
@@ -255,7 +257,7 @@ set(TEST_SOURCE_FILES
 	test_type_lookup.cpp
 	test_type_select.cpp
 	test_type_traits.cpp
-#	test_unaligned_type.cpp
+	test_unaligned_type.cpp
 	test_unordered_map.cpp
 	test_unordered_multimap.cpp
 	test_unordered_multiset.cpp
diff --git a/test/test_state_chart_compile_time.cpp b/test/test_state_chart_compile_time.cpp
index 7ef25e30..10010efd 100644
--- a/test/test_state_chart_compile_time.cpp
+++ b/test/test_state_chart_compile_time.cpp
@@ -232,13 +232,13 @@ namespace
 
   MotorControl motorControl;
 
-  etl::state_chart_ctv<MotorControl, 
-                       motorControl, 
-                       transitionTable,
-                       7,
-                       stateTable,
-                       3,
-                       StateId::IDLE> motorControlStateChart;
+  etl::state_chart_ct<MotorControl, 
+                      motorControl, 
+                      transitionTable,
+                      7,
+                      stateTable,
+                      3,
+                      StateId::IDLE> motorControlStateChart;
 
   SUITE(test_state_chart_compile_time)
   {
diff --git a/test/test_state_chart_compile_time_with_data_parameter.cpp b/test/test_state_chart_compile_time_with_data_parameter.cpp
index f0eb1da9..b993d615 100644
--- a/test/test_state_chart_compile_time_with_data_parameter.cpp
+++ b/test/test_state_chart_compile_time_with_data_parameter.cpp
@@ -238,7 +238,7 @@ namespace
 
   MotorControl motorControl;
 
-  etl::state_chart_ct<MotorControl,
+  etl::state_chart_ctp<MotorControl,
                        int,
                        motorControl,
                        transitionTable,
diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters
index f0ceaa54..54d11a90 100644
--- a/test/vs2019/etl.vcxproj.filters
+++ b/test/vs2019/etl.vcxproj.filters
@@ -115,6 +115,54 @@
     <Filter Include="Tests\Scripts">
       <UniqueIdentifier>{562466b5-677d-4448-9e9e-f70805cd71ad}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ETL\Maths\CRC">
+      <UniqueIdentifier>{66b8d39a-b610-4d5e-925a-4995f2ac74b2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ETL\Maths\Hash">
+      <UniqueIdentifier>{a1af709b-90d3-4506-b742-3231d0fff1f5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Strings">
+      <UniqueIdentifier>{43578ed8-b61d-4210-b5d4-bb4a26351934}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Messaging">
+      <UniqueIdentifier>{c75cedd3-8b6c-4662-b965-aecbe7fd5d1c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\CRC">
+      <UniqueIdentifier>{da470864-7708-4e89-a24c-93a9ca2c4856}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Containers">
+      <UniqueIdentifier>{0873470d-a6d9-445c-bbc0-33252978ecff}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Queues">
+      <UniqueIdentifier>{b42bb316-6e55-4336-a72a-fc5f28d82ea5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Callbacks &amp; Delegates">
+      <UniqueIdentifier>{a300635d-25da-4af6-b7e7-1e27ec9df921}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Timers">
+      <UniqueIdentifier>{dc898ba2-50f4-4c3d-abee-039670df8582}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\State Machines">
+      <UniqueIdentifier>{e260d680-649f-41b5-844d-c736a252dcb5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Algorithms">
+      <UniqueIdentifier>{21e56de9-b458-4395-9949-3abfb1f5723b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Binary">
+      <UniqueIdentifier>{d115746e-4d33-41b4-b88f-9fb2ca225286}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Hashes">
+      <UniqueIdentifier>{a1417994-24a2-40ae-a934-ea318299f91c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Test Support">
+      <UniqueIdentifier>{126a3068-3048-4210-8cdf-41ec9e2e1436}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Types">
+      <UniqueIdentifier>{a8738fb5-ff9c-40c2-b3c0-4843ca55097c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tests\Patterns">
+      <UniqueIdentifier>{89fc701f-b9ea-4ff3-beac-199c003c4b3e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\etl\enum_type.h">
@@ -222,15 +270,6 @@
     <ClInclude Include="..\..\include\etl\instance_count.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\etl\checksum.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\fnv_1.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\hash.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\radix.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
@@ -246,9 +285,6 @@
     <ClInclude Include="..\..\include\etl\flat_map.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\etl\ihash.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\flat_set.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
@@ -273,18 +309,6 @@
     <ClInclude Include="..\..\include\etl\priority_queue.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\etl\jenkins.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\murmur3.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\murmurhash3.h">
-      <Filter>Tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\pearson.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\flat_multimap.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
@@ -429,9 +453,6 @@
     <ClInclude Include="..\..\include\etl\profiles\ticc.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
-    <ClInclude Include="..\etl_profile.h">
-      <Filter>Tests</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\profiles\gcc_generic.h">
       <Filter>ETL\Profiles</Filter>
     </ClInclude>
@@ -654,9 +675,6 @@
     <ClInclude Include="..\..\include\etl\callback_service.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\etl\frame_check_sequence.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\queue_spsc_locked.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
@@ -753,9 +771,6 @@
     <ClInclude Include="..\..\include\etl\limits.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\iterators_for_unit_tests.h">
-      <Filter>Tests</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\mutex\mutex_freertos.h">
       <Filter>ETL\Utilities\Mutex</Filter>
     </ClInclude>
@@ -909,9 +924,6 @@
     <ClInclude Include="..\..\include\etl\message_router_registry.h">
       <Filter>ETL\Frameworks</Filter>
     </ClInclude>
-    <ClInclude Include="..\unit_test_framework.h">
-      <Filter>Tests</Filter>
-    </ClInclude>
     <ClInclude Include="..\sanity-check\c++03\etl_profile.h">
       <Filter>Tests\Sanity Checks\C++03</Filter>
     </ClInclude>
@@ -924,150 +936,12 @@
     <ClInclude Include="..\sanity-check\c++17\etl_profile.h">
       <Filter>Tests\Sanity Checks\C++17</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc8_ccitt.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc8_rohc.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_aug_ccitt.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_ccitt.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_genibus.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_kermit.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_modbus.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_usb.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_x25.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_xmodem.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc32.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc32_bzip2.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc32_c.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc32_mpeg2.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc32_posix.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc64_ecma.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\private\crc_implementation.h">
       <Filter>ETL\Private</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\etl\private\crc_parameters.h">
       <Filter>ETL\Private</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc8_cdma2000.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc8_darc.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc8_dvbs2.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc8_icode.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc8_itu.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc8_maxim.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc8_wcdma.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_buypass.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_dectr.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_dectx.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_teledisk.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc32_d.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc32_jamcrc.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc32_q.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc32_xfer.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc8_ebu.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_a.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_arc.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_cdma2000.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_dds110.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_dnp.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_en13757.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_maxim.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_mcrf4xx.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_profibus.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_riello.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_t10dif.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc16_tms37157.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\etl\crc.h">
-      <Filter>ETL\Maths</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\correlation.h">
       <Filter>ETL\Maths</Filter>
     </ClInclude>
@@ -1179,77 +1053,188 @@
     <ClInclude Include="..\..\include\etl\unaligned_type.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_ccitt.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_cdma2000.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_darc.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_dvbs2.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_ebu.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_icode.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_itu.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_maxim.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_rohc.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc8_wcdma.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_a.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_arc.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_aug_ccitt.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_buypass.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_ccitt.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_cdma2000.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_dds110.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_dectr.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_dectx.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_dnp.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_en13757.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_genibus.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_kermit.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_maxim.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_mcrf4xx.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_modbus.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_profibus.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_riello.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_t10dif.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_teledisk.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_tms37157.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_usb.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_x25.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc16_xmodem.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc32.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc32_bzip2.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc32_c.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc32_d.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc32_jamcrc.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc32_mpeg2.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc32_posix.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc32_q.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc32_xfer.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\crc64_ecma.h">
+      <Filter>ETL\Maths\CRC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\checksum.h">
+      <Filter>ETL\Maths\Hash</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\fnv_1.h">
+      <Filter>ETL\Maths\Hash</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\frame_check_sequence.h">
+      <Filter>ETL\Maths\Hash</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\hash.h">
+      <Filter>ETL\Maths\Hash</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\ihash.h">
+      <Filter>ETL\Maths\Hash</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\jenkins.h">
+      <Filter>ETL\Maths\Hash</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\murmur3.h">
+      <Filter>ETL\Maths\Hash</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\pearson.h">
+      <Filter>ETL\Maths\Hash</Filter>
+    </ClInclude>
+    <ClInclude Include="..\murmurhash3.h">
+      <Filter>Tests\Test Support</Filter>
+    </ClInclude>
+    <ClInclude Include="..\iterators_for_unit_tests.h">
+      <Filter>Tests\Test Support</Filter>
+    </ClInclude>
+    <ClInclude Include="..\etl_profile.h">
+      <Filter>Tests\Test Support</Filter>
+    </ClInclude>
+    <ClInclude Include="..\unit_test_framework.h">
+      <Filter>Tests\Test Support</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\main.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_array.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_enum_type.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_exception.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_function.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_queue.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_stack.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_vector.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_largest.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_numeric.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_container.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_cyclic_value.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_visitor.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_list.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_deque.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_integral_limits.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_bitset.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_variant_legacy.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_smallest.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_maths.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_alignment.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_pool.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_algorithm.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_error_handler.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
@@ -1259,228 +1244,45 @@
     <ClCompile Include="..\test_instance_count.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_checksum.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_fnv_1.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_hash.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_endian.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_bloom_filter.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_forward_list.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_fixed_iterator.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_binary.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_flat_map.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_flat_set.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_observer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_io_port.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
     <ClCompile Include="..\test_optional.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_priority_queue.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_flat_multimap.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_jenkins.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_murmur3.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\murmurhash3.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_flat_multiset.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_pearson.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_bsd_checksum.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_intrusive_forward_list.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_unordered_map.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_intrusive_links.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_intrusive_list.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_xor_checksum.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_unordered_set.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_unordered_multimap.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_unordered_multiset.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_debounce.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_char.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_u32.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_u16.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_wchar_t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_vector_pointer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_type_def.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_intrusive_stack.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_utility.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_intrusive_queue.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_random.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_map.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_multimap.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_multiset.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_set.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_iterator.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_memory.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_vector_non_trivial.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_reference_flat_map.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_reference_flat_multimap.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_reference_flat_multiset.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_reference_flat_set.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_fsm.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_message_router.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_packet.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_task_scheduler.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_message_bus.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_user_type.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_constant.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
     <ClCompile Include="..\test_parameter_type.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_type_lookup.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_compare.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_message_timer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_callback_timer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_compare.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_variant_pool.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_array_view.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_view.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_array_wrapper.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_xor_rotate_checksum.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_atomic_std.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_queue_mpmc_mutex.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_queue_spsc_atomic.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_queue_spsc_isr.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_type_select.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\AssertException.cpp">
       <Filter>UnitTest++</Filter>
     </ClCompile>
@@ -1544,159 +1346,12 @@
     <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.cpp">
       <Filter>UnitTest++\Win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_queue_memory_model_small.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_queue_mpmc_mutex_small.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_queue_spsc_atomic_small.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_queue_spsc_isr_small.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_list_shared_pool.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_forward_list_shared_pool.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_bit_stream.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_state_chart.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_scaled_rounding.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_cumulative_moving_average.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_callback_service.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_queue_spsc_locked.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_queue_spsc_locked_small.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_to_string.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_vector_external_buffer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_vector_pointer_external_buffer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_to_wstring.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_to_u16string.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_to_u32string.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_multi_array.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_delegate.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_delegate_service.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_compiler_settings.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_indirect_vector.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_indirect_vector_external_buffer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_make_string.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_type_traits.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_limits.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_parity_checksum.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_message_packet.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_span.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_char_external_buffer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_wchar_t_external_buffer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_u16_external_buffer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_u32_external_buffer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_parameter_pack.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_string_stream.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_stream_u16.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_stream_u32.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_stream_wchar_t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_utilities.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_utilities_wchar_t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_utilities_u16.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_utilities_u32.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_utilities_std.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_utilities_std_wchar_t.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_utilities_std_u16.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_string_utilities_std_u32.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_bresenham_line.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_circular_buffer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_circular_buffer_external_buffer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_flags.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
@@ -1706,216 +1361,12 @@
     <ClCompile Include="..\test_atomic_clang_sync.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_format_spec.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_multi_range.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_shared_message.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_fixed_sized_memory_block_allocator.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_queue_lockable.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_queue_lockable_small.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_state_chart_with_data_parameter.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_state_chart_with_rvalue_data_parameter.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_message_router_registry.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc8_ccitt.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc8_cdma2000.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc8_darc.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc8_dvbs2.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc8_ebu.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc8_icode.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc8_itu.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc8_maxim.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc8_rohc.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc8_wcdma.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_ccitt.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_kermit.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_modbus.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_usb.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_xmodem.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_aug_ccitt.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_genibus.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_x25.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_buypass.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_profibus.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc32.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc32_c.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc32_bzip2.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc32_posix.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc32_mpeg2.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc64_ecma.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_cdma2000.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_dds110.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_dectr.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_dectx.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_dnp.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_en13757.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_mcrf4xx.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_riello.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_t10dif.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_maxim.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_teledisk.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_tms37157.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_a.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc32_d.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc32_q.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc32_jamcrc.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc32_xfer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_crc16_arc.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_histogram.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_correlation.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_covariance.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_standard_deviation.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_variance.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_threshold.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_invert.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_limiter.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_quantize.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_gamma.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_rescale.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_rms.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_mean.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_atomic_gcc_sync.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_hfsm.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_variant_variadic.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_mem_cast.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
@@ -1931,9 +1382,6 @@
     <ClCompile Include="..\test_overload.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_delegate_service_compile_time.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\absolute.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
@@ -2981,9 +2429,6 @@
     <ClCompile Include="..\test_mean.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_bip_buffer_spsc_atomic.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\correlation.h.t.cpp">
       <Filter>Source Files\Sanity Checks</Filter>
     </ClCompile>
@@ -3032,9 +2477,6 @@
     <ClCompile Include="..\test_bip_buffer_spsc_atomic.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_byte_stream.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\bip_buffer_spsc_atomic.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
@@ -3044,68 +2486,674 @@
     <ClCompile Include="..\test_result.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_multi_vector.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_pool_external_buffer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_multi_span.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_variant_pool_external_buffer.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\multi_span.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
     <ClCompile Include="..\sanity-check\nth_type.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_callback_timer_atomic.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\callback_timer_atomic.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
     <ClCompile Include="..\sanity-check\multi_vector.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_message_timer_atomic.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\message_timer_atomic.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_callback_timer_locked.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_delegate_cpp03.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_message_timer_locked.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_delegate_service_cpp03.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\test_bit.cpp">
-      <Filter>Tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\sanity-check\bit.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
     <ClCompile Include="..\sanity-check\unaligned_type.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_unaligned_type.cpp">
-      <Filter>Tests</Filter>
+    <ClCompile Include="..\test_string_char.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_char_external_buffer.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_stream.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_stream_u16.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_stream_u32.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_stream_wchar_t.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_u16.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_u16_external_buffer.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_u32.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_u32_external_buffer.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_utilities.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_utilities_std.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_utilities_std_u16.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_utilities_std_u32.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_utilities_std_wchar_t.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_utilities_u16.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_utilities_u32.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_utilities_wchar_t.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_view.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_wchar_t.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_string_wchar_t_external_buffer.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_to_string.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_to_u32string.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_to_u16string.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_to_wstring.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_message_bus.cpp">
+      <Filter>Tests\Messaging</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_message_packet.cpp">
+      <Filter>Tests\Messaging</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_message_router.cpp">
+      <Filter>Tests\Messaging</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_message_router_registry.cpp">
+      <Filter>Tests\Messaging</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_message_timer.cpp">
+      <Filter>Tests\Messaging</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_message_timer_atomic.cpp">
+      <Filter>Tests\Messaging</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_message_timer_locked.cpp">
+      <Filter>Tests\Messaging</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_shared_message.cpp">
+      <Filter>Tests\Messaging</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_cdma2000.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_darc.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_dvbs2.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_ebu.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_icode.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_itu.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_maxim.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_rohc.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_wcdma.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_a.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_arc.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_aug_ccitt.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_buypass.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_ccitt.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_cdma2000.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_dds110.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_dectr.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_dectx.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_dnp.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_en13757.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_genibus.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_kermit.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_maxim.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_mcrf4xx.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_modbus.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_profibus.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_riello.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_t10dif.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_teledisk.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_tms37157.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_usb.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_x25.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc16_xmodem.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc32.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc32_bzip2.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc32_c.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc32_d.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc32_jamcrc.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc32_mpeg2.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc32_posix.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc32_q.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc32_xfer.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc64_ecma.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_crc8_ccitt.cpp">
+      <Filter>Tests\CRC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_bsd_checksum.cpp">
+      <Filter>Tests\Hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_checksum.cpp">
+      <Filter>Tests\Hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_jenkins.cpp">
+      <Filter>Tests\Hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_murmur3.cpp">
+      <Filter>Tests\Hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_pearson.cpp">
+      <Filter>Tests\Hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_xor_checksum.cpp">
+      <Filter>Tests\Hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_xor_rotate_checksum.cpp">
+      <Filter>Tests\Hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_fnv_1.cpp">
+      <Filter>Tests\Hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_hash.cpp">
+      <Filter>Tests\Hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_array.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_array_view.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_array_wrapper.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_circular_buffer.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_circular_buffer_external_buffer.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_container.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_flat_map.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_flat_multimap.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_flat_multiset.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_flat_set.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_indirect_vector.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_indirect_vector_external_buffer.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_intrusive_forward_list.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_intrusive_list.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_list_shared_pool.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_list.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_map.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_multi_array.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_multi_span.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_multi_range.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_multi_vector.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_multimap.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_multiset.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_reference_flat_map.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_reference_flat_multimap.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_reference_flat_multiset.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_reference_flat_set.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_vector.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_vector_external_buffer.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_vector_non_trivial.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_vector_pointer.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_vector_pointer_external_buffer.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_unordered_map.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_unordered_multimap.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_unordered_multiset.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_unordered_set.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_forward_list.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_forward_list_shared_pool.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_bip_buffer_spsc_atomic.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue_lockable.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue_lockable_small.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue_memory_model_small.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue_mpmc_mutex.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue_mpmc_mutex_small.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue_spsc_atomic.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue_spsc_atomic_small.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue_spsc_isr.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue_spsc_isr_small.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue_spsc_locked.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue_spsc_locked_small.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_priority_queue.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_callback_service.cpp">
+      <Filter>Tests\Callbacks &amp; Delegates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_delegate_service.cpp">
+      <Filter>Tests\Callbacks &amp; Delegates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_delegate_cpp03.cpp">
+      <Filter>Tests\Callbacks &amp; Delegates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_delegate.cpp">
+      <Filter>Tests\Callbacks &amp; Delegates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_delegate_service_compile_time.cpp">
+      <Filter>Tests\Callbacks &amp; Delegates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_delegate_service_cpp03.cpp">
+      <Filter>Tests\Callbacks &amp; Delegates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_function.cpp">
+      <Filter>Tests\Callbacks &amp; Delegates</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_callback_timer.cpp">
+      <Filter>Tests\Timers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_callback_timer_atomic.cpp">
+      <Filter>Tests\Timers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_callback_timer_locked.cpp">
+      <Filter>Tests\Timers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_format_spec.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_set.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_span.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_stack.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_pool_external_buffer.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_pool.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_intrusive_stack.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_deque.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_fixed_sized_memory_block_allocator.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_intrusive_queue.cpp">
+      <Filter>Tests\Queues</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_state_chart.cpp">
+      <Filter>Tests\State Machines</Filter>
     </ClCompile>
     <ClCompile Include="..\test_state_chart_compile_time.cpp">
-      <Filter>Tests</Filter>
+      <Filter>Tests\State Machines</Filter>
     </ClCompile>
     <ClCompile Include="..\test_state_chart_compile_time_with_data_parameter.cpp">
-      <Filter>Tests</Filter>
+      <Filter>Tests\State Machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_state_chart_with_data_parameter.cpp">
+      <Filter>Tests\State Machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_state_chart_with_rvalue_data_parameter.cpp">
+      <Filter>Tests\State Machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_fsm.cpp">
+      <Filter>Tests\State Machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_hfsm.cpp">
+      <Filter>Tests\State Machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_algorithm.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_correlation.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_covariance.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_cumulative_moving_average.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_cyclic_value.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_debounce.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_gamma.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_histogram.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_invert.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_limiter.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_mean.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_memory.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_quantize.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_rescale.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_rms.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_scaled_rounding.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_standard_deviation.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_variance.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_variant_legacy.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_binary.cpp">
+      <Filter>Tests\Binary</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_bit.cpp">
+      <Filter>Tests\Binary</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_bitset.cpp">
+      <Filter>Tests\Binary</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_bit_stream.cpp">
+      <Filter>Tests\Binary</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_byte_stream.cpp">
+      <Filter>Tests\Binary</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_parity_checksum.cpp">
+      <Filter>Tests\Hashes</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_variant_pool.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_variant_pool_external_buffer.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_variant_variadic.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\main.cpp">
+      <Filter>Tests\Test Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\murmurhash3.cpp">
+      <Filter>Tests\Test Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_make_string.cpp">
+      <Filter>Tests\Strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_packet.cpp">
+      <Filter>Tests\Containers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_maths.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_endian.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_enum_type.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_largest.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_smallest.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_type_def.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_type_lookup.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_type_select.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_type_traits.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_unaligned_type.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_user_type.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_intrusive_links.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_integral_limits.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_bresenham_line.cpp">
+      <Filter>Tests\Algorithms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_alignment.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_limits.cpp">
+      <Filter>Tests\Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_visitor.cpp">
+      <Filter>Tests\Patterns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_observer.cpp">
+      <Filter>Tests\Patterns</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>