diff --git a/.gitignore b/.gitignore
index 85a34026..339a3a73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,6 @@
 /SabreTools.Reports/obj/
 /SabreTools.Skippers/bin/
 /SabreTools.Skippers/obj/
+/SabreTools.Test/bin/
+/SabreTools.Test/obj/
 /SabreTools.userprefs
diff --git a/SabreTools.Test/SabreTools.Test.csproj b/SabreTools.Test/SabreTools.Test.csproj
new file mode 100644
index 00000000..c0dc1ace
--- /dev/null
+++ b/SabreTools.Test/SabreTools.Test.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/SabreTools.sln b/SabreTools.sln
index 3da3c7c6..0f3dc615 100644
--- a/SabreTools.sln
+++ b/SabreTools.sln
@@ -36,6 +36,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.DatTools", "Sabr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Reports", "SabreTools.Reports\SabreTools.Reports.csproj", "{8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Test", "SabreTools.Test\SabreTools.Test.csproj", "{5B4E67D5-F4DA-4750-8FE2-04D08E343791}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -148,6 +150,14 @@ Global
 		{8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}.Release|x64.ActiveCfg = Release|Any CPU
 		{8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}.Release|x64.Build.0 = Release|Any CPU
+		{5B4E67D5-F4DA-4750-8FE2-04D08E343791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B4E67D5-F4DA-4750-8FE2-04D08E343791}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B4E67D5-F4DA-4750-8FE2-04D08E343791}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5B4E67D5-F4DA-4750-8FE2-04D08E343791}.Debug|x64.Build.0 = Debug|Any CPU
+		{5B4E67D5-F4DA-4750-8FE2-04D08E343791}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B4E67D5-F4DA-4750-8FE2-04D08E343791}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B4E67D5-F4DA-4750-8FE2-04D08E343791}.Release|x64.ActiveCfg = Release|Any CPU
+		{5B4E67D5-F4DA-4750-8FE2-04D08E343791}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE