diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index c3fb8d7f6..b64f230c9 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -8,6 +8,13 @@
     <e p="$APPLICATION_CONFIG_DIR$/scratches" t="IncludeRecursive" />
     <e p="$USER_HOME$/.config/git/ignore" t="IncludeRecursive" />
     <e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" />
+    <e p="$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.4.0/build/netcoreapp2.1" t="Include">
+      <e p="Microsoft.NET.Test.Sdk.Program.cs" t="Include" />
+    </e>
+    <e p="$USER_HOME$/.nuget/packages/nunit3testadapter/3.15.1/build/netcoreapp2.0/NUnit3.TestAdapter.dll" t="Include" />
+    <e p="$USER_HOME$/.nuget/packages/nunit3testadapter/3.15.1/build/netcoreapp2.0/NUnit3.TestAdapter.pdb" t="Include" />
+    <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" />
@@ -2024,6 +2031,181 @@
           </e>
         </e>
       </e>
+      <e p="Aaru.Tests" t="IncludeRecursive">
+        <e p="Aaru.Tests.csproj" t="IncludeRecursive" />
+        <e p="Checksums" t="Include">
+          <e p="Adler32.cs" t="Include" />
+          <e p="CRC16.cs" t="Include" />
+          <e p="CRC32.cs" t="Include" />
+          <e p="CRC64.cs" t="Include" />
+          <e p="MD5.cs" t="Include" />
+          <e p="SHA1.cs" t="Include" />
+          <e p="SHA256.cs" t="Include" />
+          <e p="SHA384.cs" t="Include" />
+          <e p="SHA512.cs" t="Include" />
+          <e p="SpamSum.cs" t="Include" />
+        </e>
+        <e p="Consts.cs" t="Include" />
+        <e p="Devices" t="Include">
+          <e p="IomegaJaz.cs" t="Include" />
+          <e p="LS120.cs" t="Include" />
+          <e p="PocketZip.cs" t="Include" />
+        </e>
+        <e p="Filesystems" t="Include">
+          <e p="ADFS.cs" t="Include" />
+          <e p="AFFS.cs" t="Include" />
+          <e p="AFFS2.cs" t="Include" />
+          <e p="AFS.cs" t="Include" />
+          <e p="AOFS.cs" t="Include" />
+          <e p="Atheos.cs" t="Include" />
+          <e p="BeFS.cs" t="Include" />
+          <e p="COHERENT.cs" t="Include" />
+          <e p="DTFS.cs" t="Include" />
+          <e p="EAFS.cs" t="Include" />
+          <e p="F2FS.cs" t="Include" />
+          <e p="FAT12.cs" t="Include" />
+          <e p="FAT16.cs" t="Include" />
+          <e p="FAT32.cs" t="Include" />
+          <e p="FATX.cs" t="Include" />
+          <e p="HAMMER.cs" t="Include" />
+          <e p="HFS.cs" t="Include" />
+          <e p="HFSPlus.cs" t="Include" />
+          <e p="HFSX.cs" t="Include" />
+          <e p="HPFS.cs" t="Include" />
+          <e p="HPOFS.cs" t="Include" />
+          <e p="HTFS.cs" t="Include" />
+          <e p="ISO9660.cs" t="Include" />
+          <e p="JFS2.cs" t="Include" />
+          <e p="LFS.cs" t="Include" />
+          <e p="LisaFS.cs" t="Include" />
+          <e p="Locus.cs" t="Include" />
+          <e p="MFS.cs" t="Include" />
+          <e p="MINIX.cs" t="Include" />
+          <e p="NILFS2.cs" t="Include" />
+          <e p="NTFS.cs" t="Include" />
+          <e p="NWFS386.cs" t="Include" />
+          <e p="OCFS2.cs" t="Include" />
+          <e p="PFS3.cs" t="Include" />
+          <e p="ProDOS.cs" t="Include" />
+          <e p="QNX4.cs" t="Include" />
+          <e p="ReFS.cs" t="Include" />
+          <e p="Reiser3.cs" t="Include" />
+          <e p="Reiser4.cs" t="Include" />
+          <e p="SFS.cs" t="Include" />
+          <e p="SysV.cs" t="Include" />
+          <e p="UDF.cs" t="Include" />
+          <e p="UFS.cs" t="Include" />
+          <e p="UNIXBFS.cs" t="Include" />
+          <e p="XENIX.cs" t="Include" />
+          <e p="XFS.cs" t="Include" />
+          <e p="Xia.cs" t="Include" />
+          <e p="ZFS.cs" t="Include" />
+          <e p="btrfs.cs" t="Include" />
+          <e p="exFAT.cs" t="Include" />
+          <e p="ext2.cs" t="Include" />
+        </e>
+        <e p="Filters" t="Include">
+          <e p="AppleDoubleDave.cs" t="Include" />
+          <e p="AppleDoubleDos.cs" t="Include" />
+          <e p="AppleDoubleNetatalk.cs" t="Include" />
+          <e p="AppleDoubleOsX.cs" t="Include" />
+          <e p="AppleDoubleProDos.cs" t="Include" />
+          <e p="AppleDoubleUnAr.cs" t="Include" />
+          <e p="AppleDoubleUnix.cs" t="Include" />
+          <e p="AppleSingle.cs" t="Include" />
+          <e p="BZip2.cs" t="Include" />
+          <e p="GZip.cs" t="Include" />
+          <e p="LZip.cs" t="Include" />
+          <e p="MacBinary1.cs" t="Include" />
+          <e p="MacBinary2.cs" t="Include" />
+          <e p="MacBinary3.cs" t="Include" />
+          <e p="PCExchange.cs" t="Include" />
+          <e p="XZ.cs" t="Include" />
+        </e>
+        <e p="Images" t="Include">
+          <e p="2MG.cs" t="Include" />
+          <e p="Anex86.cs" t="Include" />
+          <e p="CisCopy.cs" t="Include" />
+          <e p="CopyQM.cs" t="Include" />
+          <e p="D88.cs" t="Include" />
+          <e p="DART.cs" t="Include" />
+          <e p="DiskCopy42.cs" t="Include" />
+        </e>
+        <e p="Partitions" t="Include">
+          <e p="Acorn.cs" t="Include" />
+          <e p="AppleMap.cs" t="Include" />
+          <e p="Atari.cs" t="Include" />
+          <e p="BSD.cs" t="Include" />
+          <e p="GPT.cs" t="Include" />
+          <e p="MBR.cs" t="Include" />
+          <e p="MINIX.cs" t="Include" />
+          <e p="PC98.cs" t="Include" />
+          <e p="RDB.cs" t="Include" />
+          <e p="SGI.cs" t="Include" />
+          <e p="Sun.cs" t="Include" />
+          <e p="VTOC.cs" t="Include" />
+          <e p="Xbox.cs" t="Include" />
+        </e>
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.1" t="Include">
+              <e p="Aaru.Tests.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
+      </e>
+      <e p="Aaru.Tests.Devices" t="IncludeRecursive">
+        <e p="ATA" t="Include">
+          <e p="Ata28.cs" t="Include" />
+          <e p="Ata48.cs" t="Include" />
+          <e p="AtaCHS.cs" t="Include" />
+          <e p="Atapi.cs" t="Include" />
+          <e p="Cfa.cs" t="Include" />
+          <e p="MCPT.cs" t="Include" />
+          <e p="Smart.cs" t="Include" />
+        </e>
+        <e p="ATA.cs" t="Include" />
+        <e p="Aaru.Tests.Devices.csproj" t="IncludeRecursive" />
+        <e p="Command.cs" t="Include" />
+        <e p="DecodeATARegisters.cs" t="Include" />
+        <e p="Device.cs" t="Include" />
+        <e p="Main.cs" t="Include" />
+        <e p="NVMe.cs" t="Include" />
+        <e p="SCSI" t="Include">
+          <e p="Adaptec.cs" t="Include" />
+          <e p="ArchiveCorp.cs" t="Include" />
+          <e p="Certance.cs" t="Include" />
+          <e p="Fujitsu.cs" t="Include" />
+          <e p="HL-DT-ST.cs" t="Include" />
+          <e p="HP.cs" t="Include" />
+          <e p="Kreon.cs" t="Include" />
+          <e p="MMC.cs" t="Include" />
+          <e p="NEC.cs" t="Include" />
+          <e p="Pioneer.cs" t="Include" />
+          <e p="Plasmon.cs" t="Include" />
+          <e p="Plextor.cs" t="Include" />
+          <e p="SBC.cs" t="Include" />
+          <e p="SMC.cs" t="Include" />
+          <e p="SPC.cs" t="Include" />
+          <e p="SSC.cs" t="Include" />
+          <e p="SyQuest.cs" t="Include" />
+        </e>
+        <e p="SCSI.cs" t="Include" />
+        <e p="SecureDigital" t="Include">
+          <e p="MultiMediaCard.cs" t="Include" />
+          <e p="SecureDigital.cs" t="Include" />
+        </e>
+        <e p="SecureDigital.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.1" t="Include">
+              <e p="Aaru.Tests.Devices.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
+      </e>
       <e p="Aaru.sln" t="IncludeFlat" />
       <e p="CICMMetadata/dotnet/cicm.cs" t="Include" />
       <e p="CONTRIBUTING.md" t="Include" />
