diff --git a/Aaru.Tests/Images/QEMU/VirtualPC.cs b/Aaru.Tests/Images/QEMU/VirtualPC.cs
index 0b2b1242c..dc5a31d40 100644
--- a/Aaru.Tests/Images/QEMU/VirtualPC.cs
+++ b/Aaru.Tests/Images/QEMU/VirtualPC.cs
@@ -49,7 +49,7 @@ namespace Aaru.Tests.Images.QEMU
                 MediaType  = MediaType.Unknown,
                 Sectors    = 512064,
                 SectorSize = 512,
-                MD5        = "0435d6781d14d34a32c6ac40f5e70d35",
+                MD5        = "26d2745c1d614207b4bce4ee003c326d",
                 Partitions = new[]
                 {
                     new BlockPartitionVolumes
@@ -81,7 +81,7 @@ namespace Aaru.Tests.Images.QEMU
                 MediaType  = MediaType.Unknown,
                 Sectors    = 251940,
                 SectorSize = 512,
-                MD5        = "6246bff640cb3a56d2611e7f8616384d",
+                MD5        = "7126d647c1cefc5a81b4140e10f50269",
                 Partitions = new[]
                 {
                     new BlockPartitionVolumes
diff --git a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
index 764686a7a..673231898 100644
--- a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
+++ b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
@@ -49,7 +49,7 @@ namespace Aaru.Tests.Images.VirtualBox
                 MediaType  = MediaType.Unknown,
                 Sectors    = 512000,
                 SectorSize = 512,
-                MD5        = "f968f0e74dd1b254de9eac589a5d687d"
+                MD5        = "ab3248888d6f10ef30a084fac6a1e2fd"
             },
             new BlockImageTestExpected
             {
@@ -65,7 +65,7 @@ namespace Aaru.Tests.Images.VirtualBox
                 MediaType  = MediaType.Unknown,
                 Sectors    = 512000,
                 SectorSize = 512,
-                MD5        = "09d3dce9e60e9d1a997ad3f04d33c8c5"
+                MD5        = "ab3248888d6f10ef30a084fac6a1e2fd"
             },
             new BlockImageTestExpected
             {
@@ -81,7 +81,7 @@ namespace Aaru.Tests.Images.VirtualBox
                 MediaType  = MediaType.Unknown,
                 Sectors    = 512000,
                 SectorSize = 512,
-                MD5        = "284af271786e7def9bf8af7c2da1c4f2"
+                MD5        = "ab3248888d6f10ef30a084fac6a1e2fd"
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
index e0b03a8c4..e838bb39c 100644
--- a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
+++ b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
@@ -64,7 +64,7 @@ namespace Aaru.Tests.Images.VirtualPC
                 MediaType  = MediaType.Unknown,
                 Sectors    = 511056,
                 SectorSize = 512,
-                MD5        = "c0955193d302f5eae2138a3669c89669"
+                MD5        = "a6041066df8f52f5d14b8200766d6bb5"
             },
             new BlockImageTestExpected
             {
@@ -76,19 +76,19 @@ namespace Aaru.Tests.Images.VirtualPC
             },
             new BlockImageTestExpected
             {
-                TestFile   = "vpc601_dynamic_250mb.vhd.lz",
+                TestFile   = "vpc504_dynamic_250mb.lz",
                 MediaType  = MediaType.Unknown,
                 Sectors    = 511056,
                 SectorSize = 512,
-                MD5        = "3e3675037a8ec4b78ebafdc2b25e5ceb"
+                MD5        = "e924cd1bbb16f6a6056f81df410922ae"
             },
             new BlockImageTestExpected
             {
-                TestFile   = "vpc601_fixed_10mb.vhd.lz",
+                TestFile   = "vpc504_fixed_10mb.lz",
                 MediaType  = MediaType.Unknown,
                 Sectors    = 20468,
                 SectorSize = 512,
-                MD5        = "4b4e98a5bba2469382132f9289ae1c57"
+                MD5        = "b790693b1c94bed209ee1bb9d0b6a075"
             },
             new BlockImageTestExpected
             {
@@ -96,7 +96,7 @@ namespace Aaru.Tests.Images.VirtualPC
                 MediaType  = MediaType.Unknown,
                 Sectors    = 511056,
                 SectorSize = 512,
-                MD5        = "3e3675037a8ec4b78ebafdc2b25e5ceb"
+                MD5        = "1f9e3dc39db37a9e01fede6a12844222"
             },
             new BlockImageTestExpected
             {
@@ -104,7 +104,7 @@ namespace Aaru.Tests.Images.VirtualPC
                 MediaType  = MediaType.Unknown,
                 Sectors    = 511056,
                 SectorSize = 512,
-                MD5        = "723b2ed575e0e87f253f672f39b3a49f"
+                MD5        = "943a9da318111f50a92c3f2314fad1e0"
             },
             new BlockImageTestExpected
             {
@@ -115,12 +115,28 @@ namespace Aaru.Tests.Images.VirtualPC
                 MD5        = "4b4e98a5bba2469382132f9289ae1c57"
             },
             new BlockImageTestExpected
+            {
+                TestFile   = "vpc601_dynamic_250mb.vhd.lz",
+                MediaType  = MediaType.Unknown,
+                Sectors    = 511056,
+                SectorSize = 512,
+                MD5        = "1f9e3dc39db37a9e01fede6a12844222"
+            },
+            new BlockImageTestExpected
+            {
+                TestFile   = "vpc601_fixed_10mb.vhd.lz",
+                MediaType  = MediaType.Unknown,
+                Sectors    = 20468,
+                SectorSize = 512,
+                MD5        = "4b4e98a5bba2469382132f9289ae1c57"
+            },
+            new BlockImageTestExpected
             {
                 TestFile   = "vpc702_differencing_parent_250mb.vhd.lz",
                 MediaType  = MediaType.Unknown,
                 Sectors    = 511056,
                 SectorSize = 512,
-                MD5        = "0f6b4f4bb22f02e88e442638f803e4f4"
+                MD5        = "df41b76f8532fc8ef775f89212191244"
             },
             new BlockImageTestExpected
             {
@@ -128,7 +144,7 @@ namespace Aaru.Tests.Images.VirtualPC
                 MediaType  = MediaType.Unknown,
                 Sectors    = 511056,
                 SectorSize = 512,
-                MD5        = "3e3675037a8ec4b78ebafdc2b25e5ceb"
+                MD5        = "1f9e3dc39db37a9e01fede6a12844222"
             },
             new BlockImageTestExpected
             {