diff --git a/Aaru.Tests/Filesystems/BeFS/APM.cs b/Aaru.Tests/Filesystems/BeFS/APM.cs
index 52299a665..74f452155 100644
--- a/Aaru.Tests/Filesystems/BeFS/APM.cs
+++ b/Aaru.Tests/Filesystems/BeFS/APM.cs
@@ -64,7 +64,17 @@ namespace Aaru.Tests.Filesystems.BeFS
                 Clusters    = 130976,
                 ClusterSize = 1024,
                 VolumeName  = "Volume label"
-            }
+            },
+            new FileSystemTest
+            {
+                TestFile    = "beos_r5.aif",
+                MediaType   = MediaType.GENERIC_HDD,
+                Sectors     = 262144,
+                SectorSize  = 512,
+                Clusters    = 130976,
+                ClusterSize = 1024,
+                VolumeName  = "Volume label"
+            },
         };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/BeFS/MBR.cs b/Aaru.Tests/Filesystems/BeFS/MBR.cs
index 7dbfa3cba..47585efcf 100644
--- a/Aaru.Tests/Filesystems/BeFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/BeFS/MBR.cs
@@ -84,7 +84,37 @@ namespace Aaru.Tests.Filesystems.BeFS
                 Clusters    = 524272,
                 ClusterSize = 2048,
                 VolumeName  = "Volume label"
-            }
+            },
+            new FileSystemTest
+            {
+                TestFile    = "beos_r5.aif",
+                MediaType   = MediaType.GENERIC_HDD,
+                Sectors     = 262144,
+                SectorSize  = 512,
+                Clusters    = 130536,
+                ClusterSize = 1024,
+                VolumeName  = "Volume label"
+            },
+            new FileSystemTest
+            {
+                TestFile    = "beos_r5_2k.aif",
+                MediaType   = MediaType.GENERIC_HDD,
+                Sectors     = 262144,
+                SectorSize  = 512,
+                Clusters    = 65268,
+                ClusterSize = 2048,
+                VolumeName  = "Volume label 2K"
+            },
+            new FileSystemTest
+            {
+                TestFile    = "beos_r5_4k.aif",
+                MediaType   = MediaType.GENERIC_HDD,
+                Sectors     = 262144,
+                SectorSize  = 512,
+                Clusters    = 32634,
+                ClusterSize = 4096,
+                VolumeName  = "Volume label 4K"
+            },
         };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/BeFS/Whole.cs b/Aaru.Tests/Filesystems/BeFS/Whole.cs
index a6a3343a3..1bb2a0a3c 100644
--- a/Aaru.Tests/Filesystems/BeFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/BeFS/Whole.cs
@@ -64,6 +64,16 @@ namespace Aaru.Tests.Filesystems.BeFS
                 Clusters    = 1440,
                 ClusterSize = 1024,
                 VolumeName  = "Volume label"
+            },
+            new FileSystemTest
+            {
+                TestFile    = "beos_r5.img.lz",
+                MediaType   = MediaType.DOS_35_HD,
+                Sectors     = 2880,
+                SectorSize  = 512,
+                Clusters    = 1440,
+                ClusterSize = 1024,
+                VolumeName  = "Volume label"
             }
         };
     }
diff --git a/Aaru.Tests/Filesystems/FAT12/Whole.cs b/Aaru.Tests/Filesystems/FAT12/Whole.cs
index 8e46b3571..b4e4ac03a 100644
--- a/Aaru.Tests/Filesystems/FAT12/Whole.cs
+++ b/Aaru.Tests/Filesystems/FAT12/Whole.cs
@@ -5416,7 +5416,20 @@ namespace Aaru.Tests.Filesystems.FAT12
                 SystemId     = "GEOWORKS",
                 VolumeName   = "GEOS41",
                 VolumeSerial = "8D684C67"
-            }
+            },
+            new FileSystemTest
+            {
+                TestFile     = "beos_r5_mf2hd.img.lz",
+                MediaType    = MediaType.DOS_35_HD,
+                Sectors      = 2880,
+                SectorSize   = 512,
+                Bootable     = true,
+                Clusters     = 2880,
+                ClusterSize  = 512,
+                SystemId     = "BeOS    ",
+                VolumeName   = "VOLUMELABEL",
+                VolumeSerial = "00000000"
+            },
         };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT16/MBR.cs b/Aaru.Tests/Filesystems/FAT16/MBR.cs
