diff --git a/SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj b/SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj
new file mode 100644
index 00000000..69a04dc7
--- /dev/null
+++ b/SabreTools.Data.Extensions.Test/SabreTools.Data.Extensions.Test.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+        <IsPackable>false</IsPackable>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\SabreTools.Serialization\SabreTools.Serialization.csproj" />
+    </ItemGroup>
+
+    <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.0.1" />
+        <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>
+
+</Project>
\ No newline at end of file
diff --git a/SabreTools.Serialization.Test/Extensions/TypeLengthValueTests.cs b/SabreTools.Data.Extensions.Test/TypeLengthValueTests.cs
similarity index 99%
rename from SabreTools.Serialization.Test/Extensions/TypeLengthValueTests.cs
rename to SabreTools.Data.Extensions.Test/TypeLengthValueTests.cs
index a60dff17..eb689fbd 100644
--- a/SabreTools.Serialization.Test/Extensions/TypeLengthValueTests.cs
+++ b/SabreTools.Data.Extensions.Test/TypeLengthValueTests.cs
@@ -1,10 +1,9 @@
 using System;
-using SabreTools.Data.Extensions;
 using SabreTools.Data.Models.ASN1;
 using Xunit;
 
 #pragma warning disable IDE0230 // Use UTF-8 string literal
-namespace SabreTools.Serialization.Test.Extensions
+namespace SabreTools.Data.Extensions.Test
 {
     public class TypeLengthValueTests
     {
diff --git a/SabreTools.Serialization.sln b/SabreTools.Serialization.sln
index ddaab4a6..e213ce7a 100644
--- a/SabreTools.Serialization.sln
+++ b/SabreTools.Serialization.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtractionTool", "Extractio
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.ObjectIdentifier.Test", "SabreTools.ObjectIdentifier.Test\SabreTools.ObjectIdentifier.Test.csproj", "{B3AE7D43-3765-4F95-A5F1-820832732C0E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Data.Extensions.Test", "SabreTools.Data.Extensions.Test\SabreTools.Data.Extensions.Test.csproj", "{06842E33-CAE6-4E00-B48B-525DE73DF10E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +85,18 @@ Global
 		{B3AE7D43-3765-4F95-A5F1-820832732C0E}.Release|x64.Build.0 = Release|Any CPU
 		{B3AE7D43-3765-4F95-A5F1-820832732C0E}.Release|x86.ActiveCfg = Release|Any CPU
 		{B3AE7D43-3765-4F95-A5F1-820832732C0E}.Release|x86.Build.0 = Release|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Debug|x64.Build.0 = Debug|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Debug|x86.Build.0 = Debug|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|x64.ActiveCfg = Release|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|x64.Build.0 = Release|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|x86.ActiveCfg = Release|Any CPU
+		{06842E33-CAE6-4E00-B48B-525DE73DF10E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE