diff --git a/Aaru.Tests/Images/MaxiDisk.cs b/Aaru.Tests/Images/MaxiDisk.cs
index b3748bbca..8278ba1af 100644
--- a/Aaru.Tests/Images/MaxiDisk.cs
+++ b/Aaru.Tests/Images/MaxiDisk.cs
@@ -47,7 +47,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.CBM_35_DD,
                 Sectors    = 1600,
                 SectorSize = 512,
-                MD5        = "26532a62985b51a2c3b877a57f6d257b"
+                MD5        = "26532a62985b51a2c3b877a57f6d257b",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1600
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -55,7 +63,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.DOS_35_DS_DD_9,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "9827ba1b3e9cac41263caabd862e78f9"
+                MD5        = "9827ba1b3e9cac41263caabd862e78f9",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -63,7 +79,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.ECMA_147,
                 Sectors    = 5760,
                 SectorSize = 512,
-                MD5        = "4aeafaf2a088d6a7406856dce8118567"
+                MD5        = "4aeafaf2a088d6a7406856dce8118567",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 5760
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -71,7 +95,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.DMF,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "2bfd2e0a81bad704f8fc7758358cfcca"
+                MD5        = "2bfd2e0a81bad704f8fc7758358cfcca",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -79,7 +111,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.DMF,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "7e3bf04f3660dd1052a335dc99441e44"
+                MD5        = "7e3bf04f3660dd1052a335dc99441e44",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -87,7 +127,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.Unknown,
                 Sectors    = 3200,
                 SectorSize = 512,
-                MD5        = "8eb8cb310feaf03c69fffd4f6e729847"
+                MD5        = "8eb8cb310feaf03c69fffd4f6e729847",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3200
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -95,7 +143,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.FDFORMAT_35_HD,
                 Sectors    = 3444,
                 SectorSize = 512,
-                MD5        = "a58fd062f024b95714f1223a8bc2232f"
+                MD5        = "a58fd062f024b95714f1223a8bc2232f",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3444
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -103,7 +159,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "00e61c06bf29f0c04a7eabe2dbd7efb6"
+                MD5        = "00e61c06bf29f0c04a7eabe2dbd7efb6",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -111,7 +175,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.DOS_525_SS_DD_8,
                 Sectors    = 320,
                 SectorSize = 512,
-                MD5        = "d81f5cb64fd0b99f138eab34110bbc3c"
+                MD5        = "d81f5cb64fd0b99f138eab34110bbc3c",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 320
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -119,7 +191,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.DOS_525_SS_DD_9,
                 Sectors    = 360,
                 SectorSize = 512,
-                MD5        = "a89006a75d13bee9202d1d6e52721ccb"
+                MD5        = "a89006a75d13bee9202d1d6e52721ccb",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -127,7 +207,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.DOS_525_DS_DD_8,
                 Sectors    = 640,
                 SectorSize = 512,
-                MD5        = "beef1cdb004dc69391d6b3d508988b95"
+                MD5        = "beef1cdb004dc69391d6b3d508988b95",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 640
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -143,7 +231,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "073a172879a71339ef4b00ebb47b67fc"
+                MD5        = "073a172879a71339ef4b00ebb47b67fc",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -151,7 +247,15 @@ namespace Aaru.Tests.Images
                 MediaType  = MediaType.DOS_525_HD,
                 Sectors    = 2400,
                 SectorSize = 512,
-                MD5        = "02259cd5fbcc20f8484aa6bece7a37c6"
+                MD5        = "02259cd5fbcc20f8484aa6bece7a37c6",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2400
+                    }
+                }
             }
         };
     }