diff --git a/SabreTools.IO.sln b/SabreTools.IO.sln
index e1a8cf8..a1f9581 100644
--- a/SabreTools.IO.sln
+++ b/SabreTools.IO.sln
@@ -7,22 +7,56 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.IO", "SabreTools
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.IO.Test", "SabreTools.IO.Test\SabreTools.IO.Test.csproj", "{A9767735-5042-48A1-849C-96035DB1DD53}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Numerics.Test", "SabreTools.Numerics.Test\SabreTools.Numerics.Test.csproj", "{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Debug|x64.Build.0 = Debug|Any CPU
+		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Debug|x86.Build.0 = Debug|Any CPU
 		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Release|x64.ActiveCfg = Release|Any CPU
+		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Release|x64.Build.0 = Release|Any CPU
+		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Release|x86.ActiveCfg = Release|Any CPU
+		{87CE4411-80D9-49FF-894C-761F1C20D9A5}.Release|x86.Build.0 = Release|Any CPU
 		{A9767735-5042-48A1-849C-96035DB1DD53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9767735-5042-48A1-849C-96035DB1DD53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9767735-5042-48A1-849C-96035DB1DD53}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A9767735-5042-48A1-849C-96035DB1DD53}.Debug|x64.Build.0 = Debug|Any CPU
+		{A9767735-5042-48A1-849C-96035DB1DD53}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A9767735-5042-48A1-849C-96035DB1DD53}.Debug|x86.Build.0 = Debug|Any CPU
 		{A9767735-5042-48A1-849C-96035DB1DD53}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9767735-5042-48A1-849C-96035DB1DD53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9767735-5042-48A1-849C-96035DB1DD53}.Release|x64.ActiveCfg = Release|Any CPU
+		{A9767735-5042-48A1-849C-96035DB1DD53}.Release|x64.Build.0 = Release|Any CPU
+		{A9767735-5042-48A1-849C-96035DB1DD53}.Release|x86.ActiveCfg = Release|Any CPU
+		{A9767735-5042-48A1-849C-96035DB1DD53}.Release|x86.Build.0 = Release|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Debug|x64.Build.0 = Debug|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Debug|x86.Build.0 = Debug|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Release|x64.ActiveCfg = Release|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Release|x64.Build.0 = Release|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Release|x86.ActiveCfg = Release|Any CPU
+		{58B5EF2F-A8E2-436A-97F0-9F85CDD8718A}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
diff --git a/SabreTools.IO.Test/Numerics/BothInt16Tests.cs b/SabreTools.Numerics.Test/BothInt16Tests.cs
similarity index 99%
rename from SabreTools.IO.Test/Numerics/BothInt16Tests.cs
rename to SabreTools.Numerics.Test/BothInt16Tests.cs
index 91074f1..6f804cb 100644
--- a/SabreTools.IO.Test/Numerics/BothInt16Tests.cs
+++ b/SabreTools.Numerics.Test/BothInt16Tests.cs
@@ -2,7 +2,7 @@ using System;
 using SabreTools.Numerics;
 using Xunit;
 
