diff --git a/README.md b/README.md
index 705e2da..15699ff 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,6 @@ None.
 
 # License
 
-Copyright (c) 2005-2024 Xavier Leclercq\
+Copyright (c) 2000-2026 Xavier Leclercq\
 This work is licensed under the Boost Software License 1.0\
 See https://github.com/ishiko-cpp/concurrency/blob/main/LICENSE.txt
diff --git a/include/Ishiko/Concurrency.hpp b/include/Ishiko/Concurrency.hpp
index 80f17f6..ed0adde 100644
--- a/include/Ishiko/Concurrency.hpp
+++ b/include/Ishiko/Concurrency.hpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef GUARD_ISHIKO_CPP_CONCURRENCY_HPP
diff --git a/include/Ishiko/Concurrency/Thread.hpp b/include/Ishiko/Concurrency/Thread.hpp
index 265ea38..5aa33b5 100644
--- a/include/Ishiko/Concurrency/Thread.hpp
+++ b/include/Ishiko/Concurrency/Thread.hpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef GUARD_ISHIKO_CPP_CONCURRENCY_THREAD_HPP
diff --git a/include/Ishiko/Concurrency/ThreadPool.hpp b/include/Ishiko/Concurrency/ThreadPool.hpp
index 97f4596..78b45db 100644
--- a/include/Ishiko/Concurrency/ThreadPool.hpp
+++ b/include/Ishiko/Concurrency/ThreadPool.hpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef GUARD_ISHIKO_CPP_CONCURRENCY_THREADPOOL_HPP
diff --git a/include/Ishiko/Concurrency/linkoptions.hpp b/include/Ishiko/Concurrency/linkoptions.hpp
index b6eefb9..f62b092 100644
--- a/include/Ishiko/Concurrency/linkoptions.hpp
+++ b/include/Ishiko/Concurrency/linkoptions.hpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef GUARD_ISHIKO_CPP_CONCURRENCY_LINKOPTIONS_HPP
diff --git a/include/Ishiko/Concurrency/windows/Thread.hpp b/include/Ishiko/Concurrency/windows/Thread.hpp
index e19209c..3235fd3 100644
--- a/include/Ishiko/Concurrency/windows/Thread.hpp
+++ b/include/Ishiko/Concurrency/windows/Thread.hpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef GUARD_ISHIKO_CPP_CONCURRENCY_WINDOWS_THREAD_HPP
diff --git a/src/ThreadPool.cpp b/src/ThreadPool.cpp
index 7a1f502..6952a32 100644
--- a/src/ThreadPool.cpp
+++ b/src/ThreadPool.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
 // SPDX-License-Identifier: BSL-1.0
 
 #include "ThreadPool.hpp"
diff --git a/src/windows/Thread.cpp b/src/windows/Thread.cpp
index 6b44985..a588b92 100644
--- a/src/windows/Thread.cpp
+++ b/src/windows/Thread.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
 // SPDX-License-Identifier: BSL-1.0
 
 #include "windows/Thread.hpp"
diff --git a/tests/build-files/bakefile/IshikoConcurrencyTests.bkl b/tests/build-files/bakefile/IshikoConcurrencyTests.bkl
index 1136652..dd5cd6e 100644
--- a/tests/build-files/bakefile/IshikoConcurrencyTests.bkl
+++ b/tests/build-files/bakefile/IshikoConcurrencyTests.bkl
@@ -16,7 +16,7 @@ program IshikoConcurrencyTests : IshikoConcurrency, IshikoTestFrameworkCore
     if ($(toolset) == gnu)
     {
         cxx-compiler-options = "-std=c++14";
-        libs += IshikoTestFrameworkCore IshikoConfiguration IshikoXML IshikoFileSystem IshikoIO IshikoProcess IshikoTime IshikoText IshikoErrors IshikoBasePlatform;
+        libs += IshikoTestFrameworkCore IshikoConfiguration IshikoXML IshikoFileSystem IshikoIO IshikoProcess IshikoConcurrency IshikoTime IshikoText IshikoErrors IshikoBasePlatform;
         libs += fmt boost_filesystem;
     }
 
@@ -28,11 +28,13 @@ program IshikoConcurrencyTests : IshikoConcurrency, IshikoTestFrameworkCore
     headers
     {
         ../../src/ThreadPoolTests.hpp
+        ../../src/ThreadTests.hpp
     }
 
     sources
     {
         ../../src/main.cpp
         ../../src/ThreadPoolTests.cpp
+        ../../src/ThreadTests.cpp
     }
 }
diff --git a/tests/build-files/gnumake/GNUmakefile b/tests/build-files/gnumake/GNUmakefile
index 5a597d1..ab0f197 100644
--- a/tests/build-files/gnumake/GNUmakefile
+++ b/tests/build-files/gnumake/GNUmakefile
@@ -37,8 +37,8 @@ endif
 # Additionally, this makefile is customizable with the following
 # settings:
 #
-#      ISHIKO_CPP_CONCURRENCY_ROOT    Path to the Ishiko/C++ Concurrency installation
 #      ISHIKO_CPP_BASEPLATFORM_ROOT   Path to the Ishiko/C++ BasePlatform installation
+#      ISHIKO_CPP_CONCURRENCY_ROOT    Path to the Ishiko/C++ Concurrency installation
 #      ISHIKO_CPP_ERRORS_ROOT         Path to the Ishiko/C++ Errors installation
 #      ISHIKO_CPP_FMT_ROOT            Path to the fmt installation
 #      ISHIKO_CPP_MEMORY_ROOT         Path to the Ishiko/C++ Memory installation
@@ -74,10 +74,10 @@ endif
 # Configurable settings:
 # 
 
-# Path to the Ishiko/C++ Concurrency installation
-ISHIKO_CPP_CONCURRENCY_ROOT ?= $(ISHIKO_CPP_ROOT)/concurrency
 # Path to the Ishiko/C++ BasePlatform installation
 ISHIKO_CPP_BASEPLATFORM_ROOT ?= $(ISHIKO_CPP_ROOT)/base-platform
+# Path to the Ishiko/C++ Concurrency installation
+ISHIKO_CPP_CONCURRENCY_ROOT ?= $(ISHIKO_CPP_ROOT)/concurrency
 # Path to the Ishiko/C++ Errors installation
 ISHIKO_CPP_ERRORS_ROOT ?= $(ISHIKO_CPP_ROOT)/errors
 # Path to the fmt installation
@@ -113,14 +113,17 @@ ISHIKO_CPP_TESTFRAMEWORK_ROOT ?= $(ISHIKO_CPP_ROOT)/test-framework
 
 all: $(_builddir)IshikoConcurrencyTests
 
