diff --git a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
index 61cbd5f58..85e60df1a 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
@@ -48,7 +48,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -56,7 +64,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework
                 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/DiskImagesFramework/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
index a06204752..15f8c5e9c 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.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
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
                 MediaType  = MediaType.DMF,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
index b5f7aac14..db314e610 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.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
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
                 MediaType  = MediaType.DMF,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
index 4133938f7..2b57e5055 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
                 MediaType  = MediaType.DOS_35_HD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.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
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
                 MediaType  = MediaType.DMF,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
index a91a8d9a8..f045778f0 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
index 9e89c0e73..de60c8945 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
index 682cdac9d..441e3eff6 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
index 1b1e51837..6a7ca56ae 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
index 2edb9e39f..73807c751 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
index c65978a2c..65ea3de74 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
index 41d1157c5..51d9a0d7e 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
index 4e7787ecb..6ddaf03c4 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
index e3e809ded..b678843c2 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
@@ -49,7 +49,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 2880,
                 SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32"
+                MD5        = "ff419213080574056ebd9adf7bab3d32",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2880
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -57,7 +65,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4"
+                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -65,7 +81,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 3360,
                 SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce"
+                MD5        = "92ea7a359957012a682ba126cfdef0ce",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3360
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -73,7 +97,15 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 10240,
                 SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439"
+                MD5        = "df3b4331a4a5652393ff55f001998439",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 10240
+                    }
+                }
             },
             new BlockImageTestExpected
             {