-namespace SabreTools.IO.Test.Numerics
+namespace SabreTools.Numerics.Test
 {
     public class BothInt16Tests
     {
diff --git a/SabreTools.IO.Test/Numerics/BothInt32Tests.cs b/SabreTools.Numerics.Test/BothInt32Tests.cs
similarity index 99%
rename from SabreTools.IO.Test/Numerics/BothInt32Tests.cs
rename to SabreTools.Numerics.Test/BothInt32Tests.cs
index 111fb12..cffadce 100644
--- a/SabreTools.IO.Test/Numerics/BothInt32Tests.cs
+++ b/SabreTools.Numerics.Test/BothInt32Tests.cs
@@ -2,7 +2,7 @@ using System;
 using SabreTools.Numerics;
 using Xunit;
 
-namespace SabreTools.IO.Test.Numerics
+namespace SabreTools.Numerics.Test
 {
     public class BothInt32Tests
     {
diff --git a/SabreTools.IO.Test/Numerics/BothInt64Tests.cs b/SabreTools.Numerics.Test/BothInt64Tests.cs
similarity index 99%
rename from SabreTools.IO.Test/Numerics/BothInt64Tests.cs
rename to SabreTools.Numerics.Test/BothInt64Tests.cs
index 3b08ec1..9465e17 100644
--- a/SabreTools.IO.Test/Numerics/BothInt64Tests.cs
+++ b/SabreTools.Numerics.Test/BothInt64Tests.cs
@@ -2,7 +2,7 @@ using System;
 using SabreTools.Numerics;
 using Xunit;
 
-namespace SabreTools.IO.Test.Numerics
+namespace SabreTools.Numerics.Test
 {
     public class BothInt64Tests
     {
diff --git a/SabreTools.IO.Test/Numerics/BothInt8Tests.cs b/SabreTools.Numerics.Test/BothInt8Tests.cs
similarity index 99%
rename from SabreTools.IO.Test/Numerics/BothInt8Tests.cs
rename to SabreTools.Numerics.Test/BothInt8Tests.cs
index c22ba3d..b8f4666 100644
--- a/SabreTools.IO.Test/Numerics/BothInt8Tests.cs
+++ b/SabreTools.Numerics.Test/BothInt8Tests.cs
@@ -2,7 +2,7 @@ using System;
 using SabreTools.Numerics;
 using Xunit;
 
-namespace SabreTools.IO.Test.Numerics
+namespace SabreTools.Numerics.Test
 {
     public class BothInt8Tests
     {
diff --git a/SabreTools.IO.Test/Numerics/BothUInt16Tests.cs b/SabreTools.Numerics.Test/BothUInt16Tests.cs
similarity index 99%
rename from SabreTools.IO.Test/Numerics/BothUInt16Tests.cs
rename to SabreTools.Numerics.Test/BothUInt16Tests.cs
index e938e55..e9dbab2 100644
--- a/SabreTools.IO.Test/Numerics/BothUInt16Tests.cs
+++ b/SabreTools.Numerics.Test/BothUInt16Tests.cs
@@ -2,7 +2,7 @@ using System;
 using SabreTools.Numerics;
 using Xunit;
 
-namespace SabreTools.IO.Test.Numerics
+namespace SabreTools.Numerics.Test
 {
     public class BothUInt16Tests
     {
diff --git a/SabreTools.IO.Test/Numerics/BothUInt32Tests.cs b/SabreTools.Numerics.Test/BothUInt32Tests.cs
similarity index 99%
rename from SabreTools.IO.Test/Numerics/BothUInt32Tests.cs
rename to SabreTools.Numerics.Test/BothUInt32Tests.cs
index a8f1857..a5ccac5 100644
--- a/SabreTools.IO.Test/Numerics/BothUInt32Tests.cs
+++ b/SabreTools.Numerics.Test/BothUInt32Tests.cs
@@ -2,7 +2,7 @@ using System;
 using SabreTools.Numerics;
 using Xunit;
 
-namespace SabreTools.IO.Test.Numerics
+namespace SabreTools.Numerics.Test
 {
     public class BothUInt32Tests
     {
diff --git a/SabreTools.IO.Test/Numerics/BothUInt64Tests.cs b/SabreTools.Numerics.Test/BothUInt64Tests.cs
similarity index 99%
rename from SabreTools.IO.Test/Numerics/BothUInt64Tests.cs
rename to SabreTools.Numerics.Test/BothUInt64Tests.cs
index cbbfda1..a815e45 100644
--- a/SabreTools.IO.Test/Numerics/BothUInt64Tests.cs
+++ b/SabreTools.Numerics.Test/BothUInt64Tests.cs
@@ -2,7 +2,7 @@ using System;
 using SabreTools.Numerics;
 using Xunit;
 
-namespace SabreTools.IO.Test.Numerics
+namespace SabreTools.Numerics.Test
 {
     public class BothUInt64Tests
     {
diff --git a/SabreTools.IO.Test/Numerics/BothUInt8Tests.cs b/SabreTools.Numerics.Test/BothUInt8Tests.cs
similarity index 99%
rename from SabreTools.IO.Test/Numerics/BothUInt8Tests.cs
rename to SabreTools.Numerics.Test/BothUInt8Tests.cs
index d90e26a..555afe9 100644
--- a/SabreTools.IO.Test/Numerics/BothUInt8Tests.cs
+++ b/SabreTools.Numerics.Test/BothUInt8Tests.cs
@@ -2,7 +2,7 @@ using System;
 using SabreTools.Numerics;
 using Xunit;
 
-namespace SabreTools.IO.Test.Numerics
+namespace SabreTools.Numerics.Test
 {
     public class BothUInt8Tests
     {
diff --git a/SabreTools.Numerics.Test/SabreTools.Numerics.Test.csproj b/SabreTools.Numerics.Test/SabreTools.Numerics.Test.csproj
new file mode 100644
index 0000000..45347d9
--- /dev/null
+++ b/SabreTools.Numerics.Test/SabreTools.Numerics.Test.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+        <IsPackable>false</IsPackable>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <WarningsNotAsErrors>CS0618</WarningsNotAsErrors>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="8.0.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\SabreTools.IO\SabreTools.IO.csproj" />
+    </ItemGroup>
+
+</Project>
\ No newline at end of file