index c0b682fd1..4c5ea596a 100644
--- a/Aaru.Tests/Filesystems/FAT16/MBR.cs
+++ b/Aaru.Tests/Filesystems/FAT16/MBR.cs
@@ -876,6 +876,19 @@ namespace Aaru.Tests.Filesystems.FAT16
                 SystemId     = "mkfs.fat",
                 VolumeName   = "DICSETTER",
                 VolumeSerial = "FCC308A7"
+            },
+            new FileSystemTest
+            {
+                TestFile     = "beos_r5.aif",
+                MediaType    = MediaType.GENERIC_HDD,
+                Sectors      = 262144,
+                SectorSize   = 512,
+                Bootable     = true,
+                Clusters     = 65268,
+                ClusterSize  = 2048,
+                SystemId     = "BeOS    ",
+                VolumeName   = "VOLUMELABEL",
+                VolumeSerial = "00000000"
             }
         };
     }
diff --git a/Aaru.Tests/Filesystems/FAT16/Whole.cs b/Aaru.Tests/Filesystems/FAT16/Whole.cs
index 5776340d7..1c4cae34f 100644
--- a/Aaru.Tests/Filesystems/FAT16/Whole.cs
+++ b/Aaru.Tests/Filesystems/FAT16/Whole.cs
@@ -80,7 +80,20 @@ namespace Aaru.Tests.Filesystems.FAT16
                 SystemId     = "BeOS    ",
                 VolumeName   = "VOLUME LABE",
                 VolumeSerial = "00000000"
-            }
+            },
+            new FileSystemTest
+            {
+                TestFile     = "beos_r5_mf2hd.img.lz",
+                MediaType    = MediaType.DOS_35_HD,
+                Sectors      = 2880,
+                SectorSize   = 512,
+                Bootable     = true,
+                Clusters     = 2880,
+                ClusterSize  = 512,
+                SystemId     = "BeOS    ",
+                VolumeName   = "VOLUMELABEL",
+                VolumeSerial = "00000000"
+            },
         };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT32/MBR.cs b/Aaru.Tests/Filesystems/FAT32/MBR.cs
index aa22b4f6a..3718ccf21 100644
--- a/Aaru.Tests/Filesystems/FAT32/MBR.cs
+++ b/Aaru.Tests/Filesystems/FAT32/MBR.cs
@@ -355,6 +355,19 @@ namespace Aaru.Tests.Filesystems.FAT32
                 SystemId     = "mkfs.fat",
                 VolumeName   = "DICSETTER",
                 VolumeSerial = "79BCA86E"
+            },
+            new FileSystemTest
+            {
+                TestFile     = "beos_r5.aif",
+                MediaType    = MediaType.GENERIC_HDD,
+                Sectors      = 262144,
+                SectorSize   = 512,
+                Bootable     = true,
+                Clusters     = 261072,
+                ClusterSize  = 512,
+                SystemId     = "BeOS    ",
+                VolumeName   = "VOLUMELABEL",
+                VolumeSerial = "00000000"
             }
         };
     }
diff --git a/Aaru.Tests/Filesystems/FAT32/Whole.cs b/Aaru.Tests/Filesystems/FAT32/Whole.cs
index d424f8279..81753cfac 100644
--- a/Aaru.Tests/Filesystems/FAT32/Whole.cs
+++ b/Aaru.Tests/Filesystems/FAT32/Whole.cs
@@ -58,7 +58,20 @@ namespace Aaru.Tests.Filesystems.FAT32
                 SystemId     = "BeOS    ",
                 VolumeName   = "VOLUME LABE",
                 VolumeSerial = "00000000"
-            }
+            },
+            new FileSystemTest
+            {
+                TestFile     = "beos_r5_mf2hd.img.lz",
+                MediaType    = MediaType.DOS_35_HD,
+                Sectors      = 2880,
+                SectorSize   = 512,
+                Bootable     = true,
+                Clusters     = 2880,
+                ClusterSize  = 512,
+                SystemId     = "BeOS    ",
+                VolumeName   = "VOLUMELABEL",
+                VolumeSerial = "00000000"
+            },
         };
     }
 }
\ No newline at end of file