diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 7f680b386..9ddc36ab7 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -16,16 +16,6 @@
     <e p="$USER_HOME$/.nuget/packages/nunit3testadapter/3.15.1/build/netcoreapp2.0/nunit.engine.api.dll" t="Include" />
     <e p="$USER_HOME$/.nuget/packages/nunit3testadapter/3.15.1/build/netcoreapp2.0/nunit.engine.dll" t="Include" />
     <e p="$PROJECT_DIR$" t="IncludeFlat">
-      <e p=".git/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Checksums/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.CommonTypes/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Console/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Decoders/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Dto/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Helpers/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/CICMMetadata/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/cuetools.net/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/cuetoolsnet/info/exclude" t="IncludeRecursive" />
       <e p=".github/CODE_OF_CONDUCT.md" t="Include" />
       <e p=".github/ISSUE_TEMPLATE.md" t="Include" />
       <e p=".github/PULL_REQUEST_TEMPLATE.md" t="Include" />
diff --git a/Aaru.Tests/Images/2MG.cs b/Aaru.Tests/Images/2MG.cs
index af17eca1e..834d97c46 100644
--- a/Aaru.Tests/Images/2MG.cs
+++ b/Aaru.Tests/Images/2MG.cs
@@ -40,30 +40,51 @@ namespace Aaru.Tests.Images
     {
         readonly string[] _testFiles =
         {
-            "blank140.2mg.lz", "dos32.2mg.lz", "dos33-do.2mg.lz", "dos33-nib.2mg.lz", "dos33-po.2mg.lz",
-            "prodos1440.2mg.lz"
+            "blank140.2mg.lz", "dos32.2mg.lz", "dos32_alt.2mg.lz", "dos33_dic.2mg.lz", "dos33-do.2mg.lz",
+            "dos33-nib.2mg.lz", "dos33_nib.2mg.lz", "dos33-po.2mg.lz", "dos33_po.2mg.lz", "hfs1440.2mg.lz",
+            "hfs800_dic.2mg.lz", "hfs_do.2mg.lz", "hfs_po.2mg.lz", "modified_do.2mg.lz", "modified_po.2mg.lz",
+            "pascal800_do.2mg.lz", "pascal800_p.2mg.lz", "pascal_dic.2mg.lz", "pascal_do.2mg.lz", "pascal_nib.2mg.lz",
+            "pascal_po.2mg.lz", "prodos1440.2mg.lz", "prodos1440_po.2mg.lz", "prodos5mb.2mg.lz", "prodos5m_dic.2mg.lz",
+            "prodos800_dic.2mg.lz", "prodos800_do.2mg.lz", "prodos800_po.2mg.lz", "prodos_dic.2mg.lz",
+            "prodos_do.2mg.lz", "prodos_nib.2mg.lz", "prodos_po.2mg.lz"
         };
 
         readonly ulong[] _sectors =
         {
-            560, 455, 560, 560, 560, 2880
+            560, 455, 455, 560, 560, 560, 560, 560, 560, 2880, 1600, 1600, 1600, 1600, 1600, 1600, 1600, 560, 560, 560,
+            560, 2880, 2880, 10240, 10240, 1600, 1600, 1600, 560, 560, 560, 560
         };
 
         readonly uint[] _sectorSize =
         {
-            256, 256, 256, 256, 256, 512
+            256, 256, 256, 256, 256, 256, 256, 256, 256, 512, 512, 512, 512, 512, 512, 512, 512, 256, 256, 256, 256,
+            512, 512, 512, 512, 512, 512, 512, 256, 256, 256, 256
         };
 
         readonly MediaType[] _mediaTypes =
         {
-            MediaType.Apple33SS, MediaType.Apple32SS, MediaType.Apple33SS, MediaType.Apple33SS, MediaType.Apple33SS,
-            MediaType.DOS_35_HD
+            MediaType.Apple33SS, MediaType.Apple32SS, MediaType.Apple32SS, MediaType.Apple33SS, MediaType.Apple33SS,
+            MediaType.Apple33SS, MediaType.Apple33SS, MediaType.Apple33SS, MediaType.Apple33SS, MediaType.DOS_35_HD,
+            MediaType.AppleSonyDS, MediaType.AppleSonyDS, MediaType.AppleSonyDS, MediaType.AppleSonyDS,
+            MediaType.AppleSonyDS, MediaType.AppleSonyDS, MediaType.AppleSonyDS, MediaType.Apple33SS,
+            MediaType.Apple33SS, MediaType.Apple33SS, MediaType.Apple33SS, MediaType.DOS_35_HD, MediaType.DOS_35_HD,
+            MediaType.Unknown, MediaType.Unknown, MediaType.AppleSonyDS, MediaType.AppleSonyDS, MediaType.AppleSonyDS,
+            MediaType.Apple33SS, MediaType.Apple33SS, MediaType.Apple33SS, MediaType.Apple33SS
         };
 
         readonly string[] _md5S =
         {
-            "7db5d585270ab858043d50e60068d45f", "906c1bdbf76bf089ea47aae98151df5d", "91d020725d081500caa1fd8aad959397",
-            "91d020725d081500caa1fd8aad959397", "91d020725d081500caa1fd8aad959397", "eb9b60c78b30d2b6541ed0781944b6da"
+            "7db5d585270ab858043d50e60068d45f", "906c1bdbf76bf089ea47aae98151df5d", "76f8fe4c5bc1976f99641ad7cdf53109",
+            "0ffcbd4180306192726926b43755db2f", "91d020725d081500caa1fd8aad959397", "91d020725d081500caa1fd8aad959397",
+            "0ffcbd4180306192726926b43755db2f", "91d020725d081500caa1fd8aad959397", "0ffcbd4180306192726926b43755db2f",
+            "535648d1f9838b695403f2f48d5ac94c", "2762f41d0379b476042fc62891baac84", "2762f41d0379b476042fc62891baac84",
+            "2762f41d0379b476042fc62891baac84", "b748f6df3e60e7169d42ec6fcc857ea4", "b748f6df3e60e7169d42ec6fcc857ea4",
+            "dbd0ec8a3126236910709faf923adcf2", "dbd0ec8a3126236910709faf923adcf2", "4c4926103a32ac15f7e430ec3ced4be5",
+            "4c4926103a32ac15f7e430ec3ced4be5", "4c4926103a32ac15f7e430ec3ced4be5", "4c4926103a32ac15f7e430ec3ced4be5",
+            "eb9b60c78b30d2b6541ed0781944b6da", "1fe841b418ede51133878641e01544b5", "b156441e159a625ee00a0659dfb6e2f8",
+            "b156441e159a625ee00a0659dfb6e2f8", "fcf747bd356b48d442ff74adb8f3516b", "fcf747bd356b48d442ff74adb8f3516b",
+            "fcf747bd356b48d442ff74adb8f3516b", "11ef56c80c94347d2e3f921d5c36c8de", "11ef56c80c94347d2e3f921d5c36c8de",
+            "11ef56c80c94347d2e3f921d5c36c8de", "11ef56c80c94347d2e3f921d5c36c8de"
         };
 
         [Test]