-$(_builddir)IshikoConcurrencyTests: $(_builddir)IshikoConcurrencyTests_main.o $(_builddir)IshikoConcurrencyTests_ThreadPoolTests.o
-	$(CXX) -o $@ $(LDFLAGS) $(_builddir)IshikoConcurrencyTests_main.o $(_builddir)IshikoConcurrencyTests_ThreadPoolTests.o -L$(ISHIKO_CPP_CONCURRENCY_ROOT)/lib -L$(ISHIKO_CPP_BASEPLATFORM_ROOT)/lib -L$(ISHIKO_CPP_ERRORS_ROOT)/lib -L$(ISHIKO_CPP_FMT_ROOT)/lib -L$(ISHIKO_CPP_MEMORY_ROOT)/lib -L$(ISHIKO_CPP_BOOST_ROOT)/lib -L$(ISHIKO_CPP_TEXT_ROOT)/lib -L$(ISHIKO_CPP_CONFIGURATION_ROOT)/lib -L$(ISHIKO_CPP_IO_ROOT)/lib -L$(ISHIKO_CPP_FILESYSTEM_ROOT)/lib -L$(ISHIKO_CPP_TYPES_ROOT)/lib -L$(ISHIKO_CPP_DIFF_ROOT)/lib -L$(ISHIKO_CPP_XML_ROOT)/lib -L$(ISHIKO_CPP_PROCESS_ROOT)/lib -L$(ISHIKO_CPP_TIME_ROOT)/lib -L$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/lib -lIshikoTestFrameworkCore -lIshikoConfiguration -lIshikoXML -lIshikoFileSystem -lIshikoIO -lIshikoProcess -lIshikoTime -lIshikoText -lIshikoErrors -lIshikoBasePlatform -lfmt -lboost_filesystem -pthread
+$(_builddir)IshikoConcurrencyTests: $(_builddir)IshikoConcurrencyTests_main.o $(_builddir)IshikoConcurrencyTests_ThreadPoolTests.o $(_builddir)IshikoConcurrencyTests_ThreadTests.o
+	$(CXX) -o $@ $(LDFLAGS) $(_builddir)IshikoConcurrencyTests_main.o $(_builddir)IshikoConcurrencyTests_ThreadPoolTests.o $(_builddir)IshikoConcurrencyTests_ThreadTests.o -L$(ISHIKO_CPP_BASEPLATFORM_ROOT)/lib -L$(ISHIKO_CPP_CONCURRENCY_ROOT)/lib -L$(ISHIKO_CPP_ERRORS_ROOT)/lib -L$(ISHIKO_CPP_FMT_ROOT)/lib -L$(ISHIKO_CPP_MEMORY_ROOT)/lib -L$(ISHIKO_CPP_BOOST_ROOT)/lib -L$(ISHIKO_CPP_TEXT_ROOT)/lib -L$(ISHIKO_CPP_CONFIGURATION_ROOT)/lib -L$(ISHIKO_CPP_IO_ROOT)/lib -L$(ISHIKO_CPP_FILESYSTEM_ROOT)/lib -L$(ISHIKO_CPP_TYPES_ROOT)/lib -L$(ISHIKO_CPP_DIFF_ROOT)/lib -L$(ISHIKO_CPP_XML_ROOT)/lib -L$(ISHIKO_CPP_PROCESS_ROOT)/lib -L$(ISHIKO_CPP_TIME_ROOT)/lib -L$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/lib -lIshikoTestFrameworkCore -lIshikoConfiguration -lIshikoXML -lIshikoFileSystem -lIshikoIO -lIshikoProcess -lIshikoConcurrency -lIshikoTime -lIshikoText -lIshikoErrors -lIshikoBasePlatform -lfmt -lboost_filesystem -pthread
 
 $(_builddir)IshikoConcurrencyTests_main.o: ../../src/main.cpp
-	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/main.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/main.cpp
 
 $(_builddir)IshikoConcurrencyTests_ThreadPoolTests.o: ../../src/ThreadPoolTests.cpp
-	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/ThreadPoolTests.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/ThreadPoolTests.cpp
+
+$(_builddir)IshikoConcurrencyTests_ThreadTests.o: ../../src/ThreadTests.cpp
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/ThreadTests.cpp
 
 clean:
 	rm -f $(_builddir)*.o
diff --git a/tests/build-files/vc15/IshikoConcurrencyTests.vcxproj b/tests/build-files/vc15/IshikoConcurrencyTests.vcxproj
index cc395e5..e5cf53f 100644
--- a/tests/build-files/vc15/IshikoConcurrencyTests.vcxproj
+++ b/tests/build-files/vc15/IshikoConcurrencyTests.vcxproj
@@ -86,14 +86,14 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -104,14 +104,14 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -124,7 +124,7 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -133,7 +133,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -146,7 +146,7 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -155,16 +155,18 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp" />
     <ClCompile Include="..\..\src\ThreadPoolTests.cpp" />
