diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs b/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs
index 5bc8502ff..418369c51 100644
--- a/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSPlus_APM.cs
@@ -96,12 +96,12 @@ namespace DiscImageChef.Tests.Filesystems
         };
 
         readonly string[] volumename = {
-            "Volume label","Volume label","Volume label","Volume label",
-            "Volume label","Volume label","Volume label","Volume label",
-            "Volume label","Volume label","Volume label","Volume label",
-            "Volume label","Volume label","Volume label","Volume label",
-            "Volume label","Volume label","Volume label","Volume label",
-            "Volume label",
+            null, null, null, null,
+            null, null, null, null,
+            null, null, null, null,
+            null, null, null, null,
+            null, null, null, null,
+            null,
         };
 
         readonly string[] volumeserial = {
diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs b/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs
index ea4f06cbb..b34e5f605 100644
--- a/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSPlus_GPT.cs
@@ -71,7 +71,7 @@ namespace DiscImageChef.Tests.Filesystems
         };
 
         readonly string[] volumename = {
-            "Volume label","Volume label",
+            null, null,
         };
 
         readonly string[] volumeserial = {
diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs b/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs
index c512a3bd9..2094faa61 100644
--- a/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSPlus_MBR.cs
@@ -86,10 +86,10 @@ namespace DiscImageChef.Tests.Filesystems
         };
 
         readonly string[] volumename = {
-            "Volume label","Volume label","Volume label","Volume label",
-            "Volume label","Volume label","Volume label","Volume label",
-            "Volume label","Volume label","Volume label","Volume label",
-            "Volume label",
+            null, null, null, null,
+            null, null, null, null,
+            null, null, null, null,
+            null,
         };
 
         readonly string[] volumeserial = {
diff --git a/DiscImageChef.Tests/Filesystems/HFSX_APM.cs b/DiscImageChef.Tests/Filesystems/HFSX_APM.cs
index ec7ad700c..3b834fc40 100644
--- a/DiscImageChef.Tests/Filesystems/HFSX_APM.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSX_APM.cs
@@ -76,8 +76,8 @@ namespace DiscImageChef.Tests.Filesystems
         };
 
         readonly string[] volumename = {
-            "Volume label","Volume label","Volume label","Volume label",
-            "Volume label","Volume label",
+            null, null, null, null,
+            null, null,
         };
 
         readonly string[] volumeserial = {
diff --git a/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs b/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs
index a3b8dd56e..7d4b872b1 100644
--- a/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSX_GPT.cs
@@ -71,7 +71,7 @@ namespace DiscImageChef.Tests.Filesystems
         };
 
         readonly string[] volumename = {
-            "Volume label","Volume label",
+            null, null,
         };
 
         readonly string[] volumeserial = {
diff --git a/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs b/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs
index c486c1076..57ec64575 100644
--- a/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/HFSX_MBR.cs
@@ -76,8 +76,8 @@ namespace DiscImageChef.Tests.Filesystems
         };
 
         readonly string[] volumename = {
-            "Volume label", "Volume label", "Volume label", "Volume label",
-            "Volume label", "Volume label",
+            null, null, null, null,
+            null, null,
         };
 
         readonly string[] volumeserial = {