diff --git a/Aaru.Tests/Images/HxC/ImageDisk.cs b/Aaru.Tests/Images/HxC/ImageDisk.cs
index d71557928..04b6f23a0 100644
--- a/Aaru.Tests/Images/HxC/ImageDisk.cs
+++ b/Aaru.Tests/Images/HxC/ImageDisk.cs
@@ -89,7 +89,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.NEC_35_HD_8,
                 Sectors    = 1232,
                 SectorSize = 1024,
-                MD5        = "fd54916f713d01b670c1a5df5e74a97f"
+                MD5        = "fd54916f713d01b670c1a5df5e74a97f",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1232
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -137,7 +145,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.CBM_35_DD,
                 Sectors    = 1600,
                 SectorSize = 512,
-                MD5        = "c533488a21098a62c85f1649abda2803"
+                MD5        = "c533488a21098a62c85f1649abda2803",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1600
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -153,7 +169,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.FDFORMAT_35_DD,
                 Sectors    = 1640,
                 SectorSize = 512,
-                MD5        = "456390a9c6ab05cb458a03c47296de08"
+                MD5        = "456390a9c6ab05cb458a03c47296de08",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1640
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -161,7 +185,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.DOS_35_DS_DD_9,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4"
+                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -193,7 +225,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.Unknown,
                 Sectors    = 3372,
                 SectorSize = 512,
-                MD5        = "7f9164dc43bffc895db751ba1d9b55a9"
+                MD5        = "7f9164dc43bffc895db751ba1d9b55a9",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3372
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -209,7 +249,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.Unknown,
                 Sectors    = 3486,
                 SectorSize = 512,
-                MD5        = "dbd52e9e684f97d9e2292811242bb24e"
+                MD5        = "dbd52e9e684f97d9e2292811242bb24e",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3486
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -218,6 +266,16 @@ namespace Aaru.Tests.Images.HxC
                 Sectors    = 2882,
                 SectorSize = 2048,
                 MD5        = "f5fff7704fb677ebf23d27cd937c9403"
+                /* TODO: Division by zero because bytes per cluster is 0
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2882
+                    }
+                }
+                */
             },
             new BlockImageTestExpected
             {
@@ -233,8 +291,17 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.RX50,
                 Sectors    = 800,
                 SectorSize = 512,
-                MD5        = "ccd4431139755c58f340681f63510642"
-            },
+                MD5        = "ccd4431139755c58f340681f63510642",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 800
+                    }
+                }
+            }
+            /* TODO: Sector type 119 is not implemented
             new BlockImageTestExpected
             {
                 TestFile   = "mf2hd_xdf.imd.lz",
@@ -251,6 +318,7 @@ namespace Aaru.Tests.Images.HxC
                 SectorSize = 0,
                 MD5        = "UNKNOWN"
             }
+            */
         };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/HxC/Raw.cs b/Aaru.Tests/Images/HxC/Raw.cs
index 6370c607b..445a93170 100644
--- a/Aaru.Tests/Images/HxC/Raw.cs
+++ b/Aaru.Tests/Images/HxC/Raw.cs
@@ -88,7 +88,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.SHARP_525,
                 Sectors    = 1232,
                 SectorSize = 1024,
-                MD5        = "fd54916f713d01b670c1a5df5e74a97f"
+                MD5        = "fd54916f713d01b670c1a5df5e74a97f",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1232
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -144,7 +152,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.AppleSonyDS,
                 Sectors    = 1600,
                 SectorSize = 512,
-                MD5        = "c533488a21098a62c85f1649abda2803"
+                MD5        = "c533488a21098a62c85f1649abda2803",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1600
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -160,7 +176,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.FDFORMAT_35_DD,
                 Sectors    = 1640,
                 SectorSize = 512,
-                MD5        = "456390a9c6ab05cb458a03c47296de08"
+                MD5        = "456390a9c6ab05cb458a03c47296de08",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1640
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -168,7 +192,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.DOS_35_DS_DD_9,
                 Sectors    = 1440,
                 SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4"
+                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 1440
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -200,7 +232,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 3372,
                 SectorSize = 512,
-                MD5        = "7f9164dc43bffc895db751ba1d9b55a9"
+                MD5        = "7f9164dc43bffc895db751ba1d9b55a9",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3372
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -216,7 +256,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 3486,
                 SectorSize = 512,
-                MD5        = "dbd52e9e684f97d9e2292811242bb24e"
+                MD5        = "dbd52e9e684f97d9e2292811242bb24e",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 3486
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -224,7 +272,15 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.GENERIC_HDD,
                 Sectors    = 2888,
                 SectorSize = 512,
-                MD5        = "f5fff7704fb677ebf23d27cd937c9403"
+                MD5        = "f5fff7704fb677ebf23d27cd937c9403",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 2888
+                    }
+                }
             },
             new BlockImageTestExpected
             {
@@ -240,24 +296,34 @@ namespace Aaru.Tests.Images.HxC
                 MediaType  = MediaType.AppleSonySS,
                 Sectors    = 800,
                 SectorSize = 512,
-                MD5        = "ccd4431139755c58f340681f63510642"
-            },
+                MD5        = "ccd4431139755c58f340681f63510642",
+                Partitions = new[]
+                {
+                    new BlockPartitionVolumes
+                    {
+                        Start  = 0,
+                        Length = 800
+                    }
+                }
+            }
+            /* TODO: XDF reading is not implemented
             new BlockImageTestExpected
             {
                 TestFile   = "mf2hd_xdf.img.lz",
                 MediaType  = MediaType.XDF_35,
-                Sectors    = 0,
-                SectorSize = 0,
+                Sectors    = 670,
+                SectorSize = 8192,
                 MD5        = "UNKNOWN"
             },
             new BlockImageTestExpected
             {
                 TestFile   = "mf2hd_xdf_teledisk.img.lz",
                 MediaType  = MediaType.XDF_35,
-                Sectors    = 0,
-                SectorSize = 0,
+                Sectors    = 3680,
+                SectorSize = 512,
                 MD5        = "UNKNOWN"
             }
+            */
         };
     }
 }
\ No newline at end of file