diff --git a/.gitignore b/.gitignore
index 488c8004..cce9e969 100644
--- a/.gitignore
+++ b/.gitignore
@@ -352,3 +352,4 @@ test/vs2019/Debug MSVC - No STL - Force Built-ins
 test/vs2019/Debug MSVC - No STL - Force Constexpr Algorithms
 test/vs2019/Debug Intel
 test/vs2019/Debug Intel - No STL
+EmbeddedTemplateLibrary-20.24.1.tar.gz
diff --git a/test/.kdev4/test.kdev4 b/test/.kdev4/test.kdev4
deleted file mode 100644
index 64b8fed2..00000000
--- a/test/.kdev4/test.kdev4
+++ /dev/null
@@ -1,2 +0,0 @@
-[Buildset]
-BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x08\x00t\x00e\x00s\x00t)
diff --git a/test/vs2019/etl.vcxproj b/test/vs2019/etl.vcxproj
index f8ef5120..ea5a389f 100644
--- a/test/vs2019/etl.vcxproj
+++ b/test/vs2019/etl.vcxproj
@@ -2362,6 +2362,7 @@
     <ClInclude Include="..\..\include\etl\byte_stream.h" />
     <ClInclude Include="..\..\include\etl\callback_timer.h" />
     <ClInclude Include="..\..\include\etl\callback_timer_atomic.h" />
+    <ClInclude Include="..\..\include\etl\callback_timer_interrupt.h" />
     <ClInclude Include="..\..\include\etl\callback_timer_locked.h" />
     <ClInclude Include="..\..\include\etl\circular_buffer.h" />
     <ClInclude Include="..\..\include\etl\combinations.h" />
@@ -2454,6 +2455,7 @@
     <ClInclude Include="..\..\include\etl\message_packet.h" />
     <ClInclude Include="..\..\include\etl\message_pool.h" />
     <ClInclude Include="..\..\include\etl\message_timer_atomic.h" />
+    <ClInclude Include="..\..\include\etl\message_timer_interrupt.h" />
     <ClInclude Include="..\..\include\etl\message_timer_locked.h" />
     <ClInclude Include="..\..\include\etl\multi_array.h" />
     <ClInclude Include="..\..\include\etl\multi_range.h" />
@@ -10494,6 +10496,7 @@
     <ClCompile Include="..\test_byte_stream.cpp" />
     <ClCompile Include="..\test_callback_service.cpp" />
     <ClCompile Include="..\test_callback_timer_atomic.cpp" />
+    <ClCompile Include="..\test_callback_timer_interrupt.cpp" />
     <ClCompile Include="..\test_callback_timer_locked.cpp" />
     <ClCompile Include="..\test_circular_buffer.cpp" />
     <ClCompile Include="..\test_circular_buffer_external_buffer.cpp" />
@@ -10572,6 +10575,7 @@
     <ClCompile Include="..\test_message_packet.cpp" />
     <ClCompile Include="..\test_message_router_registry.cpp" />
     <ClCompile Include="..\test_message_timer_atomic.cpp" />
+    <ClCompile Include="..\test_message_timer_interrupt.cpp" />
     <ClCompile Include="..\test_message_timer_locked.cpp" />
     <ClCompile Include="..\test_multi_array.cpp" />
     <ClCompile Include="..\test_array.cpp">
@@ -11358,8 +11362,8 @@
     <None Include="..\..\.gitmodules" />
     <None Include="..\..\appveyor.yml" />
     <None Include="..\..\arduino\create_arduino_library.py" />
-    <None Include="..\..\arduino\library.json" />
-    <None Include="..\..\arduino\library.properties" />
+    <None Include="..\..\arduino\library-arduino.json" />
+    <None Include="..\..\arduino\library-arduino.properties" />
     <None Include="..\..\etl.pspimage" />
     <None Include="..\..\etl.xar" />
     <None Include="..\..\include\etl\generators\generate.bat" />
diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters
index 932fd108..2b220bb3 100644
--- a/test/vs2019/etl.vcxproj.filters
+++ b/test/vs2019/etl.vcxproj.filters
@@ -1260,6 +1260,12 @@
     <ClInclude Include="..\..\include\etl\byte.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\etl\callback_timer_interrupt.h">
+      <Filter>ETL\Frameworks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\etl\message_timer_interrupt.h">
+      <Filter>ETL\Frameworks</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\AssertException.cpp">
@@ -3203,6 +3209,12 @@
     <ClCompile Include="..\sanity-check\wstring.h.t.cpp">
       <Filter>Tests\Sanity Checks</Filter>
     </ClCompile>
+    <ClCompile Include="..\test_callback_timer_interrupt.cpp">
+      <Filter>Tests\Timers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_message_timer_interrupt.cpp">
+      <Filter>Tests\Messaging</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\library.properties">
@@ -3271,9 +3283,6 @@
     <None Include="..\..\.github\workflows\vs2019.yml">
       <Filter>Resource Files\CI\Github</Filter>
     </None>
-    <None Include="..\..\arduino\create_arduino_library.py">
-      <Filter>ETL\Arduino</Filter>
-    </None>
     <None Include="..\runsanitychecks.sh">
       <Filter>Tests\Scripts</Filter>
     </None>
@@ -3295,10 +3304,13 @@
     <None Include="..\..\meson.build">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\arduino\library.json">
+    <None Include="..\..\arduino\library-arduino.json">
       <Filter>Resource Files\Arduino</Filter>
     </None>
-    <None Include="..\..\arduino\library.properties">
+    <None Include="..\..\arduino\library-arduino.properties">
+      <Filter>Resource Files\Arduino</Filter>
+    </None>
+    <None Include="..\..\arduino\create_arduino_library.py">
       <Filter>Resource Files\Arduino</Filter>
     </None>
   </ItemGroup>