diff --git a/SabreTools.Test/RemoverTests.cs b/SabreTools.Test/RemoverTests.cs
index a2e19fb0..330331af 100644
--- a/SabreTools.Test/RemoverTests.cs
+++ b/SabreTools.Test/RemoverTests.cs
@@ -8,7 +8,7 @@ namespace SabreTools.Test
     public class RemoverTests
     {
         [Fact]
-        public void RemoveFieldsDatItemTest()
+        public void RemoveFields_DatItem()
         {
             var datItem = new Rom();
             datItem.SetName("foo");
@@ -21,7 +21,7 @@ namespace SabreTools.Test
         }
 
         [Fact]
-        public void RemoveFieldsMachineTest()
+        public void RemoveFields_Machine()
         {
             var machine = new Machine();
             machine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "bar");
diff --git a/SabreTools.Test/SetterTests.cs b/SabreTools.Test/SetterTests.cs
index c03a545c..715ddb28 100644
--- a/SabreTools.Test/SetterTests.cs
+++ b/SabreTools.Test/SetterTests.cs
@@ -9,39 +9,30 @@ namespace SabreTools.Test
     public class SetterTests
     {
         [Fact]
-        public void SetFieldsDatItemTest()
+        public void SetFields_DatItem()
         {
-            var datItem = CreateDatItem();
+            var datItem = new Rom();
+            datItem.SetName("foo");
+
             var setter = new Setter();
             setter.PopulateSetters(new FilterKey("datitem", "name"), "bar");
             setter.SetFields(datItem);
+
             Assert.Equal("bar", datItem.GetName());
         }
 
         [Fact]
-        public void SetFieldsMachineTest()
-        {
-            var datItem = CreateDatItem();
-            var setter = new Setter();
-            setter.PopulateSetters(new FilterKey("machine", "name"), "foo");
-            setter.SetFields(datItem.GetFieldValue<Machine>(DatItem.MachineKey));
-            Assert.Equal("foo", datItem.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey));
-        }
-
-        /// <summary>
-        /// Generate a consistent DatItem for testing
-        /// </summary>
-        private static DatItem CreateDatItem()
+        public void SetFields_Machine()
         {
             var machine = new Machine();
             machine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "bar");
             machine.SetFieldValue<string?>(Models.Metadata.Machine.DescriptionKey, "bar");
 
-            var rom = new Rom();
-            rom.SetFieldValue<Machine>(DatItem.MachineKey, machine);
-            rom.SetName("foo");
+            var setter = new Setter();
+            setter.PopulateSetters(new FilterKey("machine", "name"), "foo");
+            setter.SetFields(machine);
 
-            return rom;
+            Assert.Equal("foo", machine.GetStringFieldValue(Models.Metadata.Machine.NameKey));
         }
     }
 }
\ No newline at end of file