diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
index ca39a288b..f1b26248d 100644
--- a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
@@ -64,7 +64,15 @@ namespace Aaru.Tests.Images.ShrinkWrap
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -72,7 +80,15 @@ namespace Aaru.Tests.Images.ShrinkWrap
                 MediaType  = MediaType.DOS_35_DS_DD_9,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
index 758874438..3ae7050e4 100644
--- a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
@@ -81,7 +81,15 @@ namespace Aaru.Tests.Images.ShrinkWrap
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -89,7 +97,15 @@ namespace Aaru.Tests.Images.ShrinkWrap
                 MediaType  = MediaType.DOS_35_DS_DD_9,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -97,7 +113,15 @@ namespace Aaru.Tests.Images.ShrinkWrap
                 MediaType  = MediaType.DMF,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
index 946c8858e..d814c1a36 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
@@ -81,7 +81,15 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -89,7 +97,15 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
                 MediaType  = MediaType.DOS_35_DS_DD_9,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -97,7 +113,15 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
                 MediaType  = MediaType.DMF,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
index bb9934b82..f0bd78fe7 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
@@ -81,7 +81,15 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -89,7 +97,15 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
                 MediaType  = MediaType.DOS_35_DS_DD_9,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -97,7 +113,15 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
                 MediaType  = MediaType.DMF,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
index da495ca86..e02476592 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
@@ -81,7 +81,15 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -89,7 +97,15 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
                 MediaType  = MediaType.DOS_35_DS_DD_9,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -97,7 +113,15 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
                 MediaType  = MediaType.DMF,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/ShrinkWrap/Raw.cs b/Aaru.Tests/Images/ShrinkWrap/Raw.cs
index 362a812f5..31ee59399 100644
--- a/Aaru.Tests/Images/ShrinkWrap/Raw.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/Raw.cs
@@ -81,7 +81,15 @@ namespace Aaru.Tests.Images.ShrinkWrap
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -89,7 +97,15 @@ namespace Aaru.Tests.Images.ShrinkWrap
                 MediaType  = MediaType.DOS_35_DS_DD_9,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -97,7 +113,15 @@ namespace Aaru.Tests.Images.ShrinkWrap
                 MediaType  = MediaType.DMF,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {