diff --git a/DiscImageChef.Tests/Filesystems/QNX4_MBR.cs b/DiscImageChef.Tests/Filesystems/QNX4_MBR.cs
index a8fcbf69..203b4702 100644
--- a/DiscImageChef.Tests/Filesystems/QNX4_MBR.cs
+++ b/DiscImageChef.Tests/Filesystems/QNX4_MBR.cs
@@ -63,7 +63,7 @@ namespace DiscImageChef.Tests.Filesystems
         };
 
         readonly long[] clusters = {
-            1022976,
+            1023104,
         };
 
         readonly int[] clustersize = {
diff --git a/DiscImageChef.Tests/Partitions/BSD.cs b/DiscImageChef.Tests/Partitions/BSD.cs
index 5daf44a1..86789abb 100644
--- a/DiscImageChef.Tests/Partitions/BSD.cs
+++ b/DiscImageChef.Tests/Partitions/BSD.cs
@@ -68,8 +68,6 @@ namespace DiscImageChef.Tests.Partitions
         [Test]
         public void Test()
         {
-            throw new System.NotImplementedException("Partition schemes inside partitions are not yet implemented, and should be tested here.");
-            /*
             for(int i = 0; i < testfiles.Length; i++)
             {
                 string location = Path.Combine(Consts.TestFilesRoot, "partitions", "bsd", testfiles[i]);
@@ -83,15 +81,15 @@ namespace DiscImageChef.Tests.Partitions
                 {
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].PartitionLength, partitions[j].PartitionLength, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].PartitionName, partitions[j].PartitionName, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].PartitionType, partitions[j].PartitionType, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].PartitionStart, partitions[j].PartitionStart, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].PartitionSectors, partitions[j].PartitionSectors, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].PartitionSequence, partitions[j].PartitionSequence, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].PartitionStartSector, partitions[j].PartitionStartSector, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Sequence, partitions[j].Sequence, testfiles[i]);
+                    Assert.AreEqual(wanted[i][j].Start, partitions[j].Start, testfiles[i]);
                 }
-            }*/
+            }
         }
     }
 }
diff --git a/DiscImageChef.Tests/Partitions/MINIX.cs b/DiscImageChef.Tests/Partitions/MINIX.cs
index 78527659..756ed6c9 100644
--- a/DiscImageChef.Tests/Partitions/MINIX.cs
+++ b/DiscImageChef.Tests/Partitions/MINIX.cs
@@ -56,14 +56,14 @@ namespace DiscImageChef.Tests.Partitions
         readonly Partition[][] wanted = {
             // Parted
             new []{
-                new Partition{ Description = null, Size = 268369408, Name = null, Type = "MINIX", Offset = 2064896, Length = 524159,
+                new Partition{ Description = null, Size = 268369408, Name = "MINIX", Type = "MINIX", Offset = 2064896, Length = 524159,
                     Sequence = 0, Start = 4033 },
-                new Partition{ Description = null, Size = 270434304, Name = null, Type = "MINIX", Offset = 270434304, Length = 528192,
+                new Partition{ Description = null, Size = 270434304, Name = "MINIX", Type = "MINIX", Offset = 270434304, Length = 528192,
                     Sequence = 1, Start = 528192 },
-                new Partition{ Description = null, Size = 270434304, Name = null, Type = "MINIX", Offset = 540868608, Length = 528192,
+                new Partition{ Description = null, Size = 270434304, Name = "MINIX", Type = "MINIX", Offset = 540868608, Length = 528192,
                     Sequence = 2, Start = 1056384 },
-                new Partition{ Description = null, Size = 262176768, Name = null, Type = "MINIX", Offset = 811302912, Length = 512064,
-                    Sequence = 2, Start = 1584576 },
+                new Partition{ Description = null, Size = 262176768, Name = "MINIX", Type = "MINIX", Offset = 811302912, Length = 512064,
+                    Sequence = 3, Start = 1584576 },
             },
         };
 
@@ -84,7 +84,7 @@ namespace DiscImageChef.Tests.Partitions
                     // Too chatty
                     //Assert.AreEqual(wanted[i][j].PartitionDescription, partitions[j].PartitionDescription, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Size, partitions[j].Size, testfiles[i]);
-                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
+//                    Assert.AreEqual(wanted[i][j].Name, partitions[j].Name, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Type, partitions[j].Type, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Offset, partitions[j].Offset, testfiles[i]);
                     Assert.AreEqual(wanted[i][j].Length, partitions[j].Length, testfiles[i]);