diff --git a/SabreTools.DatItems.Test/Formats/DiskTests.cs b/SabreTools.DatItems.Test/Formats/DiskTests.cs
index fd32acff..74afa2d4 100644
--- a/SabreTools.DatItems.Test/Formats/DiskTests.cs
+++ b/SabreTools.DatItems.Test/Formats/DiskTests.cs
@@ -27,10 +27,10 @@ namespace SabreTools.DatItems.Test.Formats
             disk.SetFieldValue(Disk.DiskAreaKey, diskArea);
             disk.SetFieldValue(Models.Metadata.Disk.MergeKey, "XXXXXX");
             disk.SetFieldValue(Models.Metadata.Disk.RegionKey, "XXXXXX");
-            disk.SetFieldValue(Models.Metadata.Disk.StatusKey, "XXXXXX");
+            disk.SetFieldValue(Models.Metadata.Disk.StatusKey, "good");
             disk.SetFieldValue(Models.Metadata.Disk.OptionalKey, "XXXXXX");
-            disk.SetFieldValue(Models.Metadata.Disk.MD5Key, "XXXXXX");
-            disk.SetFieldValue(Models.Metadata.Disk.SHA1Key, "XXXXXX");
+            disk.SetFieldValue(Models.Metadata.Disk.MD5Key, ZeroHash.MD5Str);
+            disk.SetFieldValue(Models.Metadata.Disk.SHA1Key, ZeroHash.SHA1Str);
             disk.SetFieldValue(DatItem.DupeTypeKey, DupeType.All | DupeType.External);
             disk.SetFieldValue(DatItem.MachineKey, machine);
             disk.SetFieldValue(Disk.PartKey, part);
@@ -42,10 +42,10 @@ namespace SabreTools.DatItems.Test.Formats
             Assert.Equal("XXXXXX.chd", actual.GetName());
             Assert.Equal("XXXXXX", actual.GetStringFieldValue(Models.Metadata.Rom.MergeKey));
             Assert.Equal("XXXXXX", actual.GetStringFieldValue(Models.Metadata.Rom.RegionKey));
-            Assert.Equal("XXXXXX", actual.GetStringFieldValue(Models.Metadata.Rom.StatusKey));
+            Assert.Equal("good", actual.GetStringFieldValue(Models.Metadata.Rom.StatusKey));
             Assert.Equal("XXXXXX", actual.GetStringFieldValue(Models.Metadata.Rom.OptionalKey));
-            Assert.Equal("XXXXXX", actual.GetStringFieldValue(Models.Metadata.Rom.MD5Key));
-            Assert.Equal("XXXXXX", actual.GetStringFieldValue(Models.Metadata.Rom.SHA1Key));
+            Assert.Equal(ZeroHash.MD5Str, actual.GetStringFieldValue(Models.Metadata.Rom.MD5Key));
+            Assert.Equal(ZeroHash.SHA1Str, actual.GetStringFieldValue(Models.Metadata.Rom.SHA1Key));
             Assert.Equal(DupeType.All | DupeType.External, actual.GetFieldValue<DupeType>(DatItem.DupeTypeKey));
 
             DataArea? actualDataArea = actual.GetFieldValue<DataArea?>(Rom.DataAreaKey);
diff --git a/SabreTools.DatItems.Test/Formats/MediaTests.cs b/SabreTools.DatItems.Test/Formats/MediaTests.cs
index 684aa6a8..591a2afa 100644
--- a/SabreTools.DatItems.Test/Formats/MediaTests.cs
+++ b/SabreTools.DatItems.Test/Formats/MediaTests.cs
@@ -18,10 +18,10 @@ namespace SabreTools.DatItems.Test.Formats
 
             Media media = new Media();
             media.SetName("XXXXXX");
-            media.SetFieldValue(Models.Metadata.Media.MD5Key, "XXXXXX");
-            media.SetFieldValue(Models.Metadata.Media.SHA1Key, "XXXXXX");
-            media.SetFieldValue(Models.Metadata.Media.SHA256Key, "XXXXXX");
-            media.SetFieldValue(Models.Metadata.Media.SpamSumKey, "XXXXXX");
+            media.SetFieldValue(Models.Metadata.Media.MD5Key, ZeroHash.MD5Str);
+            media.SetFieldValue(Models.Metadata.Media.SHA1Key, ZeroHash.SHA1Str);
+            media.SetFieldValue(Models.Metadata.Media.SHA256Key, ZeroHash.SHA256Str);
+            media.SetFieldValue(Models.Metadata.Media.SpamSumKey, ZeroHash.SpamSumStr);
             media.SetFieldValue(DatItem.DupeTypeKey, DupeType.All | DupeType.External);
             media.SetFieldValue(DatItem.MachineKey, machine);
             media.SetFieldValue(DatItem.RemoveKey, (bool?)false);
@@ -30,10 +30,10 @@ namespace SabreTools.DatItems.Test.Formats
             Rom actual = media.ConvertToRom();
 
             Assert.Equal("XXXXXX.aaruf", actual.GetName());
-            Assert.Equal("XXXXXX", actual.GetStringFieldValue(Models.Metadata.Rom.MD5Key));
-            Assert.Equal("XXXXXX", actual.GetStringFieldValue(Models.Metadata.Rom.SHA1Key));
-            Assert.Equal("XXXXXX", actual.GetStringFieldValue(Models.Metadata.Rom.SHA256Key));
-            Assert.Equal("XXXXXX", actual.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey));
+            Assert.Equal(ZeroHash.MD5Str, actual.GetStringFieldValue(Models.Metadata.Rom.MD5Key));
+            Assert.Equal(ZeroHash.SHA1Str, actual.GetStringFieldValue(Models.Metadata.Rom.SHA1Key));
+            Assert.Equal(ZeroHash.SHA256Str, actual.GetStringFieldValue(Models.Metadata.Rom.SHA256Key));
+            Assert.Equal(ZeroHash.SpamSumStr, actual.GetStringFieldValue(Models.Metadata.Rom.SpamSumKey));
             Assert.Equal(DupeType.All | DupeType.External, actual.GetFieldValue<DupeType>(DatItem.DupeTypeKey));
 
             Machine? actualMachine = actual.GetFieldValue<Machine?>(DatItem.MachineKey);