diff --git a/SabreTools.Test/ReplacerTests.cs b/SabreTools.DatTools.Test/ReplacerTests.cs
similarity index 98%
rename from SabreTools.Test/ReplacerTests.cs
rename to SabreTools.DatTools.Test/ReplacerTests.cs
index 7700df5e..a547c0b8 100644
--- a/SabreTools.Test/ReplacerTests.cs
+++ b/SabreTools.DatTools.Test/ReplacerTests.cs
@@ -2,11 +2,10 @@ using System.Collections.Generic;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.DatItems.Formats;
-using SabreTools.DatTools;
 using SabreTools.Hashing;
 using Xunit;
 
-namespace SabreTools.Test
+namespace SabreTools.DatTools.Test
 {
     public class ReplacerTests
     {
@@ -63,13 +62,13 @@ namespace SabreTools.Test
         [Fact]
         public void ReplaceFields_File()
         {
-            var datItem = new DatItems.Formats.File();
+            var datItem = new File();
             datItem.CRC = ZeroHash.CRC32Str;
             datItem.MD5 = ZeroHash.MD5Str;
             datItem.SHA1 = ZeroHash.SHA1Str;
             datItem.SHA256 = ZeroHash.SHA256Str;
 
-            var repDatItem = new DatItems.Formats.File();
+            var repDatItem = new File();
             repDatItem.CRC = TextHelper.NormalizeCRC32("deadbeef");
             repDatItem.MD5 = TextHelper.NormalizeMD5("deadbeef");
             repDatItem.SHA1 = TextHelper.NormalizeSHA1("deadbeef");
diff --git a/SabreTools.DatTools.Test/SabreTools.DatTools.Test.csproj b/SabreTools.DatTools.Test/SabreTools.DatTools.Test.csproj
index d84cd755..79645c46 100644
--- a/SabreTools.DatTools.Test/SabreTools.DatTools.Test.csproj
+++ b/SabreTools.DatTools.Test/SabreTools.DatTools.Test.csproj
@@ -8,6 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\SabreTools.Core\SabreTools.Core.csproj" />
         <ProjectReference Include="..\SabreTools.DatItems\SabreTools.DatItems.csproj" />
         <ProjectReference Include="..\SabreTools.DatTools\SabreTools.DatTools.csproj" />
     </ItemGroup>
@@ -18,6 +19,7 @@
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="SabreTools.Hashing" Version="1.4.2" />
         <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>