diff --git a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru_Server.xml b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru_Server.xml
deleted file mode 100644
index f2e0a3c88..000000000
--- a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru_Server.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Aaru.Server" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="/usr/lib/mono/4.5/xsp4.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--address=127.0.0.1 --port=5000" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Aaru.Server" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <envs>
-      <env name="MONO_MANAGED_WATCHER" value="y" />
-    </envs>
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/Aaru.Server/Aaru.Server.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="Web" />
-    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.6.1" />
-    <browser url="http://127.0.0.1:5000/" start="true" />
-    <method v="2">
-      <option name="Build" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru_Tests.xml b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru_Tests.xml
deleted file mode 100644
index 5fc4fdcab..000000000
--- a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru_Tests.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Aaru.Tests" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Aaru.Tests/bin/Debug/net461/Aaru.Tests.exe" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Aaru.Tests" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/Aaru.Tests/Aaru.Tests.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETFramework,Version=v4.6.1" />
-    <method v="2">
-      <option name="Build" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/.idea.Aaru/riderModule.iml b/.idea/.idea.Aaru/riderModule.iml
index b236c21fd..211519d95 100644
--- a/.idea/.idea.Aaru/riderModule.iml
+++ b/.idea/.idea.Aaru/riderModule.iml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RIDER_MODULE" version="4">
   <component name="NewModuleRootManager">
