diff --git a/SabreTools.DatTools.Test/ReplacerTests.cs b/SabreTools.DatTools.Test/ReplacerTests.cs
index a547c0b8..5824dbca 100644
--- a/SabreTools.DatTools.Test/ReplacerTests.cs
+++ b/SabreTools.DatTools.Test/ReplacerTests.cs
@@ -11,6 +11,8 @@ namespace SabreTools.DatTools.Test
     {
         #region ReplaceFields
 
+        // TODO: Add ReplaceFields_DatHeader test
+
         [Fact]
         public void ReplaceFields_Machine()
         {
diff --git a/SabreTools.Test/SetterTests.cs b/SabreTools.DatTools.Test/SetterTests.cs
similarity index 89%
rename from SabreTools.Test/SetterTests.cs
rename to SabreTools.DatTools.Test/SetterTests.cs
index 715ddb28..e7b7064b 100644
--- a/SabreTools.Test/SetterTests.cs
+++ b/SabreTools.DatTools.Test/SetterTests.cs
@@ -1,13 +1,16 @@
 using SabreTools.Core.Filter;
 using SabreTools.DatItems;
 using SabreTools.DatItems.Formats;
-using SabreTools.DatTools;
 using Xunit;
 
-namespace SabreTools.Test
+namespace SabreTools.DatTools.Test
 {
     public class SetterTests
     {
+        #region SetFields
+
+        // TODO: Add SetFields_DatHeader test
+
         [Fact]
         public void SetFields_DatItem()
         {
@@ -34,5 +37,7 @@ namespace SabreTools.Test
 
             Assert.Equal("foo", machine.GetStringFieldValue(Models.Metadata.Machine.NameKey));
         }
+
+        #endregion
     }
 }
\ No newline at end of file