+    <ClCompile Include="..\..\src\ThreadTests.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\ThreadPoolTests.hpp" />
+    <ClInclude Include="..\..\src\ThreadTests.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/tests/build-files/vc15/IshikoConcurrencyTests.vcxproj.filters b/tests/build-files/vc15/IshikoConcurrencyTests.vcxproj.filters
index d75a07e..c9530a8 100644
--- a/tests/build-files/vc15/IshikoConcurrencyTests.vcxproj.filters
+++ b/tests/build-files/vc15/IshikoConcurrencyTests.vcxproj.filters
@@ -20,6 +20,9 @@
     <ClInclude Include="..\..\src\ThreadPoolTests.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ThreadTests.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
@@ -28,5 +31,8 @@
     <ClCompile Include="..\..\src\ThreadPoolTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\ThreadTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/tests/build-files/vc16/IshikoConcurrencyTests.vcxproj b/tests/build-files/vc16/IshikoConcurrencyTests.vcxproj
index 3751c1f..f6da78d 100644
--- a/tests/build-files/vc16/IshikoConcurrencyTests.vcxproj
+++ b/tests/build-files/vc16/IshikoConcurrencyTests.vcxproj
@@ -86,14 +86,14 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -104,14 +104,14 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -124,7 +124,7 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -133,7 +133,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -146,7 +146,7 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -155,16 +155,18 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp" />
     <ClCompile Include="..\..\src\ThreadPoolTests.cpp" />
+    <ClCompile Include="..\..\src\ThreadTests.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\ThreadPoolTests.hpp" />
+    <ClInclude Include="..\..\src\ThreadTests.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/tests/build-files/vc16/IshikoConcurrencyTests.vcxproj.filters b/tests/build-files/vc16/IshikoConcurrencyTests.vcxproj.filters
index d75a07e..c9530a8 100644
--- a/tests/build-files/vc16/IshikoConcurrencyTests.vcxproj.filters
+++ b/tests/build-files/vc16/IshikoConcurrencyTests.vcxproj.filters
@@ -20,6 +20,9 @@
     <ClInclude Include="..\..\src\ThreadPoolTests.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ThreadTests.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
@@ -28,5 +31,8 @@
     <ClCompile Include="..\..\src\ThreadPoolTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\ThreadTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/tests/build-files/vc17/IshikoConcurrencyTests.vcxproj b/tests/build-files/vc17/IshikoConcurrencyTests.vcxproj
index c3a2218..18e13bf 100644
--- a/tests/build-files/vc17/IshikoConcurrencyTests.vcxproj
+++ b/tests/build-files/vc17/IshikoConcurrencyTests.vcxproj
@@ -86,14 +86,14 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -104,14 +104,14 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -124,7 +124,7 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -133,7 +133,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -146,7 +146,7 @@
       <PreprocessorDefinitions>PUGIXML_HEADER_ONLY;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ISHIKO_CPP_ROOT)/base-platform\include;$(ISHIKO_CPP_ROOT)/concurrency\include;$(ISHIKO_CPP_ROOT)/errors\include;$(FMT_ROOT)\include;$(ISHIKO_CPP_ROOT)/memory\include;$(BOOST_ROOT)\include\boost-1_90;$(ISHIKO_CPP_ROOT)/text\include;$(ISHIKO_CPP_ROOT)/configuration\include;$(ISHIKO_CPP_ROOT)/io\include;$(ISHIKO_CPP_ROOT)/filesystem\include;$(ISHIKO_CPP_ROOT)/types\include;$(ISHIKO_CPP_ROOT)/diff\include;$(PUGIXML_ROOT)\src;$(ISHIKO_CPP_ROOT)/xml\include;$(ISHIKO_CPP_ROOT)/process\include;$(ISHIKO_CPP_ROOT)/time\include;$(ISHIKO_CPP_ROOT)/test-framework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -155,16 +155,18 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ISHIKO_CPP_ROOT)/base-platform\lib\$(Platform);$(ISHIKO_CPP_ROOT)/concurrency\lib\$(Platform);$(ISHIKO_CPP_ROOT)/errors\lib\$(Platform);$(FMT_ROOT)\lib;$(ISHIKO_CPP_ROOT)/memory\lib\$(Platform);$(BOOST_ROOT)\lib;$(ISHIKO_CPP_ROOT)/text\lib\$(Platform);$(ISHIKO_CPP_ROOT)/configuration\lib\$(Platform);$(ISHIKO_CPP_ROOT)/io\lib\$(Platform);$(ISHIKO_CPP_ROOT)/filesystem\lib\$(Platform);$(ISHIKO_CPP_ROOT)/types\lib\$(Platform);$(ISHIKO_CPP_ROOT)/diff\lib\$(Platform);$(ISHIKO_CPP_ROOT)/xml\lib\$(Platform);$(ISHIKO_CPP_ROOT)/process\lib\$(Platform);$(ISHIKO_CPP_ROOT)/time\lib\$(Platform);$(ISHIKO_CPP_ROOT)/test-framework\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>fmt-d-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp" />
     <ClCompile Include="..\..\src\ThreadPoolTests.cpp" />
+    <ClCompile Include="..\..\src\ThreadTests.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\ThreadPoolTests.hpp" />
+    <ClInclude Include="..\..\src\ThreadTests.hpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/tests/build-files/vc17/IshikoConcurrencyTests.vcxproj.filters b/tests/build-files/vc17/IshikoConcurrencyTests.vcxproj.filters
index d75a07e..c9530a8 100644
--- a/tests/build-files/vc17/IshikoConcurrencyTests.vcxproj.filters
+++ b/tests/build-files/vc17/IshikoConcurrencyTests.vcxproj.filters
@@ -20,6 +20,9 @@
     <ClInclude Include="..\..\src\ThreadPoolTests.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ThreadTests.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main.cpp">
@@ -28,5 +31,8 @@
     <ClCompile Include="..\..\src\ThreadPoolTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\ThreadTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/tests/src/ThreadPoolTests.cpp b/tests/src/ThreadPoolTests.cpp
index 454500b..d187e8d 100644
--- a/tests/src/ThreadPoolTests.cpp
+++ b/tests/src/ThreadPoolTests.cpp
@@ -1,8 +1,5 @@
-/*
-    Copyright (c) 2022 Xavier Leclercq
-    Released under the MIT License
-    See https://github.com/ishiko-cpp/concurrency/blob/main/LICENSE.txt
-*/
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
+// SPDX-License-Identifier: BSL-1.0
 
 #include "ThreadPoolTests.hpp"
 #include "Ishiko/Concurrency/ThreadPool.hpp"
diff --git a/tests/src/ThreadPoolTests.hpp b/tests/src/ThreadPoolTests.hpp
index 5b821a6..1777525 100644
--- a/tests/src/ThreadPoolTests.hpp
+++ b/tests/src/ThreadPoolTests.hpp
@@ -1,11 +1,8 @@
-/*
-    Copyright (c) 2022 Xavier Leclercq
-    Released under the MIT License
-    See https://github.com/ishiko-cpp/concurrency/blob/main/LICENSE.txt
-*/
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
+// SPDX-License-Identifier: BSL-1.0
 
-#ifndef _ISHIKO_CPP_CONCURRENCY_TESTS_THREADPOOLTESTS_HPP_
-#define _ISHIKO_CPP_CONCURRENCY_TESTS_THREADPOOLTESTS_HPP_
+#ifndef GUARD_ISHIKO_CPP_CONCURRENCY_TESTS_THREADPOOLTESTS_HPP
+#define GUARD_ISHIKO_CPP_CONCURRENCY_TESTS_THREADPOOLTESTS_HPP
 
 #include <Ishiko/TestFramework/Core.hpp>
 
diff --git a/tests/src/ThreadTests.cpp b/tests/src/ThreadTests.cpp
new file mode 100644
index 0000000..47888e7
--- /dev/null
+++ b/tests/src/ThreadTests.cpp
@@ -0,0 +1,49 @@
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
+// SPDX-License-Identifier: BSL-1.0
+
+#include "ThreadTests.hpp"
+#include "Ishiko/Concurrency/Thread.hpp"
+#include <Ishiko/BasePlatform.hpp>
+
+using namespace Ishiko;
+
+ThreadTests::ThreadTests(const TestNumber& number, const TestContext& context)
+    : TestSequence(number, "Thread tests", context)
+{
+    append<HeapAllocationErrorsTest>("Constructor test 1", ConstructorTest1);
+    append<HeapAllocationErrorsTest>("resume test 1", ResumeTest1);
+}
+
+
+#if ISHIKO_OS == ISHIKO_OS_LINUX
+static void* ConstructorTest1Test1Helper(void* arg)
+{
+    return 0;
+}
+#elif ISHIKO_OS == ISHIKO_OS_WINDOWS
+static DWORD ConstructorTest1Test1Helper(void* arg)
+{
+    return 0;
+}
+#else
+#error Unsupported or unrecognized OS
+#endif
+
+void ThreadTests::ConstructorTest1(Test& test)
+{
+    Thread thread(ConstructorTest1Test1Helper, nullptr);
+
+    // Do not join as this thread is created in a suspended state
+
+
+    ISHIKO_TEST_PASS();
+}
+
+void ThreadTests::ResumeTest1(Test& test)
+{
+    Thread thread(ConstructorTest1Test1Helper, nullptr);
+    thread.resume();
+    thread.join();
+
+    ISHIKO_TEST_PASS();
+}
diff --git a/tests/src/ThreadTests.hpp b/tests/src/ThreadTests.hpp
new file mode 100644
index 0000000..315e9b6
--- /dev/null
+++ b/tests/src/ThreadTests.hpp
@@ -0,0 +1,19 @@
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
+// SPDX-License-Identifier: BSL-1.0
+
+#ifndef GUARD_ISHIKO_CPP_CONCURRENCY_TESTS_THREADTESTS_HPP
+#define GUARD_ISHIKO_CPP_CONCURRENCY_TESTS_THREADTESTS_HPP
+
+#include <Ishiko/TestFramework/Core.hpp>
+
+class ThreadTests : public Ishiko::TestSequence
+{
+public:
+    ThreadTests(const Ishiko::TestNumber& number, const Ishiko::TestContext& context);
+
+private:
+    static void ConstructorTest1(Ishiko::Test& test);
+    static void ResumeTest1(Ishiko::Test& test);
+};
+
+#endif
diff --git a/tests/src/main.cpp b/tests/src/main.cpp
index d06b008..171f1a7 100644
--- a/tests/src/main.cpp
+++ b/tests/src/main.cpp
@@ -1,10 +1,8 @@
-/*
-    Copyright (c) 2022 Xavier Leclercq
-    Released under the MIT License
-    See https://github.com/ishiko-cpp/concurrency/blob/main/LICENSE.txt
-*/
+// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
+// SPDX-License-Identifier: BSL-1.0
 
 #include "ThreadPoolTests.hpp"
+#include "ThreadTests.hpp"
 #include "Ishiko/Concurrency/linkoptions.hpp"
 #include <Ishiko/TestFramework/Core.hpp>
 
@@ -15,6 +13,7 @@ int main(int argc, char* argv[])
     TestHarness theTestHarness("IshikoConcurrency");
 
     TestSequence& theTests = theTestHarness.tests();
+    theTests.append<ThreadTests>();
     theTests.append<ThreadPoolTests>();
 
     return theTestHarness.run();