+    <content url="file://$USER_HOME$/.nuget/packages/microsoft.net.test.sdk/16.4.0/build/netcoreapp2.1" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.15.1/build/netcoreapp2.0/NUnit3.TestAdapter.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.15.1/build/netcoreapp2.0/NUnit3.TestAdapter.pdb" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.15.1/build/netcoreapp2.0/nunit.engine.api.dll" />
+    <content url="file://$USER_HOME$/.nuget/packages/nunit3testadapter/3.15.1/build/netcoreapp2.0/nunit.engine.dll" />
     <content url="file://$MODULE_DIR$/../.." />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="R User Library" level="project" />
diff --git a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
index 58c32cf54..0fd2b0764 100644
--- a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
+++ b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
@@ -9,7 +9,7 @@
     <AssemblyName>Aaru.Tests.Devices</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>4.5.99.1693</Version>
     <Company>Claunia.com</Company>
@@ -17,6 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Tests.Devices</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
diff --git a/Aaru.Tests.sln b/Aaru.Tests.sln
deleted file mode 100644
index 49b65f883..000000000
--- a/Aaru.Tests.sln
+++ /dev/null
@@ -1,241 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29102.190
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Checksums", "Aaru.Checksums\Aaru.Checksums.csproj", "{CC48B324-A532-4A45-87A6-6F91F7141E8D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Helpers", "Aaru.Helpers\Aaru.Helpers.csproj", "{F8BDF57B-1571-4CD0-84B3-B422088D359A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Images", "Aaru.Images\Aaru.Images.csproj", "{74032CBC-339B-42F3-AF6F-E96C261F3E6A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.CommonTypes", "Aaru.CommonTypes\Aaru.CommonTypes.csproj", "{F2B84194-26EB-4227-B1C5-6602517E85AE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Partitions", "Aaru.Partitions\Aaru.Partitions.csproj", "{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Filesystems", "Aaru.Filesystems\Aaru.Filesystems.csproj", "{D7016DF2-5A5E-4524-B40D-BA2D59576688}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Decoders", "Aaru.Decoders\Aaru.Decoders.csproj", "{0BEB3088-B634-4289-AE17-CDF2D25D00D5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Devices", "Aaru.Devices\Aaru.Devices.csproj", "{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Console", "Aaru.Console\Aaru.Console.csproj", "{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Settings", "Aaru.Settings\Aaru.Settings.csproj", "{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Filters", "Aaru.Filters\Aaru.Filters.csproj", "{D571B8EF-903D-4353-BDD5-B834F9F029EF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Core", "Aaru.Core\Aaru.Core.csproj", "{679659B8-25D0-4279-B632-56EF8F94ADC0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Tests", "Aaru.Tests\Aaru.Tests.csproj", "{B2ABC1F2-C365-4515-9F23-A5725050CC48}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Tests.Devices", "Aaru.Tests.Devices\Aaru.Tests.Devices.csproj", "{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Compression", "Aaru.Compression\Aaru.Compression.csproj", "{858398D1-7321-4763-8BAB-56BBFEC74E29}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Database", "Aaru.Database\Aaru.Database.csproj", "{FA0749B5-EFE0-4148-9545-CD420B45BC36}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Gui", "Aaru.Gui\Aaru.Gui.csproj", "{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.EntityFramework", "Aaru.EntityFramework\Aaru.EntityFramework.csproj", "{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Dto", "Aaru.Dto\Aaru.Dto.csproj", "{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|x86.Build.0 = Debug|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|x86.ActiveCfg = Release|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|x86.Build.0 = Release|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Debug|x86.Build.0 = Debug|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|x86.ActiveCfg = Release|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|x86.Build.0 = Release|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Debug|x86.Build.0 = Debug|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Release|x86.ActiveCfg = Release|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Release|x86.Build.0 = Release|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Debug|x86.Build.0 = Debug|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Release|x86.ActiveCfg = Release|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Release|x86.Build.0 = Release|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Debug|x86.Build.0 = Debug|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Release|x86.ActiveCfg = Release|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Release|x86.Build.0 = Release|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Debug|x86.Build.0 = Debug|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Release|x86.ActiveCfg = Release|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Release|x86.Build.0 = Release|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Debug|x86.Build.0 = Debug|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Release|x86.ActiveCfg = Release|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Release|x86.Build.0 = Release|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Debug|x86.Build.0 = Debug|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Release|x86.ActiveCfg = Release|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Release|x86.Build.0 = Release|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|x86.Build.0 = Debug|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|x86.ActiveCfg = Release|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|x86.Build.0 = Release|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Debug|x86.Build.0 = Debug|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Release|x86.ActiveCfg = Release|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Release|x86.Build.0 = Release|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Debug|x86.Build.0 = Debug|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Release|x86.ActiveCfg = Release|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Release|x86.Build.0 = Release|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Debug|x86.Build.0 = Debug|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|x86.ActiveCfg = Release|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|x86.Build.0 = Release|Any CPU
-		{B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B2ABC1F2-C365-4515-9F23-A5725050CC48}.Debug|x86.Build.0 = Debug|Any CPU
-		{B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|x86.ActiveCfg = Release|Any CPU
-		{B2ABC1F2-C365-4515-9F23-A5725050CC48}.Release|x86.Build.0 = Release|Any CPU
-		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|x86.Build.0 = Debug|Any CPU
-		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.ActiveCfg = Release|Any CPU
-		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.Build.0 = Release|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|x86.Build.0 = Debug|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Release|x86.ActiveCfg = Release|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Release|x86.Build.0 = Release|Any CPU
-		{FA0749B5-EFE0-4148-9545-CD420B45BC36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA0749B5-EFE0-4148-9545-CD420B45BC36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA0749B5-EFE0-4148-9545-CD420B45BC36}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FA0749B5-EFE0-4148-9545-CD420B45BC36}.Debug|x86.Build.0 = Debug|Any CPU
-		{FA0749B5-EFE0-4148-9545-CD420B45BC36}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA0749B5-EFE0-4148-9545-CD420B45BC36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA0749B5-EFE0-4148-9545-CD420B45BC36}.Release|x86.ActiveCfg = Release|Any CPU
-		{FA0749B5-EFE0-4148-9545-CD420B45BC36}.Release|x86.Build.0 = Release|Any CPU
-		{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Debug|x86.Build.0 = Debug|Any CPU
-		{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Release|x86.ActiveCfg = Release|Any CPU
-		{CF61AD81-3F98-4E7B-8F00-9957A6CDE5FA}.Release|x86.Build.0 = Release|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Debug|x86.Build.0 = Debug|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|x86.ActiveCfg = Release|Any CPU
-		{F73EE2BD-6009-4590-9F5A-68198CA5C0DA}.Release|x86.Build.0 = Release|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|x86.Build.0 = Debug|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|x86.ActiveCfg = Release|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A004EA3D-916D-495A-A130-D4E4F0A168C8}
-	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		Policies = $0
-		$0.StandardHeader = $1
-		$1.Text = @/***************************************************************************\nThe Disc Image Chef\n----------------------------------------------------------------------------\n \nFilename       : ${FileName}\nVersion        : 1.0\nAuthor(s)      : ${AuthorName}\n \nComponent      : Component\n\nRevision       : $Revision$\nLast change by : $Author$\nDate           : $Date$\n \n--[ Description ] ----------------------------------------------------------\n \nDescription\n \n--[ License ] --------------------------------------------------------------\n \n    This program is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as\n    published by the Free Software Foundation, either version 3 of the\n    License, or (at your option) any later version.\n\n    This program is distributed in the hope that it will be useful,\n    but WITHOUT ANY WARRANTY; without even the implied warranty of\n    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n    GNU General Public License for more details.\n\n    You should have received a copy of the GNU General Public License\n    along with this program.  If not, see <http://www.gnu.org/licenses/>.\n\n----------------------------------------------------------------------------\nCopyright (C) 2011-2015 Claunia.com\n****************************************************************************/\n//$Id$
-		$0.TextStylePolicy = $2
-		$2.scope = text/x-csharp
-		$2.TabsToSpaces = True
-		$0.CSharpFormattingPolicy = $3
-		$3.scope = text/x-csharp
-		$3.IndentBraces = True
-		$3.IndentBlock = False
-		$3.IndentSwitchCaseSection = False
-		$0.DotNetNamingPolicy = $4
-		$4.DirectoryNamespaceAssociation = Hierarchical
-		$4.ResourceNamePolicy = MSBuild
-		$0.XmlFormattingPolicy = $5
-		$5.DefaultFormat = $6
-		$6.AlignAttributes = True
-		$5.inheritsSet = null
-		$5.inheritsScope = application/xml
-		$5.scope = application/config+xml
-		$0.NameConventionPolicy = $7
-		$7.Rules = $8
-		$8.NamingRule = $28
-		description = The Disc Image Chef.
-		version = 4.0.99.0
-	EndGlobalSection
-EndGlobal
diff --git a/Aaru.Tests/Aaru.Tests.csproj b/Aaru.Tests/Aaru.Tests.csproj
index 8e3b30aed..639d85757 100644
--- a/Aaru.Tests/Aaru.Tests.csproj
+++ b/Aaru.Tests/Aaru.Tests.csproj
@@ -1,224 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B2ABC1F2-C365-4515-9F23-A5725050CC48}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Aaru.Tests</RootNamespace>
-    <AssemblyName>Aaru.Tests</AssemblyName>
-    <ReleaseVersion>$(Version)</ReleaseVersion>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFramework>net461</TargetFramework>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>4.5.99.1693</Version>
-    <Company>Claunia.com</Company>
-    <Copyright>Copyright © 2011-2019 Natalia Portillo</Copyright>
-    <Product>Aaru Data Preservation Suite</Product>
-    <Title>Aaru.Tests</Title>
-    <ApplicationVersion>$(Version)</ApplicationVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
-    <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
-    <NrtShowRevision>true</NrtShowRevision>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Consts.cs" />
-    <Compile Include="Checksums\CRC16.cs" />
-    <Compile Include="Checksums\SHA384.cs" />
-    <Compile Include="Checksums\SHA256.cs" />
-    <Compile Include="Checksums\CRC32.cs" />
-    <Compile Include="Checksums\CRC64.cs" />
-    <Compile Include="Checksums\MD5.cs" />
-    <Compile Include="Checksums\SHA1.cs" />
-    <Compile Include="Checksums\SpamSum.cs" />
-    <Compile Include="Checksums\SHA512.cs" />
-    <Compile Include="Checksums\Adler32.cs" />
-    <Compile Include="Filesystems\FATX.cs" />
-    <Compile Include="Filesystems\HPOFS.cs" />
-    <Compile Include="Filesystems\Xia.cs" />
-    <Compile Include="Filters\GZip.cs" />
-    <Compile Include="Filters\XZ.cs" />
-    <Compile Include="Filters\LZip.cs" />
-    <Compile Include="Filters\BZip2.cs" />
-    <Compile Include="Filters\PCExchange.cs" />
-    <Compile Include="Filters\AppleDoubleOsX.cs" />
-    <Compile Include="Filters\AppleDoubleUnix.cs" />
-    <Compile Include="Filters\AppleDoubleProDos.cs" />
-    <Compile Include="Filters\AppleDoubleDave.cs" />
-    <Compile Include="Filters\AppleDoubleNetatalk.cs" />
-    <Compile Include="Filters\AppleDoubleDos.cs" />
-    <Compile Include="Filters\AppleDoubleUnAr.cs" />
-    <Compile Include="Filters\AppleSingle.cs" />
-    <Compile Include="Filters\MacBinary1.cs" />
-    <Compile Include="Filters\MacBinary3.cs" />
-    <Compile Include="Filters\MacBinary2.cs" />
-    <Compile Include="Filesystems\ADFS.cs" />
-    <Compile Include="Filesystems\FAT12.cs" />
-    <Compile Include="Filesystems\HPFS.cs" />
-    <Compile Include="Filesystems\BeFS.cs" />
-    <Compile Include="Filesystems\FAT32.cs" />
-    <Compile Include="Filesystems\PFS3.cs" />
-    <Compile Include="Filesystems\HFSPlus.cs" />
-    <Compile Include="Filesystems\HFSX.cs" />
-    <Compile Include="Filesystems\LisaFS.cs" />
-    <Compile Include="Filesystems\Locus.cs" />
-    <Compile Include="Filesystems\ReFS.cs" />
-    <Compile Include="Filesystems\UDF.cs" />
-    <Compile Include="Filesystems\btrfs.cs" />
-    <Compile Include="Filesystems\exFAT.cs" />
-    <Compile Include="Filesystems\ext2.cs" />
-    <Compile Include="Filesystems\F2FS.cs" />
-    <Compile Include="Filesystems\JFS2.cs" />
-    <Compile Include="Filesystems\NILFS2.cs" />
-    <Compile Include="Filesystems\Reiser3.cs" />
-    <Compile Include="Filesystems\Reiser4.cs" />
-    <Compile Include="Filesystems\UNIXBFS.cs" />
-    <Compile Include="Filesystems\AFFS.cs" />
-    <Compile Include="Filesystems\AFFS2.cs" />
-    <Compile Include="Filesystems\AOFS.cs" />
-    <Compile Include="Filesystems\HAMMER.cs" />
-    <Compile Include="Filesystems\HFS.cs" />
-    <Compile Include="Filesystems\LFS.cs" />
-    <Compile Include="Filesystems\MFS.cs" />
-    <Compile Include="Filesystems\NTFS.cs" />
-    <Compile Include="Filesystems\NWFS386.cs" />
-    <Compile Include="Filesystems\OCFS2.cs" />
-    <Compile Include="Filesystems\ProDOS.cs" />
-    <Compile Include="Filesystems\SysV.cs" />
-    <Compile Include="Filesystems\SFS.cs" />
-    <Compile Include="Filesystems\UFS.cs" />
-    <Compile Include="Filesystems\ZFS.cs" />
-    <Compile Include="Devices\IomegaJaz.cs" />
-    <Compile Include="Devices\LS120.cs" />
-    <Compile Include="Devices\PocketZip.cs" />
-    <Compile Include="Filesystems\Atheos.cs" />
-    <Compile Include="Filesystems\FAT16.cs" />
-    <Compile Include="Filesystems\MINIX.cs" />
-    <Compile Include="Filesystems\QNX4.cs" />
-    <Compile Include="Filesystems\XFS.cs" />
-    <Compile Include="Partitions\AppleMap.cs" />
-    <Compile Include="Partitions\Atari.cs" />
-    <Compile Include="Partitions\BSD.cs" />
-    <Compile Include="Partitions\GPT.cs" />
-    <Compile Include="Partitions\Acorn.cs" />
-    <Compile Include="Partitions\MBR.cs" />
-    <Compile Include="Partitions\MINIX.cs" />
-    <Compile Include="Partitions\PC98.cs" />
-    <Compile Include="Partitions\RDB.cs" />
-    <Compile Include="Partitions\SGI.cs" />
-    <Compile Include="Partitions\Sun.cs" />
-    <Compile Include="Partitions\VTOC.cs" />
-    <Compile Include="Filesystems\XENIX.cs" />
-    <Compile Include="Filesystems\COHERENT.cs" />
-    <Compile Include="Filesystems\HTFS.cs" />
-    <Compile Include="Filesystems\DTFS.cs" />
-    <Compile Include="Filesystems\AFS.cs" />
-    <Compile Include="Filesystems\EAFS.cs" />
-    <Compile Include="Filesystems\ISO9660.cs" />
-    <Compile Include="Images\2MG.cs" />
-    <Compile Include="Images\Anex86.cs" />
-    <Compile Include="Images\CisCopy.cs" />
-    <Compile Include="Images\CopyQM.cs" />
-    <Compile Include="Images\D88.cs" />
-    <Compile Include="Images\DART.cs" />
-    <Compile Include="Images\DiskCopy42.cs" />
-    <Compile Include="Partitions\Xbox.cs" />
-    <Compile Include="Program.cs" />
+    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj" />
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
+    <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj" />
+    <ProjectReference Include="..\Aaru.Filesystems\Aaru.Filesystems.csproj" />
+    <ProjectReference Include="..\Aaru.Filters\Aaru.Filters.csproj" />
+    <ProjectReference Include="..\Aaru.Images\Aaru.Images.csproj" />
   </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj">
-      <Project>{CC48B324-A532-4A45-87A6-6F91F7141E8D}</Project>
-      <Name>Aaru.Checksums</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Aaru.Filters\Aaru.Filters.csproj">
-      <Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
-      <Name>Aaru.Filters</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Aaru.Images\Aaru.Images.csproj">
-      <Project>{74032CBC-339B-42F3-AF6F-E96C261F3E6A}</Project>
-      <Name>Aaru.DiscImages</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Aaru.Filesystems\Aaru.Filesystems.csproj">
-      <Project>{D7016DF2-5A5E-4524-B40D-BA2D59576688}</Project>
-      <Name>Aaru.Filesystems</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj">
-      <Project>{F2B84194-26EB-4227-B1C5-6602517E85AE}</Project>
-      <Name>Aaru.CommonTypes</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Aaru.Partitions\Aaru.Partitions.csproj">
-      <Project>{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}</Project>
-      <Name>Aaru.Partitions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj">
-      <Project>{679659B8-25D0-4279-B632-56EF8F94ADC0}</Project>
-      <Name>Aaru.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Images\" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NUnitLite" Version="3.12.0" />
-    <PackageReference Include="SharpCompress" Version="0.24.0" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
-  </ItemGroup>
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <Policies>
-          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" />
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
-          <DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedHierarchical" ResourceNamePolicy="MSBuild" />
-        </Policies>
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
-    <PropertyGroup Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">
-        <!-- When compiling .NET SDK 2.0 projects targeting .NET 4.x on Mono using 'dotnet build' you -->
-        <!-- have to teach MSBuild where the Mono copy of the reference asssemblies is -->
-        <!-- Look in the standard install locations -->
-        <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND EXISTS('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono</BaseFrameworkPathOverrideForMono>
-        <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND EXISTS('/usr/lib/mono')">/usr/lib/mono</BaseFrameworkPathOverrideForMono>
-        <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND EXISTS('/usr/local/lib/mono')">/usr/local/lib/mono</BaseFrameworkPathOverrideForMono>
-        <!-- If we found Mono reference assemblies, then use them -->
-        <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net40'">$(BaseFrameworkPathOverrideForMono)/4.0-api</FrameworkPathOverride>
-        <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net45'">$(BaseFrameworkPathOverrideForMono)/4.5-api</FrameworkPathOverride>
-        <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net451'">$(BaseFrameworkPathOverrideForMono)/4.5.1-api</FrameworkPathOverride>
-        <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net452'">$(BaseFrameworkPathOverrideForMono)/4.5.2-api</FrameworkPathOverride>
-        <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net46'">$(BaseFrameworkPathOverrideForMono)/4.6-api</FrameworkPathOverride>
-        <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net461'">$(BaseFrameworkPathOverrideForMono)/4.6.1-api</FrameworkPathOverride>
-        <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net462'">$(BaseFrameworkPathOverrideForMono)/4.6.2-api</FrameworkPathOverride>
-        <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net47'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride>
-        <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net471'">$(BaseFrameworkPathOverrideForMono)/4.7.1-api</FrameworkPathOverride>
-        <EnableFrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">true</EnableFrameworkPathOverride>
-        <!-- Add the Facades directory.  Not sure how else to do this. Necessary at least for .NET 4.5 -->
-        <AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
-    </PropertyGroup>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/Aaru.Tests/Program.cs b/Aaru.Tests/Program.cs
deleted file mode 100644
index 2da2461e0..000000000
--- a/Aaru.Tests/Program.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// ***********************************************************************
-// Copyright (c) 2015 Charlie Poole, Rob Prouse
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-// ***********************************************************************
-
-namespace NUnitLite.Tests
-{
-    public static class Program
-    {
-        /// <summary>
-        ///     The main program executes the tests. Output may be routed to various locations, depending on the arguments
-        ///     passed.
-        /// </summary>
-        /// <remarks>Run with --help for a full list of arguments supported</remarks>
-        /// <param name="args"></param>
-        public static int Main(string[] args) => new AutoRun().Execute(args);
-    }
-}
\ No newline at end of file
diff --git a/Aaru.sln b/Aaru.sln
index e000e6e4d..91c94f341 100644
--- a/Aaru.sln
+++ b/Aaru.sln
@@ -40,6 +40,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs.Flake", "cu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs", "cuetools.net\CUETools.Codecs\CUETools.Codecs.csproj", "{D1F69B02-A6A4-4EF2-A916-815BACC18F71}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Tests", "Aaru.Tests\Aaru.Tests.csproj", "{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aaru.Tests.Devices", "Aaru.Tests.Devices\Aaru.Tests.Devices.csproj", "{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -200,6 +204,22 @@ Global
 		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Release|x86.ActiveCfg = Release|Any CPU
 		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Release|x86.Build.0 = Release|Any CPU
+		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Debug|x86.Build.0 = Debug|Any CPU
+		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Release|x86.Build.0 = Release|Any CPU
+		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Debug|x86.Build.0 = Debug|Any CPU
+		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE