diff --git a/Aaru.Tests/Checksums/Adler32.cs b/Aaru.Tests/Checksums/Adler32.cs
index b71deafb7..c372efcbc 100644
--- a/Aaru.Tests/Checksums/Adler32.cs
+++ b/Aaru.Tests/Checksums/Adler32.cs
@@ -51,7 +51,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -64,7 +64,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void EmptyFile()
         {
-            byte[] result = Adler32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+            byte[] result = Adler32Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
             result.Should().BeEquivalentTo(_expectedEmpty);
         }
 
@@ -73,7 +73,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -90,7 +90,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -103,7 +103,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void RandomFile()
         {
-            byte[] result = Adler32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+            byte[] result = Adler32Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
             result.Should().BeEquivalentTo(_expectedRandom);
         }
 
@@ -112,7 +112,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
diff --git a/Aaru.Tests/Checksums/CRC16CCITT.cs b/Aaru.Tests/Checksums/CRC16CCITT.cs
index ef467bc82..d6024d3b9 100644
--- a/Aaru.Tests/Checksums/CRC16CCITT.cs
+++ b/Aaru.Tests/Checksums/CRC16CCITT.cs
@@ -50,7 +50,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -64,7 +64,7 @@ namespace Aaru.Tests.Checksums
         public void EmptyFile()
         {
             byte[] result =
-                CRC16CCITTContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+                CRC16CCITTContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
 
             result.Should().BeEquivalentTo(_expectedEmpty);
         }
@@ -74,7 +74,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -91,7 +91,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -105,7 +105,7 @@ namespace Aaru.Tests.Checksums
         public void RandomFile()
         {
             byte[] result =
-                CRC16CCITTContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+                CRC16CCITTContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
 
             result.Should().BeEquivalentTo(_expectedRandom);
         }
@@ -115,7 +115,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
diff --git a/Aaru.Tests/Checksums/CRC16IBM.cs b/Aaru.Tests/Checksums/CRC16IBM.cs
index c7a2c359c..f2b62b5cf 100644
--- a/Aaru.Tests/Checksums/CRC16IBM.cs
+++ b/Aaru.Tests/Checksums/CRC16IBM.cs
@@ -51,7 +51,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -64,7 +64,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void EmptyFile()
         {
-            byte[] result = CRC16IBMContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+            byte[] result = CRC16IBMContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
 
             result.Should().BeEquivalentTo(_expectedEmpty);
         }
@@ -74,7 +74,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -91,7 +91,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -104,7 +104,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void RandomFile()
         {
-            byte[] result = CRC16IBMContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+            byte[] result = CRC16IBMContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
 
             result.Should().BeEquivalentTo(_expectedRandom);
         }
@@ -114,7 +114,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
diff --git a/Aaru.Tests/Checksums/CRC32.cs b/Aaru.Tests/Checksums/CRC32.cs
index 7ff567f83..0e4a60092 100644
--- a/Aaru.Tests/Checksums/CRC32.cs
+++ b/Aaru.Tests/Checksums/CRC32.cs
@@ -51,7 +51,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -64,7 +64,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void EmptyFile()
         {
-            byte[] result = Crc32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+            byte[] result = Crc32Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
             result.Should().BeEquivalentTo(_expectedEmpty);
         }
 
@@ -73,7 +73,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -90,7 +90,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -103,7 +103,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void RandomFile()
         {
-            byte[] result = Crc32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+            byte[] result = Crc32Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
             result.Should().BeEquivalentTo(_expectedRandom);
         }
 
@@ -112,7 +112,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
diff --git a/Aaru.Tests/Checksums/CRC64.cs b/Aaru.Tests/Checksums/CRC64.cs
index 27a50d522..f061852e0 100644
--- a/Aaru.Tests/Checksums/CRC64.cs
+++ b/Aaru.Tests/Checksums/CRC64.cs
@@ -51,7 +51,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -64,7 +64,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void EmptyFile()
         {
-            byte[] result = Crc64Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+            byte[] result = Crc64Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
             result.Should().BeEquivalentTo(_expectedEmpty);
         }
 
@@ -73,7 +73,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -90,7 +90,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -103,7 +103,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void RandomFile()
         {
-            byte[] result = Crc64Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+            byte[] result = Crc64Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
             result.Should().BeEquivalentTo(_expectedRandom);
         }
 
@@ -112,7 +112,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
diff --git a/Aaru.Tests/Checksums/MD5.cs b/Aaru.Tests/Checksums/MD5.cs
index ffd315c1e..490f497db 100644
--- a/Aaru.Tests/Checksums/MD5.cs
+++ b/Aaru.Tests/Checksums/MD5.cs
@@ -51,7 +51,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -64,7 +64,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void EmptyFile()
         {
-            byte[] result = Md5Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+            byte[] result = Md5Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
             result.Should().BeEquivalentTo(_expectedEmpty);
         }
 
@@ -73,7 +73,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -90,7 +90,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -103,7 +103,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void RandomFile()
         {
-            byte[] result = Md5Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+            byte[] result = Md5Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
             result.Should().BeEquivalentTo(_expectedRandom);
         }
 
@@ -112,7 +112,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
diff --git a/Aaru.Tests/Checksums/SHA1.cs b/Aaru.Tests/Checksums/SHA1.cs
index 478079f2b..df42e7c1b 100644
--- a/Aaru.Tests/Checksums/SHA1.cs
+++ b/Aaru.Tests/Checksums/SHA1.cs
@@ -53,7 +53,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -66,7 +66,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void EmptyFile()
         {
-            byte[] result = Sha1Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+            byte[] result = Sha1Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
             result.Should().BeEquivalentTo(_expectedEmpty);
         }
 
@@ -75,7 +75,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -92,7 +92,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -105,7 +105,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void RandomFile()
         {
-            byte[] result = Sha1Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+            byte[] result = Sha1Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
             result.Should().BeEquivalentTo(_expectedRandom);
         }
 
@@ -114,7 +114,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
diff --git a/Aaru.Tests/Checksums/SHA256.cs b/Aaru.Tests/Checksums/SHA256.cs
index 37f476d6d..76c25d94a 100644
--- a/Aaru.Tests/Checksums/SHA256.cs
+++ b/Aaru.Tests/Checksums/SHA256.cs
@@ -53,7 +53,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -66,7 +66,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void EmptyFile()
         {
-            byte[] result = Sha256Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+            byte[] result = Sha256Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
             result.Should().BeEquivalentTo(_expectedEmpty);
         }
 
@@ -75,7 +75,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -92,7 +92,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -105,7 +105,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void RandomFile()
         {
-            byte[] result = Sha256Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+            byte[] result = Sha256Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
             result.Should().BeEquivalentTo(_expectedRandom);
         }
 
@@ -114,7 +114,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
diff --git a/Aaru.Tests/Checksums/SHA384.cs b/Aaru.Tests/Checksums/SHA384.cs
index 9f82462cc..0c851aa19 100644
--- a/Aaru.Tests/Checksums/SHA384.cs
+++ b/Aaru.Tests/Checksums/SHA384.cs
@@ -55,7 +55,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -68,7 +68,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void EmptyFile()
         {
-            byte[] result = Sha384Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+            byte[] result = Sha384Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
             result.Should().BeEquivalentTo(_expectedEmpty);
         }
 
@@ -77,7 +77,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -94,7 +94,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -107,7 +107,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void RandomFile()
         {
-            byte[] result = Sha384Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+            byte[] result = Sha384Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
             result.Should().BeEquivalentTo(_expectedRandom);
         }
 
@@ -116,7 +116,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
diff --git a/Aaru.Tests/Checksums/SHA512.cs b/Aaru.Tests/Checksums/SHA512.cs
index 03a07ed57..d913365d8 100644
--- a/Aaru.Tests/Checksums/SHA512.cs
+++ b/Aaru.Tests/Checksums/SHA512.cs
@@ -57,7 +57,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -70,7 +70,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void EmptyFile()
         {
-            byte[] result = Sha512Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+            byte[] result = Sha512Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
             result.Should().BeEquivalentTo(_expectedEmpty);
         }
 
@@ -79,7 +79,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -96,7 +96,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -109,7 +109,7 @@ namespace Aaru.Tests.Checksums
         [Test]
         public void RandomFile()
         {
-            byte[] result = Sha512Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+            byte[] result = Sha512Context.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
             Assert.AreEqual(_expectedRandom, result);
         }
 
@@ -118,7 +118,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
diff --git a/Aaru.Tests/Checksums/SpamSum.cs b/Aaru.Tests/Checksums/SpamSum.cs
index 5b38e50db..3c32d3471 100644
--- a/Aaru.Tests/Checksums/SpamSum.cs
+++ b/Aaru.Tests/Checksums/SpamSum.cs
@@ -44,7 +44,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -59,7 +59,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"), FileMode.Open,
                                     FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -76,7 +76,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
@@ -91,7 +91,7 @@ namespace Aaru.Tests.Checksums
         {
             byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+            var fs = new FileStream(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"),
                                     FileMode.Open, FileAccess.Read);
 
             fs.Read(data, 0, 1048576);
diff --git a/Aaru.Tests/Consts.cs b/Aaru.Tests/Consts.cs
index 05bfe6d02..89d32c7e5 100644
--- a/Aaru.Tests/Consts.cs
+++ b/Aaru.Tests/Consts.cs
@@ -26,10 +26,13 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
+using System;
+using System.Runtime.InteropServices;
+
 namespace Aaru.Tests
 {
     internal static class Consts
     {
-        public const string TEST_FILES_ROOT = "/mnt/DiscImageChef";
+        public static string TestFilesRoot = RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "/Volumes/AaruTests" : "/mnt/AaruTests";
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Devices/IomegaJaz.cs b/Aaru.Tests/Devices/IomegaJaz.cs
index de0f0c566..bab269c4f 100644
--- a/Aaru.Tests/Devices/IomegaJaz.cs
+++ b/Aaru.Tests/Devices/IomegaJaz.cs
@@ -59,7 +59,7 @@ namespace Aaru.Tests.Devices
             512
         };
 
-        readonly string _dataFolder = Path.Combine(Consts.TEST_FILES_ROOT, "Device test dumps", "JAZ");
+        readonly string _dataFolder = Path.Combine(Consts.TestFilesRoot, "Device test dumps", "JAZ");
 
         [Test]
         public void Info()
diff --git a/Aaru.Tests/Devices/LS120.cs b/Aaru.Tests/Devices/LS120.cs
index 2576885cb..f49db6c18 100644
--- a/Aaru.Tests/Devices/LS120.cs
+++ b/Aaru.Tests/Devices/LS120.cs
@@ -59,7 +59,7 @@ namespace Aaru.Tests.Devices
             512, 512, 512
         };
 
-        readonly string _dataFolder = Path.Combine(Consts.TEST_FILES_ROOT, "Device test dumps", "LS-120");
+        readonly string _dataFolder = Path.Combine(Consts.TestFilesRoot, "Device test dumps", "LS-120");
 
         [Test]
         public void Info()
diff --git a/Aaru.Tests/Devices/PocketZip.cs b/Aaru.Tests/Devices/PocketZip.cs
index c6f37b8f0..fbf229c4a 100644
--- a/Aaru.Tests/Devices/PocketZip.cs
+++ b/Aaru.Tests/Devices/PocketZip.cs
@@ -59,7 +59,7 @@ namespace Aaru.Tests.Devices
             512, 512
         };
 
-        readonly string _dataFolder = Path.Combine(Consts.TEST_FILES_ROOT, "Device test dumps", "PocketZIP");
+        readonly string _dataFolder = Path.Combine(Consts.TestFilesRoot, "Device test dumps", "PocketZIP");
 
         [Test]
         public void Info()
diff --git a/Aaru.Tests/Filesystems/ADFS.cs b/Aaru.Tests/Filesystems/ADFS.cs
index 30b83abff..b257067c7 100644
--- a/Aaru.Tests/Filesystems/ADFS.cs
+++ b/Aaru.Tests/Filesystems/ADFS.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Adfs() : base("Acorn Advanced Disc Filing System") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems",
                                                           "Acorn Advanced Disc Filing System");
 
         public override IFilesystem Plugin     => new AcornADFS();
diff --git a/Aaru.Tests/Filesystems/AFFS/APM.cs b/Aaru.Tests/Filesystems/AFFS/APM.cs
index f6a713fcf..18d7a2c3c 100644
--- a/Aaru.Tests/Filesystems/AFFS/APM.cs
+++ b/Aaru.Tests/Filesystems/AFFS/APM.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AFFS
         public APM() : base("Amiga FFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (APM)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System (APM)");
         public override IFilesystem Plugin     => new AmigaDOSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs
index e593c8721..d87ae9a64 100644
--- a/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs
+++ b/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AFFS
         public MBR_RDB() : base("Amiga FFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (MBR+RDB)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System (MBR+RDB)");
         public override IFilesystem Plugin     => new AmigaDOSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/AFFS/MBR.cs b/Aaru.Tests/Filesystems/AFFS/MBR.cs
index 175871bab..f8eec39cf 100644
--- a/Aaru.Tests/Filesystems/AFFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/AFFS/MBR.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AFFS
         public MBR() : base("Amiga FFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System (MBR)");
         public override IFilesystem Plugin     => new AmigaDOSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/AFFS/RDB.cs b/Aaru.Tests/Filesystems/AFFS/RDB.cs
index 21affae56..e183cf3e3 100644
--- a/Aaru.Tests/Filesystems/AFFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/AFFS/RDB.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AFFS
         public RDB() : base("Amiga FFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (RDB)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System (RDB)");
         public override IFilesystem Plugin     => new AmigaDOSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/AFFS/Whole.cs b/Aaru.Tests/Filesystems/AFFS/Whole.cs
index 30bd59220..ba62302e8 100644
--- a/Aaru.Tests/Filesystems/AFFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/AFFS/Whole.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AFFS
         public Whole() : base("Amiga FFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System");
 
         public override IFilesystem Plugin     => new AmigaDOSPlugin();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/AFFS2/APM.cs b/Aaru.Tests/Filesystems/AFFS2/APM.cs
index ac497c4d8..13b6266d3 100644
--- a/Aaru.Tests/Filesystems/AFFS2/APM.cs
+++ b/Aaru.Tests/Filesystems/AFFS2/APM.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AFFS2
         public APM() : base("Amiga FFS2") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System 2 (APM)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System 2 (APM)");
 
         public override IFilesystem Plugin     => new AmigaDOSPlugin();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/AFFS2/RDB.cs b/Aaru.Tests/Filesystems/AFFS2/RDB.cs
index 0d6776339..3af393b42 100644
--- a/Aaru.Tests/Filesystems/AFFS2/RDB.cs
+++ b/Aaru.Tests/Filesystems/AFFS2/RDB.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AFFS2
         public RDB() : base("Amiga FFS2") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System 2 (RDB)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Fast File System 2 (RDB)");
 
         public override IFilesystem Plugin     => new AmigaDOSPlugin();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/AFS/MBR.cs b/Aaru.Tests/Filesystems/AFS/MBR.cs
index 4f03e371d..f05dfe1a2 100644
--- a/Aaru.Tests/Filesystems/AFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/AFS/MBR.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AFS
         public MBR() : base("Acer Fast Filesystem") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Acer File System (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Acer File System (MBR)");
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/AFS/Whole.cs b/Aaru.Tests/Filesystems/AFS/Whole.cs
index 551bcfb49..c4eca7cdf 100644
--- a/Aaru.Tests/Filesystems/AFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/AFS/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.AFS
     {
         public Whole() : base("Acer Fast Filesystem") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Acer File System");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Acer File System");
 
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs
index 7868bc3ee..d32d3d9ae 100644
--- a/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs
+++ b/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AOFS
         public MBR_RDB() : base("Amiga OFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System (MBR+RDB)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Old File System (MBR+RDB)");
         public override IFilesystem Plugin     => new AmigaDOSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/AOFS/MBR.cs b/Aaru.Tests/Filesystems/AOFS/MBR.cs
index 392b12002..d887da177 100644
--- a/Aaru.Tests/Filesystems/AOFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/AOFS/MBR.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AOFS
         public MBR() : base("Amiga OFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Old File System (MBR)");
         public override IFilesystem Plugin     => new AmigaDOSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/AOFS/RDB.cs b/Aaru.Tests/Filesystems/AOFS/RDB.cs
index 4fbe67049..e56bfc7b9 100644
--- a/Aaru.Tests/Filesystems/AOFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/AOFS/RDB.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AOFS
         public RDB() : base("Amiga OFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System (RDB)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Old File System (RDB)");
         public override IFilesystem Plugin     => new AmigaDOSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/AOFS/Whole.cs b/Aaru.Tests/Filesystems/AOFS/Whole.cs
index ddcbd52a6..930677e31 100644
--- a/Aaru.Tests/Filesystems/AOFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/AOFS/Whole.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.AOFS
         public Whole() : base("Amiga OFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Amiga Old File System");
 
         public override IFilesystem Plugin     => new AmigaDOSPlugin();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/Atheos.cs b/Aaru.Tests/Filesystems/Atheos.cs
index e1c830a52..33610de8f 100644
--- a/Aaru.Tests/Filesystems/Atheos.cs
+++ b/Aaru.Tests/Filesystems/Atheos.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Atheos() : base("AtheOS filesystem") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "AtheOS (MBR)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "AtheOS (MBR)");
         public override IFilesystem Plugin     => new AtheOS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/BeFS/APM.cs b/Aaru.Tests/Filesystems/BeFS/APM.cs
index 91c002f3b..ec8705da6 100644
--- a/Aaru.Tests/Filesystems/BeFS/APM.cs
+++ b/Aaru.Tests/Filesystems/BeFS/APM.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.BeFS
         public APM() : base("BeFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System (APM)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Be File System (APM)");
         public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/BeFS/GPT.cs b/Aaru.Tests/Filesystems/BeFS/GPT.cs
index 7cdddd6f0..5966f4b07 100644
--- a/Aaru.Tests/Filesystems/BeFS/GPT.cs
+++ b/Aaru.Tests/Filesystems/BeFS/GPT.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.BeFS
         public GPT() : base("BeFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System (GPT)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Be File System (GPT)");
         public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/BeFS/MBR.cs b/Aaru.Tests/Filesystems/BeFS/MBR.cs
index 8398291bf..6c152b3f7 100644
--- a/Aaru.Tests/Filesystems/BeFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/BeFS/MBR.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.BeFS
         public MBR() : base("BeFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Be File System (MBR)");
         public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/BeFS/Whole.cs b/Aaru.Tests/Filesystems/BeFS/Whole.cs
index 3310db0cc..790450c05 100644
--- a/Aaru.Tests/Filesystems/BeFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/BeFS/Whole.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.BeFS
     {
         public Whole() : base("BeFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Be File System");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/COHERENT/MBR.cs b/Aaru.Tests/Filesystems/COHERENT/MBR.cs
index ae19e668b..8eca7142a 100644
--- a/Aaru.Tests/Filesystems/COHERENT/MBR.cs
+++ b/Aaru.Tests/Filesystems/COHERENT/MBR.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.COHERENT
         public MBR() : base("Coherent fs") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "COHERENT filesystem (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "COHERENT filesystem (MBR)");
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/COHERENT/Whole.cs b/Aaru.Tests/Filesystems/COHERENT/Whole.cs
index 7ef13f56a..aac357227 100644
--- a/Aaru.Tests/Filesystems/COHERENT/Whole.cs
+++ b/Aaru.Tests/Filesystems/COHERENT/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.COHERENT
     {
         public Whole() : base("Coherent fs") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "COHERENT filesystem");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "COHERENT filesystem");
 
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/AMSDOS.cs b/Aaru.Tests/Filesystems/CPM/AMSDOS.cs
index fa1c85332..f7938f908 100644
--- a/Aaru.Tests/Filesystems/CPM/AMSDOS.cs
+++ b/Aaru.Tests/Filesystems/CPM/AMSDOS.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.CPM
     {
         public AMSDOS() : base("CP/M") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "AMSDOS");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "AMSDOS");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs b/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs
index f70f75a6c..4ebbd0dc2 100644
--- a/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs
+++ b/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.CPM
     {
         public AmstradCPM() : base("CP/M") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Amstrad CPM");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Amstrad CPM");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs b/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs
index 1a72e9b89..54014373f 100644
--- a/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs
+++ b/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.CPM
     {
         public AmstradCPMPlus() : base("CP/M") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Amstrad CPM+");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Amstrad CPM+");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/Attache.cs b/Aaru.Tests/Filesystems/CPM/Attache.cs
index 4dbcf3091..f3764d156 100644
--- a/Aaru.Tests/Filesystems/CPM/Attache.cs
+++ b/Aaru.Tests/Filesystems/CPM/Attache.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.CPM
         public Attache() : base("CP/M") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Otrona Attaché");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Otrona Attaché");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/Bondwell.cs b/Aaru.Tests/Filesystems/CPM/Bondwell.cs
index 14a7a380b..f42360e69 100644
--- a/Aaru.Tests/Filesystems/CPM/Bondwell.cs
+++ b/Aaru.Tests/Filesystems/CPM/Bondwell.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.CPM
     {
         public Bondwell() : base("CP/M") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Bondwell");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Bondwell");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/Excalibur64.cs b/Aaru.Tests/Filesystems/CPM/Excalibur64.cs
index 5a915b877..bc2c4b387 100644
--- a/Aaru.Tests/Filesystems/CPM/Excalibur64.cs
+++ b/Aaru.Tests/Filesystems/CPM/Excalibur64.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.CPM
     {
         public Excalibur64() : base("CP/M") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Excalibur 64");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Excalibur 64");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/KayproII.cs b/Aaru.Tests/Filesystems/CPM/KayproII.cs
index 328864eee..59157b045 100644
--- a/Aaru.Tests/Filesystems/CPM/KayproII.cs
+++ b/Aaru.Tests/Filesystems/CPM/KayproII.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.CPM
     {
         public KayproII() : base("CP/M") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Kaypro II");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Kaypro II");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/ParaDOS.cs b/Aaru.Tests/Filesystems/CPM/ParaDOS.cs
index 460bceb57..c314b8597 100644
--- a/Aaru.Tests/Filesystems/CPM/ParaDOS.cs
+++ b/Aaru.Tests/Filesystems/CPM/ParaDOS.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.CPM
     {
         public ParaDOS() : base("CP/M") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "ParaDOS");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "ParaDOS");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs b/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs
index 609dfba8e..741ea2119 100644
--- a/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs
+++ b/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.CPM
     {
         public Plus3DOS() : base("CP/M") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "+3DOS");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "+3DOS");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/ROMDOS.cs b/Aaru.Tests/Filesystems/CPM/ROMDOS.cs
index f151e310f..c8dbbe659 100644
--- a/Aaru.Tests/Filesystems/CPM/ROMDOS.cs
+++ b/Aaru.Tests/Filesystems/CPM/ROMDOS.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.CPM
     {
         public ROMDOS() : base("CP/M") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "ROMDOS");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "ROMDOS");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs b/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs
index d1d3f53e7..a689ebe16 100644
--- a/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs
+++ b/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.CPM
         public SharpPersonalCPM() : base("CP/M") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Sharp Personal CPM");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "Sharp Personal CPM");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/CPM/XtalDOS.cs b/Aaru.Tests/Filesystems/CPM/XtalDOS.cs
index 811914c6a..8776e7510 100644
--- a/Aaru.Tests/Filesystems/CPM/XtalDOS.cs
+++ b/Aaru.Tests/Filesystems/CPM/XtalDOS.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.CPM
     {
         public XtalDOS() : base("CP/M") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "XtalDOS");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "CPM", "XtalDOS");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/DTFS/MBR.cs b/Aaru.Tests/Filesystems/DTFS/MBR.cs
index da4dd8b8d..5a75e8ef4 100644
--- a/Aaru.Tests/Filesystems/DTFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/DTFS/MBR.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.DTFS
     {
         public MBR() : base("DTFS") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "DTFS (MBR)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "DTFS (MBR)");
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/DTFS/Whole.cs b/Aaru.Tests/Filesystems/DTFS/Whole.cs
index 4a71638df..23b668267 100644
--- a/Aaru.Tests/Filesystems/DTFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/DTFS/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.DTFS
     {
         public Whole() : base("DTFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "DTFS");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "DTFS");
 
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/EAFS/MBR.cs b/Aaru.Tests/Filesystems/EAFS/MBR.cs
index 348556fe5..abb8b2c17 100644
--- a/Aaru.Tests/Filesystems/EAFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/EAFS/MBR.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.EAFS
     {
         public MBR() : base("Extended Acer Fast Filesystem") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "EAFS (MBR)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "EAFS (MBR)");
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/EAFS/Whole.cs b/Aaru.Tests/Filesystems/EAFS/Whole.cs
index 23589c729..d51202b0a 100644
--- a/Aaru.Tests/Filesystems/EAFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/EAFS/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.EAFS
     {
         public Whole() : base("Extended Acer Fast Filesystem") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "EAFS");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "EAFS");
 
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/F2FS.cs b/Aaru.Tests/Filesystems/F2FS.cs
index 6bf36aeb1..266265ac5 100644
--- a/Aaru.Tests/Filesystems/F2FS.cs
+++ b/Aaru.Tests/Filesystems/F2FS.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public F2Fs() : base("F2FS filesystem") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "F2FS");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "F2FS");
         public override IFilesystem Plugin     => new F2FS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT12/APM.cs b/Aaru.Tests/Filesystems/FAT12/APM.cs
index 75e1109bb..4f9846f97 100644
--- a/Aaru.Tests/Filesystems/FAT12/APM.cs
+++ b/Aaru.Tests/Filesystems/FAT12/APM.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT12
     {
         public APM() : base("FAT12") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (APM)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (APM)");
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT12/GPT.cs b/Aaru.Tests/Filesystems/FAT12/GPT.cs
index b1b7f8c4a..a6447c4b9 100644
--- a/Aaru.Tests/Filesystems/FAT12/GPT.cs
+++ b/Aaru.Tests/Filesystems/FAT12/GPT.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT12
     {
         public GPT() : base("FAT12") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (GPT)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (GPT)");
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT12/Human.cs b/Aaru.Tests/Filesystems/FAT12/Human.cs
index 274b03e97..7f1430c5a 100644
--- a/Aaru.Tests/Filesystems/FAT12/Human.cs
+++ b/Aaru.Tests/Filesystems/FAT12/Human.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT12
     {
         public Human() : base("FAT12") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (Human68K)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (Human68K)");
         public override IFilesystem Plugin => new FAT();
         public override bool Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/FAT12/MBR.cs b/Aaru.Tests/Filesystems/FAT12/MBR.cs
index ab6df8ca1..98da4ca73 100644
--- a/Aaru.Tests/Filesystems/FAT12/MBR.cs
+++ b/Aaru.Tests/Filesystems/FAT12/MBR.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT12
     {
         public MBR() : base("FAT12") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (MBR)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12 (MBR)");
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT12/Whole.cs b/Aaru.Tests/Filesystems/FAT12/Whole.cs
index 928b7d1a2..3ee65b3bb 100644
--- a/Aaru.Tests/Filesystems/FAT12/Whole.cs
+++ b/Aaru.Tests/Filesystems/FAT12/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT12
     {
         public Whole() : base("FAT12") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT12");
 
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/FAT16/APM.cs b/Aaru.Tests/Filesystems/FAT16/APM.cs
index f2d828258..50d19051a 100644
--- a/Aaru.Tests/Filesystems/FAT16/APM.cs
+++ b/Aaru.Tests/Filesystems/FAT16/APM.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT16
     {
         public APM() : base("FAT16") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (APM)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (APM)");
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT16/Atari.cs b/Aaru.Tests/Filesystems/FAT16/Atari.cs
index 1eb51118e..701d1c835 100644
--- a/Aaru.Tests/Filesystems/FAT16/Atari.cs
+++ b/Aaru.Tests/Filesystems/FAT16/Atari.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT16
     {
         public Atari() : base("FAT16") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (Atari)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (Atari)");
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT16/GPT.cs b/Aaru.Tests/Filesystems/FAT16/GPT.cs
index ff62209ce..af92f9fb1 100644
--- a/Aaru.Tests/Filesystems/FAT16/GPT.cs
+++ b/Aaru.Tests/Filesystems/FAT16/GPT.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT16
     {
         public GPT() : base("FAT16") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (GPT)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (GPT)");
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT16/Human.cs b/Aaru.Tests/Filesystems/FAT16/Human.cs
index 89d6e1dab..99262a1ed 100644
--- a/Aaru.Tests/Filesystems/FAT16/Human.cs
+++ b/Aaru.Tests/Filesystems/FAT16/Human.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT16
     {
         public Human() : base("FAT16") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (Human68K)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (Human68K)");
         public override IFilesystem Plugin => new FAT();
         public override bool Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT16/MBR.cs b/Aaru.Tests/Filesystems/FAT16/MBR.cs
index 97f444ef6..e023b81d9 100644
--- a/Aaru.Tests/Filesystems/FAT16/MBR.cs
+++ b/Aaru.Tests/Filesystems/FAT16/MBR.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT16
     {
         public MBR() : base("FAT16") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (MBR)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (MBR)");
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT16/RDB.cs b/Aaru.Tests/Filesystems/FAT16/RDB.cs
index 647e21df4..e0773912b 100644
--- a/Aaru.Tests/Filesystems/FAT16/RDB.cs
+++ b/Aaru.Tests/Filesystems/FAT16/RDB.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT16
     {
         public RDB() : base("FAT16") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (RDB)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16 (RDB)");
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT16/Whole.cs b/Aaru.Tests/Filesystems/FAT16/Whole.cs
index 39844d9b3..bac7a057b 100644
--- a/Aaru.Tests/Filesystems/FAT16/Whole.cs
+++ b/Aaru.Tests/Filesystems/FAT16/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT16
     {
         public Whole() : base("FAT16") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT16");
 
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/FAT32/APM.cs b/Aaru.Tests/Filesystems/FAT32/APM.cs
index 92d40fc8a..d3b539a80 100644
--- a/Aaru.Tests/Filesystems/FAT32/APM.cs
+++ b/Aaru.Tests/Filesystems/FAT32/APM.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT32
     {
         public APM() : base("FAT32") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32 (APM)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT32 (APM)");
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT32/GPT.cs b/Aaru.Tests/Filesystems/FAT32/GPT.cs
index 3b38d1ac2..eb78fbcdc 100644
--- a/Aaru.Tests/Filesystems/FAT32/GPT.cs
+++ b/Aaru.Tests/Filesystems/FAT32/GPT.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT32
     {
         public GPT() : base("FAT32") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32 (GPT)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT32 (GPT)");
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT32/MBR.cs b/Aaru.Tests/Filesystems/FAT32/MBR.cs
index 9a1593196..fef2782c3 100644
--- a/Aaru.Tests/Filesystems/FAT32/MBR.cs
+++ b/Aaru.Tests/Filesystems/FAT32/MBR.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT32
     {
         public MBR() : base("FAT32") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32 (MBR)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT32 (MBR)");
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/FAT32/Whole.cs b/Aaru.Tests/Filesystems/FAT32/Whole.cs
index 2b94718aa..a579a5653 100644
--- a/Aaru.Tests/Filesystems/FAT32/Whole.cs
+++ b/Aaru.Tests/Filesystems/FAT32/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FAT32
     {
         public Whole() : base("FAT32") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "FAT32");
 
         public override IFilesystem Plugin     => new FAT();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/FATX/Xbox.cs b/Aaru.Tests/Filesystems/FATX/Xbox.cs
index 5aac6979f..e4ac70445 100644
--- a/Aaru.Tests/Filesystems/FATX/Xbox.cs
+++ b/Aaru.Tests/Filesystems/FATX/Xbox.cs
@@ -41,7 +41,7 @@ namespace Aaru.Tests.Filesystems.FATX
     {
         public Xbox() : base("FATX filesystem") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Xbox FAT16", "le");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Xbox FAT16", "le");
         public override IFilesystem Plugin => new XboxFatPlugin();
         public override bool Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/FATX/Xbox360.cs b/Aaru.Tests/Filesystems/FATX/Xbox360.cs
index e5b004c02..39e81dd83 100644
--- a/Aaru.Tests/Filesystems/FATX/Xbox360.cs
+++ b/Aaru.Tests/Filesystems/FATX/Xbox360.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.FATX
     {
         public Xbox360() : base("FATX filesystem") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Xbox FAT16", "be");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Xbox FAT16", "be");
 
         public override IFilesystem Plugin     => new XboxFatPlugin();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/HAMMER.cs b/Aaru.Tests/Filesystems/HAMMER.cs
index 8ef1ce595..af34e7574 100644
--- a/Aaru.Tests/Filesystems/HAMMER.cs
+++ b/Aaru.Tests/Filesystems/HAMMER.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Hammer() : base("HAMMER") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "HAMMER (MBR)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "HAMMER (MBR)");
         public override IFilesystem Plugin     => new HAMMER();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/HFS+/APM.cs b/Aaru.Tests/Filesystems/HFS+/APM.cs
index f8e0fe1fb..56b3beccc 100644
--- a/Aaru.Tests/Filesystems/HFS+/APM.cs
+++ b/Aaru.Tests/Filesystems/HFS+/APM.cs
@@ -41,7 +41,7 @@ namespace Aaru.Tests.Filesystems.HFSPlus
     {
         public APM() : base("HFS+") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS+ (APM)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS+ (APM)");
         public override IFilesystem Plugin => new AppleHFSPlus();
         public override bool Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/HFS+/GPT.cs b/Aaru.Tests/Filesystems/HFS+/GPT.cs
index 36e875848..1329a70ab 100644
--- a/Aaru.Tests/Filesystems/HFS+/GPT.cs
+++ b/Aaru.Tests/Filesystems/HFS+/GPT.cs
@@ -41,7 +41,7 @@ namespace Aaru.Tests.Filesystems.HFSPlus
     {
         public GPT() : base("HFS+") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS+ (GPT)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS+ (GPT)");
         public override IFilesystem Plugin => new AppleHFSPlus();
         public override bool Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/HFS+/MBR.cs b/Aaru.Tests/Filesystems/HFS+/MBR.cs
index 0818eb459..caf6d18f1 100644
--- a/Aaru.Tests/Filesystems/HFS+/MBR.cs
+++ b/Aaru.Tests/Filesystems/HFS+/MBR.cs
@@ -41,7 +41,7 @@ namespace Aaru.Tests.Filesystems.HFSPlus
     {
         public MBR() : base("HFS+") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS+ (MBR)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS+ (MBR)");
 
         public override IFilesystem Plugin     => new AppleHFSPlus();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/HFS/APM.cs b/Aaru.Tests/Filesystems/HFS/APM.cs
index 1e2f5bbee..ffe645a72 100644
--- a/Aaru.Tests/Filesystems/HFS/APM.cs
+++ b/Aaru.Tests/Filesystems/HFS/APM.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.HFS
     {
         public APM() : base("HFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (APM)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (APM)");
         public override IFilesystem Plugin => new AppleHFS();
         public override bool Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/HFS/MBR.cs b/Aaru.Tests/Filesystems/HFS/MBR.cs
index 6dd164517..b2dc66b61 100644
--- a/Aaru.Tests/Filesystems/HFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/HFS/MBR.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.HFS
     {
         public MBR() : base("HFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (MBR)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (MBR)");
         public override IFilesystem Plugin => new AppleHFS();
         public override bool Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/HFS/Optical.cs b/Aaru.Tests/Filesystems/HFS/Optical.cs
index 1a3eabf25..ef20c91e9 100644
--- a/Aaru.Tests/Filesystems/HFS/Optical.cs
+++ b/Aaru.Tests/Filesystems/HFS/Optical.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.HFS
     {
         public Optical() : base("HFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (CD-ROM)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (CD-ROM)");
         public override IFilesystem Plugin => new AppleHFS();
         public override bool Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/HFS/RDB.cs b/Aaru.Tests/Filesystems/HFS/RDB.cs
index ca26c5469..099df20b6 100644
--- a/Aaru.Tests/Filesystems/HFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/HFS/RDB.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.HFS
     {
         public RDB() : base("HFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (RDB)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS (RDB)");
         public override IFilesystem Plugin => new AppleHFS();
         public override bool Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/HFS/Whole.cs b/Aaru.Tests/Filesystems/HFS/Whole.cs
index edd26c635..9dbe7dfcf 100644
--- a/Aaru.Tests/Filesystems/HFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/HFS/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.HFS
     {
         public Whole() : base("HFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFS");
 
         public override IFilesystem Plugin     => new AppleHFS();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/HFSX/APM.cs b/Aaru.Tests/Filesystems/HFSX/APM.cs
index ee93c2c6d..d09562fca 100644
--- a/Aaru.Tests/Filesystems/HFSX/APM.cs
+++ b/Aaru.Tests/Filesystems/HFSX/APM.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.HFSX
     {
         public APM() : base("HFSX") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFSX (APM)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFSX (APM)");
         public override IFilesystem Plugin => new AppleHFSPlus();
         public override bool Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/HFSX/GPT.cs b/Aaru.Tests/Filesystems/HFSX/GPT.cs
index 0db741541..925ea5539 100644
--- a/Aaru.Tests/Filesystems/HFSX/GPT.cs
+++ b/Aaru.Tests/Filesystems/HFSX/GPT.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.HFSX
     {
         public GPT() : base("HFSX") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFSX (GPT)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFSX (GPT)");
         public override IFilesystem Plugin => new AppleHFSPlus();
         public override bool Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/HFSX/MBR.cs b/Aaru.Tests/Filesystems/HFSX/MBR.cs
index 4c7b75749..2fcda0464 100644
--- a/Aaru.Tests/Filesystems/HFSX/MBR.cs
+++ b/Aaru.Tests/Filesystems/HFSX/MBR.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.HFSX
     {
         public MBR() : base("HFSX") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFSX (MBR)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Apple HFSX (MBR)");
 
         public override IFilesystem Plugin     => new AppleHFSPlus();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/HPFS.cs b/Aaru.Tests/Filesystems/HPFS.cs
index d60bd8fdc..9f3febe35 100644
--- a/Aaru.Tests/Filesystems/HPFS.cs
+++ b/Aaru.Tests/Filesystems/HPFS.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Hpfs() : base("HPFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems",
                                                           "High Performance File System");
         public override IFilesystem Plugin     => new HPFS();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/HPOFS.cs b/Aaru.Tests/Filesystems/HPOFS.cs
index cebfa22fe..4258331e1 100644
--- a/Aaru.Tests/Filesystems/HPOFS.cs
+++ b/Aaru.Tests/Filesystems/HPOFS.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Hpofs() : base("HPOFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems",
                                                           "High Performance Optical File System");
         public override IFilesystem Plugin     => new HPOFS();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/HTFS/MBR.cs b/Aaru.Tests/Filesystems/HTFS/MBR.cs
index 271face31..d7a19235a 100644
--- a/Aaru.Tests/Filesystems/HTFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/HTFS/MBR.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.HTFS
         public MBR() : base("HTFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "High Throughtput File System (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "High Throughtput File System (MBR)");
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/HTFS/Whole.cs b/Aaru.Tests/Filesystems/HTFS/Whole.cs
index b0becb3bd..efe3c9c04 100644
--- a/Aaru.Tests/Filesystems/HTFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/HTFS/Whole.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.HTFS
         public Whole() : base("HTFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "High Throughtput File System");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "High Throughtput File System");
 
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/ISO9660.cs b/Aaru.Tests/Filesystems/ISO9660.cs
index 7caecf9b4..bd6625272 100644
--- a/Aaru.Tests/Filesystems/ISO9660.cs
+++ b/Aaru.Tests/Filesystems/ISO9660.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Iso9660() : base("ISO9660") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "ISO9660");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "ISO9660");
         public override IFilesystem Plugin     => new ISO9660();
         public override bool        Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/JFS2.cs b/Aaru.Tests/Filesystems/JFS2.cs
index baa9c45d9..41773a3f4 100644
--- a/Aaru.Tests/Filesystems/JFS2.cs
+++ b/Aaru.Tests/Filesystems/JFS2.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Jfs2() : base("JFS filesystem") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "JFS2");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "JFS2");
         public override IFilesystem Plugin     => new JFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/LisaFS.cs b/Aaru.Tests/Filesystems/LisaFS.cs
index de090f7cd..7c3b3326a 100644
--- a/Aaru.Tests/Filesystems/LisaFS.cs
+++ b/Aaru.Tests/Filesystems/LisaFS.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public LisaFs() : base("LisaFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems",
                                                           "Apple Lisa filesystem");
         public override IFilesystem Plugin     => new LisaFS();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/Locus.cs b/Aaru.Tests/Filesystems/Locus.cs
index 1ac7bcfc4..4cd7f7aab 100644
--- a/Aaru.Tests/Filesystems/Locus.cs
+++ b/Aaru.Tests/Filesystems/Locus.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Locus() : base("Locus filesystem") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Locus filesystem");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Locus filesystem");
         public override IFilesystem Plugin => new Aaru.Filesystems.Locus();
         public override bool Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/MFS.cs b/Aaru.Tests/Filesystems/MFS.cs
index 7bffa133a..4b60a3500 100644
--- a/Aaru.Tests/Filesystems/MFS.cs
+++ b/Aaru.Tests/Filesystems/MFS.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Mfs() : base("MFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems",
                                                           "Macintosh File System");
         public override IFilesystem Plugin     => new AppleMFS();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/MINIX/V1/MBR.cs b/Aaru.Tests/Filesystems/MINIX/V1/MBR.cs
index f1c1a2482..fdddd1406 100644
--- a/Aaru.Tests/Filesystems/MINIX/V1/MBR.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V1/MBR.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.MINIX.V1
     public class MBR : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v1 filesystem (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "MINIX v1 filesystem (MBR)");
         public override IFilesystem Plugin     => new MinixFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/MINIX/V1/Whole.cs b/Aaru.Tests/Filesystems/MINIX/V1/Whole.cs
index 65178aeeb..915cb3320 100644
--- a/Aaru.Tests/Filesystems/MINIX/V1/Whole.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V1/Whole.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.MINIX.V1
     [TestFixture]
     public class Whole : FilesystemTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v1 filesystem");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "MINIX v1 filesystem");
         public override IFilesystem Plugin => new MinixFS();
         public override bool Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/MINIX/V2/MBR.cs b/Aaru.Tests/Filesystems/MINIX/V2/MBR.cs
index c3e3a3ea4..c1f6d73af 100644
--- a/Aaru.Tests/Filesystems/MINIX/V2/MBR.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V2/MBR.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.MINIX.V2
     public class MBR : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v2 filesystem (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "MINIX v2 filesystem (MBR)");
         public override IFilesystem Plugin     => new MinixFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/MINIX/V2/Whole.cs b/Aaru.Tests/Filesystems/MINIX/V2/Whole.cs
index a7ecc9fd3..010f2ba3b 100644
--- a/Aaru.Tests/Filesystems/MINIX/V2/Whole.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V2/Whole.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.MINIX.V2
     [TestFixture]
     public class Whole : FilesystemTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v2 filesystem");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "MINIX v2 filesystem");
         public override IFilesystem Plugin => new MinixFS();
         public override bool Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/MINIX/V3/MBR.cs b/Aaru.Tests/Filesystems/MINIX/V3/MBR.cs
index f466b116d..2e93e8d60 100644
--- a/Aaru.Tests/Filesystems/MINIX/V3/MBR.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V3/MBR.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.MINIX.V3
     public class MBR : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v3 filesystem (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "MINIX v3 filesystem (MBR)");
         public override IFilesystem Plugin     => new MinixFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/MINIX/V3/Whole.cs b/Aaru.Tests/Filesystems/MINIX/V3/Whole.cs
index 08492cf7b..e2c57133d 100644
--- a/Aaru.Tests/Filesystems/MINIX/V3/Whole.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V3/Whole.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.MINIX.V3
     [TestFixture]
     public class Whole : FilesystemTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v3 filesystem");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "MINIX v3 filesystem");
 
         public override IFilesystem Plugin     => new MinixFS();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/NILFS2.cs b/Aaru.Tests/Filesystems/NILFS2.cs
index fab460167..1027b288a 100644
--- a/Aaru.Tests/Filesystems/NILFS2.cs
+++ b/Aaru.Tests/Filesystems/NILFS2.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Nilfs2() : base("NILFS2 filesystem") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems",
                                                           "New Implementation of a Log-structured File System 2");
         public override IFilesystem Plugin     => new NILFS2();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/NTFS/GPT.cs b/Aaru.Tests/Filesystems/NTFS/GPT.cs
index 8d1ca5c8e..b8d3e3134 100644
--- a/Aaru.Tests/Filesystems/NTFS/GPT.cs
+++ b/Aaru.Tests/Filesystems/NTFS/GPT.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.NTFS
         public GPT() : base("NTFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "New Technology File System (GPT)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "New Technology File System (GPT)");
         public override IFilesystem Plugin     => new Aaru.Filesystems.NTFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/NTFS/MBR.cs b/Aaru.Tests/Filesystems/NTFS/MBR.cs
index ef8a3cd44..9deb71b0f 100644
--- a/Aaru.Tests/Filesystems/NTFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/NTFS/MBR.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.NTFS
         public MBR() : base("NTFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "New Technology File System (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "New Technology File System (MBR)");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.NTFS();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/PFS3/APM.cs b/Aaru.Tests/Filesystems/PFS3/APM.cs
index 891fc89c8..798207601 100644
--- a/Aaru.Tests/Filesystems/PFS3/APM.cs
+++ b/Aaru.Tests/Filesystems/PFS3/APM.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.PFS3
     {
         public APM() : base("PFS v3") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems",
                                                           "Professional File System 3 (APM)");
         public override IFilesystem Plugin     => new PFS();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/PFS3/RDB.cs b/Aaru.Tests/Filesystems/PFS3/RDB.cs
index 4e4d11c4c..f9d2c2f68 100644
--- a/Aaru.Tests/Filesystems/PFS3/RDB.cs
+++ b/Aaru.Tests/Filesystems/PFS3/RDB.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.PFS3
     {
         public RDB() : base("PFS v3") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems",
                                                           "Professional File System 3 (RDB)");
         public override IFilesystem Plugin     => new PFS();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/ProDOS/APM.cs b/Aaru.Tests/Filesystems/ProDOS/APM.cs
index 4314ccd7d..798de2a5c 100644
--- a/Aaru.Tests/Filesystems/ProDOS/APM.cs
+++ b/Aaru.Tests/Filesystems/ProDOS/APM.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.ProDOS
         public APM() : base("ProDOS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "ProDOS filesystem (APM)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "ProDOS filesystem (APM)");
 
         public override IFilesystem Plugin     => new ProDOSPlugin();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/QNX4/MBR.cs b/Aaru.Tests/Filesystems/QNX4/MBR.cs
index e8ec1bf95..19b0b7eb7 100644
--- a/Aaru.Tests/Filesystems/QNX4/MBR.cs
+++ b/Aaru.Tests/Filesystems/QNX4/MBR.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.QNX4
         public MBR() : base("QNX4 filesystem") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "QNX 4 filesystem (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "QNX 4 filesystem (MBR)");
         public override IFilesystem Plugin     => new Aaru.Filesystems.QNX4();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/QNX4/Whole.cs b/Aaru.Tests/Filesystems/QNX4/Whole.cs
index 986ae7597..94b9914d4 100644
--- a/Aaru.Tests/Filesystems/QNX4/Whole.cs
+++ b/Aaru.Tests/Filesystems/QNX4/Whole.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.QNX4
     {
         public Whole() : base("QNX4 filesystem") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "QNX 4 filesystem");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "QNX 4 filesystem");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.QNX4();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/ReFS.cs b/Aaru.Tests/Filesystems/ReFS.cs
index cf273a2f6..8292a89c8 100644
--- a/Aaru.Tests/Filesystems/ReFS.cs
+++ b/Aaru.Tests/Filesystems/ReFS.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public ReFsMbr() : base("Resilient File System") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems",
                                                           "Resilient File System (MBR)");
         public override IFilesystem Plugin     => new ReFS();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/Reiser3.cs b/Aaru.Tests/Filesystems/Reiser3.cs
index 976095793..a65318e3e 100644
--- a/Aaru.Tests/Filesystems/Reiser3.cs
+++ b/Aaru.Tests/Filesystems/Reiser3.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems
     public class Reiser3 : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Reiser filesystem v3");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Reiser filesystem v3");
         public override IFilesystem Plugin     => new Reiser();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/Reiser4.cs b/Aaru.Tests/Filesystems/Reiser4.cs
index 70f099d97..a9306a845 100644
--- a/Aaru.Tests/Filesystems/Reiser4.cs
+++ b/Aaru.Tests/Filesystems/Reiser4.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
         public Reiser4() : base("Reiser 4 filesystem") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Reiser filesystem v4");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Reiser filesystem v4");
         public override IFilesystem Plugin     => new Aaru.Filesystems.Reiser4();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/SFS/APM.cs b/Aaru.Tests/Filesystems/SFS/APM.cs
index 88af3e972..d61626359 100644
--- a/Aaru.Tests/Filesystems/SFS/APM.cs
+++ b/Aaru.Tests/Filesystems/SFS/APM.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.SFS
         public APM() : base("SmartFileSystem") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (APM)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Smart File System (APM)");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs
index ee3353eef..4091f4bdd 100644
--- a/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs
+++ b/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.SFS
         public MBR_RDB() : base("SmartFileSystem") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (MBR+RDB)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Smart File System (MBR+RDB)");
         public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/SFS/MBR.cs b/Aaru.Tests/Filesystems/SFS/MBR.cs
index 0d4c7079d..6654a80d1 100644
--- a/Aaru.Tests/Filesystems/SFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/SFS/MBR.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.SFS
         public MBR() : base("SmartFileSystem") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Smart File System (MBR)");
         public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/SFS/RDB.cs b/Aaru.Tests/Filesystems/SFS/RDB.cs
index 16e297bd2..dc8e29b4f 100644
--- a/Aaru.Tests/Filesystems/SFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/SFS/RDB.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.SFS
         public RDB() : base("SmartFileSystem") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (RDB)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Smart File System (RDB)");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/SysV/MBR.cs b/Aaru.Tests/Filesystems/SysV/MBR.cs
index c79524e65..aab4f92a1 100644
--- a/Aaru.Tests/Filesystems/SysV/MBR.cs
+++ b/Aaru.Tests/Filesystems/SysV/MBR.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.SysV
         public MBR() : base("SVR4 fs") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "System V filesystem (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "System V filesystem (MBR)");
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/SysV/RDB.cs b/Aaru.Tests/Filesystems/SysV/RDB.cs
index 2a979d302..66601e5c2 100644
--- a/Aaru.Tests/Filesystems/SysV/RDB.cs
+++ b/Aaru.Tests/Filesystems/SysV/RDB.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.SysV
         public RDB() : base("SVR4 fs") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "System V filesystem (RDB)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "System V filesystem (RDB)");
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/SysV/Whole.cs b/Aaru.Tests/Filesystems/SysV/Whole.cs
index 30c6dd7fd..de76c5130 100644
--- a/Aaru.Tests/Filesystems/SysV/Whole.cs
+++ b/Aaru.Tests/Filesystems/SysV/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.SysV
     {
         public Whole() : base("SVR4 fs") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "System V filesystem");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "System V filesystem");
 
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs b/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs
index def48cf5c..6cd2b68ed 100644
--- a/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UDF._102
     public class Whole : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "1.02");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Universal Disc Format", "1.02");
         public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
         public override bool        Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/UDF/1.50/Optical.cs b/Aaru.Tests/Filesystems/UDF/1.50/Optical.cs
index ff5415a35..0e5443cac 100644
--- a/Aaru.Tests/Filesystems/UDF/1.50/Optical.cs
+++ b/Aaru.Tests/Filesystems/UDF/1.50/Optical.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UDF._150
     public class Optical : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "1.50");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Universal Disc Format", "1.50");
         public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
         public override bool        Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs b/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs
index 705c768c1..f60b3d24b 100644
--- a/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UDF._150
     public class Whole : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "1.50");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Universal Disc Format", "1.50");
         public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
         public override bool        Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/UDF/2.00/Optical.cs b/Aaru.Tests/Filesystems/UDF/2.00/Optical.cs
index ec73b9e77..b8acb94ec 100644
--- a/Aaru.Tests/Filesystems/UDF/2.00/Optical.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.00/Optical.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UDF._200
     public class Optical : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.00");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Universal Disc Format", "2.00");
         public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
         public override bool        Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/UDF/2.00/Whole.cs b/Aaru.Tests/Filesystems/UDF/2.00/Whole.cs
index 826c00ba5..f23823fe7 100644
--- a/Aaru.Tests/Filesystems/UDF/2.00/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.00/Whole.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UDF._200
     public class Whole : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.00");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Universal Disc Format", "2.00");
         public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
         public override bool        Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/UDF/2.01/Optical.cs b/Aaru.Tests/Filesystems/UDF/2.01/Optical.cs
index eb9058efb..a00001839 100644
--- a/Aaru.Tests/Filesystems/UDF/2.01/Optical.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.01/Optical.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UDF._201
     public class Optical : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.01");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Universal Disc Format", "2.01");
         public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
         public override bool        Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs b/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs
index adf7906a6..05da0fa8b 100644
--- a/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UDF._201
     public class Whole : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.01");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Universal Disc Format", "2.01");
         public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
         public override bool        Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs b/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs
index d907b86a0..7b31d24f4 100644
--- a/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UDF._250
     public class Whole : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.50");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Universal Disc Format", "2.50");
         public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
         public override bool        Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs b/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs
index c3a5e6030..16c76ecf4 100644
--- a/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.UDF._260
     public class Whole : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.60");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Universal Disc Format", "2.60");
         public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
         public override bool        Partitions => false;
 
diff --git a/Aaru.Tests/Filesystems/UFS/APM.cs b/Aaru.Tests/Filesystems/UFS/APM.cs
index 15e18af3d..48fedb2a7 100644
--- a/Aaru.Tests/Filesystems/UFS/APM.cs
+++ b/Aaru.Tests/Filesystems/UFS/APM.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UFS
     public class APM : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (APM)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (APM)");
         public override IFilesystem Plugin     => new FFSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/UFS/MBR.cs b/Aaru.Tests/Filesystems/UFS/MBR.cs
index 2ce8b9a9f..f701126c2 100644
--- a/Aaru.Tests/Filesystems/UFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/UFS/MBR.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UFS
     public class MBR : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (MBR)");
         public override IFilesystem Plugin     => new FFSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs b/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs
index ca06218ce..42111a133 100644
--- a/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs	
+++ b/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs	
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UFS
     public class NeXT_Floppy : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (NeXT)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (NeXT)");
         public override IFilesystem Plugin     => new FFSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/UFS/NeXT.cs b/Aaru.Tests/Filesystems/UFS/NeXT.cs
index c90e7ddc2..193f9e2dc 100644
--- a/Aaru.Tests/Filesystems/UFS/NeXT.cs
+++ b/Aaru.Tests/Filesystems/UFS/NeXT.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UFS
     public class NeXT : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (NeXT)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (NeXT)");
         public override IFilesystem Plugin     => new FFSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/UFS/RDB.cs b/Aaru.Tests/Filesystems/UFS/RDB.cs
index 8d4f6bc07..40f470bcd 100644
--- a/Aaru.Tests/Filesystems/UFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/UFS/RDB.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UFS
     public class RDB : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (RDB)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (RDB)");
         public override IFilesystem Plugin     => new FFSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/UFS/Sun i86.cs b/Aaru.Tests/Filesystems/UFS/Sun i86.cs
index 1eed2d66b..0f54cdede 100644
--- a/Aaru.Tests/Filesystems/UFS/Sun i86.cs	
+++ b/Aaru.Tests/Filesystems/UFS/Sun i86.cs	
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.UFS
     public class Sun_i86 : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (SunOS x86)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem (SunOS x86)");
         public override IFilesystem Plugin     => new FFSPlugin();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/UFS/Whole.cs b/Aaru.Tests/Filesystems/UFS/Whole.cs
index 69e629983..46a226566 100644
--- a/Aaru.Tests/Filesystems/UFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/UFS/Whole.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems.UFS
     [TestFixture]
     public class Whole : FilesystemTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "UNIX filesystem");
 
         public override IFilesystem Plugin     => new FFSPlugin();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs b/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs
index 3bfb3622e..6bd75ca5e 100644
--- a/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.UNIXBFS
         public MBR() : base("BFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Boot File System (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Boot File System (MBR)");
         public override IFilesystem Plugin     => new BFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs b/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs
index 15a359abc..a6b0bbb78 100644
--- a/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.UNIXBFS
         public RDB() : base("UFS") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Boot File System (RDB)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Boot File System (RDB)");
         public override IFilesystem Plugin     => new BFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs b/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs
index 7cc495724..907b900f4 100644
--- a/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.UNIXBFS
     {
         public Whole() : base("BFS") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Boot File System");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Boot File System");
 
         public override IFilesystem Plugin     => new BFS();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/XENIX/MBR.cs b/Aaru.Tests/Filesystems/XENIX/MBR.cs
index 3d93dc33f..f4091305f 100644
--- a/Aaru.Tests/Filesystems/XENIX/MBR.cs
+++ b/Aaru.Tests/Filesystems/XENIX/MBR.cs
@@ -40,7 +40,7 @@ namespace Aaru.Tests.Filesystems.XENIX
         public MBR() : base("XENIX fs") {}
 
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "XENIX filesystem (MBR)");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "XENIX filesystem (MBR)");
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/XENIX/Whole.cs b/Aaru.Tests/Filesystems/XENIX/Whole.cs
index 9a3516053..c70fe28ef 100644
--- a/Aaru.Tests/Filesystems/XENIX/Whole.cs
+++ b/Aaru.Tests/Filesystems/XENIX/Whole.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems.XENIX
     {
         public Whole() : base("XENIX fs") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "XENIX filesystem");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "XENIX filesystem");
 
         public override IFilesystem Plugin     => new SysVfs();
         public override bool        Partitions => false;
diff --git a/Aaru.Tests/Filesystems/XFS.cs b/Aaru.Tests/Filesystems/XFS.cs
index 2e1fedef3..cf8399c4c 100644
--- a/Aaru.Tests/Filesystems/XFS.cs
+++ b/Aaru.Tests/Filesystems/XFS.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems
     {
         public XFS() : base("XFS filesystem") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "XFS");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "XFS");
         public override IFilesystem Plugin     => new Aaru.Filesystems.XFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/Xia.cs b/Aaru.Tests/Filesystems/Xia.cs
index 57ce6f0db..00133bc7e 100644
--- a/Aaru.Tests/Filesystems/Xia.cs
+++ b/Aaru.Tests/Filesystems/Xia.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Xia() : base("Xia filesystem") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Xia filesystem");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "Xia filesystem");
         public override IFilesystem Plugin     => new Aaru.Filesystems.Xia();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/ZFS.cs b/Aaru.Tests/Filesystems/ZFS.cs
index 105be4c65..3661d7efb 100644
--- a/Aaru.Tests/Filesystems/ZFS.cs
+++ b/Aaru.Tests/Filesystems/ZFS.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Zfs() : base("ZFS filesystem") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems",
                                                           "Zettabyte File System");
 
         public override IFilesystem Plugin     => new ZFS();
diff --git a/Aaru.Tests/Filesystems/btrfs.cs b/Aaru.Tests/Filesystems/btrfs.cs
index b863489c2..b54b8575b 100644
--- a/Aaru.Tests/Filesystems/btrfs.cs
+++ b/Aaru.Tests/Filesystems/btrfs.cs
@@ -39,7 +39,7 @@ namespace Aaru.Tests.Filesystems
     {
         public Btrfs() : base("B-tree file system") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "btrfs");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "btrfs");
         public override IFilesystem Plugin     => new BTRFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/exFAT/APM.cs b/Aaru.Tests/Filesystems/exFAT/APM.cs
index 4b671d0d5..eb0e612bf 100644
--- a/Aaru.Tests/Filesystems/exFAT/APM.cs
+++ b/Aaru.Tests/Filesystems/exFAT/APM.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.exFAT
     {
         public APM() : base("exFAT") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "exFAT (APM)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "exFAT (APM)");
         public override IFilesystem Plugin     => new Aaru.Filesystems.exFAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/exFAT/GPT.cs b/Aaru.Tests/Filesystems/exFAT/GPT.cs
index 735a16a35..89f556821 100644
--- a/Aaru.Tests/Filesystems/exFAT/GPT.cs
+++ b/Aaru.Tests/Filesystems/exFAT/GPT.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.exFAT
     {
         public GPT() : base("exFAT") {}
 
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "exFAT (GPT)");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "exFAT (GPT)");
         public override IFilesystem Plugin     => new Aaru.Filesystems.exFAT();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/exFAT/MBR.cs b/Aaru.Tests/Filesystems/exFAT/MBR.cs
index d93789239..87742b3b8 100644
--- a/Aaru.Tests/Filesystems/exFAT/MBR.cs
+++ b/Aaru.Tests/Filesystems/exFAT/MBR.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems.exFAT
     {
         public MBR() : base("exFAT") {}
 
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "exFAT (MBR)");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "exFAT (MBR)");
 
         public override IFilesystem Plugin     => new Aaru.Filesystems.exFAT();
         public override bool        Partitions => true;
diff --git a/Aaru.Tests/Filesystems/ext.cs b/Aaru.Tests/Filesystems/ext.cs
index 41a3d9d16..6cc9124fb 100644
--- a/Aaru.Tests/Filesystems/ext.cs
+++ b/Aaru.Tests/Filesystems/ext.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Filesystems
     public class Ext : FilesystemTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Linux extended File System");
+            Path.Combine(Consts.TestFilesRoot, "Filesystems", "Linux extended File System");
         public override IFilesystem Plugin     => new extFS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filesystems/ext2.cs b/Aaru.Tests/Filesystems/ext2.cs
index b9b338798..c07af733b 100644
--- a/Aaru.Tests/Filesystems/ext2.cs
+++ b/Aaru.Tests/Filesystems/ext2.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Filesystems
     [TestFixture]
     public class Ext2 : FilesystemTest
     {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "ext2");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Filesystems", "ext2");
         public override IFilesystem Plugin     => new ext2FS();
         public override bool        Partitions => true;
 
diff --git a/Aaru.Tests/Filters/AppleDoubleDave.cs b/Aaru.Tests/Filters/AppleDoubleDave.cs
index d4d6abd37..1c5975a54 100644
--- a/Aaru.Tests/Filters/AppleDoubleDave.cs
+++ b/Aaru.Tests/Filters/AppleDoubleDave.cs
@@ -46,9 +46,9 @@ namespace Aaru.Tests.Filters
 
         public AppleDoubleDave()
         {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dave", "DOS_720.dmg");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "dave", "DOS_720.dmg");
 
-            _sidecar = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dave", "resource.frk",
+            _sidecar = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "dave", "resource.frk",
                                     "DOS_720.dmg");
         }
 
diff --git a/Aaru.Tests/Filters/AppleDoubleDos.cs b/Aaru.Tests/Filters/AppleDoubleDos.cs
index f11142ca1..6157d12d3 100644
--- a/Aaru.Tests/Filters/AppleDoubleDos.cs
+++ b/Aaru.Tests/Filters/AppleDoubleDos.cs
@@ -46,8 +46,8 @@ namespace Aaru.Tests.Filters
 
         public AppleDoubleDos()
         {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dos", "DOS_720.dmg");
-            _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dos", "DOS_720.adf");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "dos", "DOS_720.dmg");
+            _sidecar  = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "dos", "DOS_720.adf");
         }
 
         [Test]
diff --git a/Aaru.Tests/Filters/AppleDoubleNetatalk.cs b/Aaru.Tests/Filters/AppleDoubleNetatalk.cs
index d17d082d3..e098ce760 100644
--- a/Aaru.Tests/Filters/AppleDoubleNetatalk.cs
+++ b/Aaru.Tests/Filters/AppleDoubleNetatalk.cs
@@ -46,9 +46,9 @@ namespace Aaru.Tests.Filters
 
         public AppleDoubleNetatalk()
         {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "netatalk", "DOS_720.dmg");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "netatalk", "DOS_720.dmg");
 
-            _sidecar = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "netatalk", ".AppleDouble",
+            _sidecar = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "netatalk", ".AppleDouble",
                                     "DOS_720.dmg");
         }
 
diff --git a/Aaru.Tests/Filters/AppleDoubleOsX.cs b/Aaru.Tests/Filters/AppleDoubleOsX.cs
index 52a92e507..228925a4f 100644
--- a/Aaru.Tests/Filters/AppleDoubleOsX.cs
+++ b/Aaru.Tests/Filters/AppleDoubleOsX.cs
@@ -46,8 +46,8 @@ namespace Aaru.Tests.Filters
 
         public AppleDoubleOsX()
         {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "osx", "DOS_720.dmg");
-            _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "osx", "._DOS_720.dmg");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "osx", "DOS_720.dmg");
+            _sidecar  = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "osx", "._DOS_720.dmg");
         }
 
         [Test]
diff --git a/Aaru.Tests/Filters/AppleDoubleProDos.cs b/Aaru.Tests/Filters/AppleDoubleProDos.cs
index 691a9eee4..d8de47ee9 100644
--- a/Aaru.Tests/Filters/AppleDoubleProDos.cs
+++ b/Aaru.Tests/Filters/AppleDoubleProDos.cs
@@ -46,8 +46,8 @@ namespace Aaru.Tests.Filters
 
         public AppleDoubleProDos()
         {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "prodos", "DOS_720.dmg");
-            _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "prodos", "R.DOS_720.dmg");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "prodos", "DOS_720.dmg");
+            _sidecar  = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "prodos", "R.DOS_720.dmg");
         }
 
         [Test]
diff --git a/Aaru.Tests/Filters/AppleDoubleUnAr.cs b/Aaru.Tests/Filters/AppleDoubleUnAr.cs
index a4f5dfc73..4a0d3c47f 100644
--- a/Aaru.Tests/Filters/AppleDoubleUnAr.cs
+++ b/Aaru.Tests/Filters/AppleDoubleUnAr.cs
@@ -46,8 +46,8 @@ namespace Aaru.Tests.Filters
 
         public AppleDoubleUnAr()
         {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unar", "DOS_720.dmg");
-            _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unar", "DOS_720.dmg.rsrc");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "unar", "DOS_720.dmg");
+            _sidecar  = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "unar", "DOS_720.dmg.rsrc");
         }
 
         [Test]
diff --git a/Aaru.Tests/Filters/AppleDoubleUnix.cs b/Aaru.Tests/Filters/AppleDoubleUnix.cs
index 4ca87f266..bfbbb1724 100644
--- a/Aaru.Tests/Filters/AppleDoubleUnix.cs
+++ b/Aaru.Tests/Filters/AppleDoubleUnix.cs
@@ -46,8 +46,8 @@ namespace Aaru.Tests.Filters
 
         public AppleDoubleUnix()
         {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unix", "DOS_720.dmg");
-            _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unix", "%DOS_720.dmg");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "unix", "DOS_720.dmg");
+            _sidecar  = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleDouble", "unix", "%DOS_720.dmg");
         }
 
         [Test]
diff --git a/Aaru.Tests/Filters/AppleSingle.cs b/Aaru.Tests/Filters/AppleSingle.cs
index 89fb72ebf..0dd76780b 100644
--- a/Aaru.Tests/Filters/AppleSingle.cs
+++ b/Aaru.Tests/Filters/AppleSingle.cs
@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filters
         readonly string _location;
 
         public AppleSingle() =>
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleSingle", "DOS_720.ASF");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "AppleSingle", "DOS_720.ASF");
 
         [Test]
         public void CheckContents()
diff --git a/Aaru.Tests/Filters/BZip2.cs b/Aaru.Tests/Filters/BZip2.cs
index 1b75d62c3..d2dbc0a2f 100644
--- a/Aaru.Tests/Filters/BZip2.cs
+++ b/Aaru.Tests/Filters/BZip2.cs
@@ -46,7 +46,7 @@ namespace Aaru.Tests.Filters
         };
         readonly string _location;
 
-        public BZip2() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "bzip2.bz2");
+        public BZip2() => _location = Path.Combine(Consts.TestFilesRoot, "Filters", "bzip2.bz2");
 
         [Test]
         public void CheckContents()
diff --git a/Aaru.Tests/Filters/GZip.cs b/Aaru.Tests/Filters/GZip.cs
index 23fd88a0d..c2231ac64 100644
--- a/Aaru.Tests/Filters/GZip.cs
+++ b/Aaru.Tests/Filters/GZip.cs
@@ -46,7 +46,7 @@ namespace Aaru.Tests.Filters
         };
         readonly string _location;
 
-        public GZip() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "gzip.gz");
+        public GZip() => _location = Path.Combine(Consts.TestFilesRoot, "Filters", "gzip.gz");
 
         [Test]
         public void CheckContents()
diff --git a/Aaru.Tests/Filters/LZip.cs b/Aaru.Tests/Filters/LZip.cs
index 3667e823a..ad54a0954 100644
--- a/Aaru.Tests/Filters/LZip.cs
+++ b/Aaru.Tests/Filters/LZip.cs
@@ -46,7 +46,7 @@ namespace Aaru.Tests.Filters
         };
         readonly string _location;
 
-        public LZip() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "lzip.lz");
+        public LZip() => _location = Path.Combine(Consts.TestFilesRoot, "Filters", "lzip.lz");
 
         [Test]
         public void CheckContents()
diff --git a/Aaru.Tests/Filters/MacBinary1.cs b/Aaru.Tests/Filters/MacBinary1.cs
index bbbb1d2a5..73c71deb2 100644
--- a/Aaru.Tests/Filters/MacBinary1.cs
+++ b/Aaru.Tests/Filters/MacBinary1.cs
@@ -43,7 +43,7 @@ namespace Aaru.Tests.Filters
         readonly string _location;
 
         public MacBinary1() =>
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "MacBinary", "macbinary1.bin");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "MacBinary", "macbinary1.bin");
 
         [Test]
         public void CheckContents()
diff --git a/Aaru.Tests/Filters/MacBinary2.cs b/Aaru.Tests/Filters/MacBinary2.cs
index c63c9d3c4..7955f28ed 100644
--- a/Aaru.Tests/Filters/MacBinary2.cs
+++ b/Aaru.Tests/Filters/MacBinary2.cs
@@ -43,7 +43,7 @@ namespace Aaru.Tests.Filters
         readonly string _location;
 
         public MacBinary2() =>
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "MacBinary", "macbinary2.bin");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "MacBinary", "macbinary2.bin");
 
         [Test]
         public void CheckContents()
diff --git a/Aaru.Tests/Filters/MacBinary3.cs b/Aaru.Tests/Filters/MacBinary3.cs
index 02247ebd7..17afa2685 100644
--- a/Aaru.Tests/Filters/MacBinary3.cs
+++ b/Aaru.Tests/Filters/MacBinary3.cs
@@ -43,7 +43,7 @@ namespace Aaru.Tests.Filters
         readonly string _location;
 
         public MacBinary3() =>
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "MacBinary", "macbinary3.bin");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "MacBinary", "macbinary3.bin");
 
         [Test]
         public void CheckContents()
diff --git a/Aaru.Tests/Filters/PCExchange.cs b/Aaru.Tests/Filters/PCExchange.cs
index 58ac84c12..59dd3dbf8 100644
--- a/Aaru.Tests/Filters/PCExchange.cs
+++ b/Aaru.Tests/Filters/PCExchange.cs
@@ -42,7 +42,7 @@ namespace Aaru.Tests.Filters
         readonly string _location;
 
         public PcExchange() =>
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "PC Exchange", "DC6_RW_DOS_720.img");
+            _location = Path.Combine(Consts.TestFilesRoot, "Filters", "PC Exchange", "DC6_RW_DOS_720.img");
 
         [Test]
         public void CheckContents()
@@ -63,7 +63,7 @@ namespace Aaru.Tests.Filters
         public void CheckCorrectFile()
         {
             string result =
-                Md5Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "PC Exchange", "FINDER.DAT"), out _);
+                Md5Context.File(Path.Combine(Consts.TestFilesRoot, "Filters", "PC Exchange", "FINDER.DAT"), out _);
 
             Assert.AreEqual(EXPECTED_FILE, result);
         }
diff --git a/Aaru.Tests/Filters/XZ.cs b/Aaru.Tests/Filters/XZ.cs
index 8d2e562e5..08956bc4a 100644
--- a/Aaru.Tests/Filters/XZ.cs
+++ b/Aaru.Tests/Filters/XZ.cs
@@ -47,7 +47,7 @@ namespace Aaru.Tests.Filters
         };
         readonly string _location;
 
-        public Xz() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "xz.xz");
+        public Xz() => _location = Path.Combine(Consts.TestFilesRoot, "Filters", "xz.xz");
 
         [Test]
         public void CheckContents()
diff --git a/Aaru.Tests/Images/2MG.cs b/Aaru.Tests/Images/2MG.cs
index 9fca893ec..ad877bdc4 100644
--- a/Aaru.Tests/Images/2MG.cs
+++ b/Aaru.Tests/Images/2MG.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class Apple2Mg : BlockMediaImageTest
     {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "2mg");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "2mg");
         public override IMediaImage _plugin    => new DiscImages.Apple2Mg();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/AaruFormat/Tape/V1.cs b/Aaru.Tests/Images/AaruFormat/Tape/V1.cs
index 93fa1dab1..f2ff691d5 100644
--- a/Aaru.Tests/Images/AaruFormat/Tape/V1.cs
+++ b/Aaru.Tests/Images/AaruFormat/Tape/V1.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.AaruFormat.Tape
     public class V1 : TapeMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
         public override IMediaImage _plugin => new DiscImages.AaruFormat();
 
         public override TapeImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/AaruFormat/V1.cs b/Aaru.Tests/Images/AaruFormat/V1.cs
index 2884620e1..6032cf220 100644
--- a/Aaru.Tests/Images/AaruFormat/V1.cs
+++ b/Aaru.Tests/Images/AaruFormat/V1.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.AaruFormat
     public class V1 : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
         public override IMediaImage _plugin => new DiscImages.AaruFormat();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/Alcohol120.cs b/Aaru.Tests/Images/Alcohol120.cs
index fe5b769c0..400996298 100644
--- a/Aaru.Tests/Images/Alcohol120.cs
+++ b/Aaru.Tests/Images/Alcohol120.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     public class Alcohol120 : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Alcohol 120%");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "Alcohol 120%");
         public override IMediaImage _plugin => new DiscImages.Alcohol120();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/Anex86.cs b/Aaru.Tests/Images/Anex86.cs
index 5ad4610ae..0c5bfc79a 100644
--- a/Aaru.Tests/Images/Anex86.cs
+++ b/Aaru.Tests/Images/Anex86.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class Anex86 : BlockMediaImageTest
     {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Anex86");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "Anex86");
         public override IMediaImage _plugin    => new DiscImages.Anex86();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/AppleDOS/DOS.cs b/Aaru.Tests/Images/AppleDOS/DOS.cs
index 7b6b5632c..005f5955e 100644
--- a/Aaru.Tests/Images/AppleDOS/DOS.cs
+++ b/Aaru.Tests/Images/AppleDOS/DOS.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.AppleDOS
     public class DOS : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple DOS Order");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "Apple DOS Order");
         public override IMediaImage _plugin => new AppleDos();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/AppleDOS/DOS32.cs b/Aaru.Tests/Images/AppleDOS/DOS32.cs
index 993b1c243..2364e3641 100644
--- a/Aaru.Tests/Images/AppleDOS/DOS32.cs
+++ b/Aaru.Tests/Images/AppleDOS/DOS32.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.AppleDOS
     public class DOS32 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple DOS 13 sectors");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "Apple DOS 13 sectors");
         public override IMediaImage _plugin => new AppleDos();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/AppleDOS/ProDOS.cs b/Aaru.Tests/Images/AppleDOS/ProDOS.cs
index 97039cd12..3c97cf8f4 100644
--- a/Aaru.Tests/Images/AppleDOS/ProDOS.cs
+++ b/Aaru.Tests/Images/AppleDOS/ProDOS.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.AppleDOS
     public class ProDOS : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple ProDOS Order");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "Apple ProDOS Order");
         public override IMediaImage _plugin => new AppleDos();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/AppleNIB.cs b/Aaru.Tests/Images/AppleNIB.cs
index 452278681..4de268cdf 100644
--- a/Aaru.Tests/Images/AppleNIB.cs
+++ b/Aaru.Tests/Images/AppleNIB.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class AppleNib : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nibbles");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "Nibbles");
         public override IMediaImage _plugin => new DiscImages.AppleNib();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/Apridisk.cs b/Aaru.Tests/Images/Apridisk.cs
index 6f471b0d6..e138a5382 100644
--- a/Aaru.Tests/Images/Apridisk.cs
+++ b/Aaru.Tests/Images/Apridisk.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class Apridisk : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apridisk");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "Apridisk");
         public override IMediaImage _plugin => new DiscImages.Apridisk();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/BlindWrite4.cs b/Aaru.Tests/Images/BlindWrite4.cs
index fdeb528e7..2ee423c78 100644
--- a/Aaru.Tests/Images/BlindWrite4.cs
+++ b/Aaru.Tests/Images/BlindWrite4.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     public class BlindWrite4 : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 4");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "BlindWrite 4");
         public override IMediaImage _plugin => new DiscImages.BlindWrite4();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/BlindWrite5.cs b/Aaru.Tests/Images/BlindWrite5.cs
index 1d7403a3d..91bab8fcc 100644
--- a/Aaru.Tests/Images/BlindWrite5.cs
+++ b/Aaru.Tests/Images/BlindWrite5.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     public class BlindWrite5 : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 5");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "BlindWrite 5");
         public override IMediaImage _plugin => new DiscImages.BlindWrite5();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/BlindWrite6.cs b/Aaru.Tests/Images/BlindWrite6.cs
index 2ed237658..108f9b1bc 100644
--- a/Aaru.Tests/Images/BlindWrite6.cs
+++ b/Aaru.Tests/Images/BlindWrite6.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     public class BlindWrite6 : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 6");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "BlindWrite 6");
         public override IMediaImage _plugin => new DiscImages.BlindWrite5();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/BlindWrite7.cs b/Aaru.Tests/Images/BlindWrite7.cs
index 657eb6592..93864c04b 100644
--- a/Aaru.Tests/Images/BlindWrite7.cs
+++ b/Aaru.Tests/Images/BlindWrite7.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     public class BlindWrite7 : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 7");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "BlindWrite 7");
         public override IMediaImage _plugin => new DiscImages.BlindWrite5();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/CDRWin.cs b/Aaru.Tests/Images/CDRWin.cs
index f8523ea30..629d223d0 100644
--- a/Aaru.Tests/Images/CDRWin.cs
+++ b/Aaru.Tests/Images/CDRWin.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class CDRWin : OpticalMediaImageTest
     {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CDRWin");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "CDRWin");
         public override IMediaImage _plugin    => new CdrWin();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/CDRWin10.cs b/Aaru.Tests/Images/CDRWin10.cs
index e16e95009..b845551f9 100644
--- a/Aaru.Tests/Images/CDRWin10.cs
+++ b/Aaru.Tests/Images/CDRWin10.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class CDRWin10 : OpticalMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CDRWin 10");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "CDRWin 10");
         public override IMediaImage _plugin => new DiscImages.Alcohol120();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/CPCDSK.cs b/Aaru.Tests/Images/CPCDSK.cs
index 39b55973d..449f7d611 100644
--- a/Aaru.Tests/Images/CPCDSK.cs
+++ b/Aaru.Tests/Images/CPCDSK.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class CPCDSK : BlockMediaImageTest
     {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CPCDSK");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "CPCDSK");
         public override IMediaImage _plugin    => new Cpcdsk();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/CisCopy/Uncompressed.cs b/Aaru.Tests/Images/CisCopy/Uncompressed.cs
index 84438f7e5..33884c59f 100644
--- a/Aaru.Tests/Images/CisCopy/Uncompressed.cs
+++ b/Aaru.Tests/Images/CisCopy/Uncompressed.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.CisCopy
     public class Uncompressed : BlockMediaImageTest
     {
         // TODO: Support compression
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CisCopy");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "CisCopy");
         public override IMediaImage _plugin => new DiscImages.CisCopy();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/CloneCD.cs b/Aaru.Tests/Images/CloneCD.cs
index c32b9c981..c8c2774ec 100644
--- a/Aaru.Tests/Images/CloneCD.cs
+++ b/Aaru.Tests/Images/CloneCD.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class CloneCD : OpticalMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CloneCD");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "CloneCD");
         public override IMediaImage _plugin => new CloneCd();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/Commodore64/D64.cs b/Aaru.Tests/Images/Commodore64/D64.cs
index 7ac2fec02..760a2902c 100644
--- a/Aaru.Tests/Images/Commodore64/D64.cs
+++ b/Aaru.Tests/Images/Commodore64/D64.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.Commodore64
     public class D64 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Commodore D64");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "Commodore D64");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/Commodore64/D81.cs b/Aaru.Tests/Images/Commodore64/D81.cs
index 370ff09d5..94380b7fd 100644
--- a/Aaru.Tests/Images/Commodore64/D81.cs
+++ b/Aaru.Tests/Images/Commodore64/D81.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.Commodore64
     public class D81 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Commodore D81");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "Commodore D81");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/CopyQM.cs b/Aaru.Tests/Images/CopyQM.cs
index b144965f6..72c0915fd 100644
--- a/Aaru.Tests/Images/CopyQM.cs
+++ b/Aaru.Tests/Images/CopyQM.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class CopyQm : BlockMediaImageTest
     {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CopyQM");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "CopyQM");
         public override IMediaImage _plugin    => new DiscImages.CopyQm();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/CopyTape.cs b/Aaru.Tests/Images/CopyTape.cs
index 30162908d..e7278e165 100644
--- a/Aaru.Tests/Images/CopyTape.cs
+++ b/Aaru.Tests/Images/CopyTape.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class CopyTape : TapeMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "copytape");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "copytape");
         public override IMediaImage _plugin => new DiscImages.CopyTape();
 
         public override TapeImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/D88.cs b/Aaru.Tests/Images/D88.cs
index ab77c632a..d905f6379 100644
--- a/Aaru.Tests/Images/D88.cs
+++ b/Aaru.Tests/Images/D88.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class D88 : BlockMediaImageTest
     {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "D88");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "D88");
         public override IMediaImage _plugin    => new DiscImages.D88();
         public override BlockImageTestExpected[] Tests => new[]
         {
diff --git a/Aaru.Tests/Images/DART.cs b/Aaru.Tests/Images/DART.cs
index c7df7827d..88554d942 100644
--- a/Aaru.Tests/Images/DART.cs
+++ b/Aaru.Tests/Images/DART.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class Dart : BlockMediaImageTest
     {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DART");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "DART");
         public override IMediaImage _plugin    => new DiscImages.Dart();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiscJuggler.cs b/Aaru.Tests/Images/DiscJuggler.cs
index 83dae7066..5d4951858 100644
--- a/Aaru.Tests/Images/DiscJuggler.cs
+++ b/Aaru.Tests/Images/DiscJuggler.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class DiscJuggler : OpticalMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiscJuggler");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiscJuggler");
         public override IMediaImage _plugin => new DiscImages.DiscJuggler();
         public override OpticalImageTestExpected[] Tests => new[]
         {
diff --git a/Aaru.Tests/Images/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy42.cs
index 39a65a136..4d9d1f1bf 100644
--- a/Aaru.Tests/Images/DiskCopy42.cs
+++ b/Aaru.Tests/Images/DiskCopy42.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     public class DiskCopy42 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 4.2");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 4.2");
         public override IMediaImage _plugin => new DiscImages.DiskCopy42();
         public override BlockImageTestExpected[] Tests => new[]
         {
diff --git a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs
index de82fcee0..2707e3b22 100644
--- a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs
+++ b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskCopy633
     public class DiskCopy42 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "DiskCopy 4.2");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 6.3.3", "DiskCopy 4.2");
         public override IMediaImage _plugin => new DiscImages.DiskCopy42();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs
index 75d7f17d0..bf1158cfb 100644
--- a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs
+++ b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF
     public class ROCo : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "ROCo");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 6.3.3", "NDIF", "ROCo");
         public override IMediaImage _plugin => new Ndif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs
index 4baf24e75..9bac5a882 100644
--- a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs
+++ b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF
     public class RdWr : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "RdWr");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 6.3.3", "NDIF", "RdWr");
         public override IMediaImage _plugin => new Ndif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs
index 30ad1e2fb..e6efdb3fe 100644
--- a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs
+++ b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskCopy633.NDIF
     public class Rdxx : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "Rdxx");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 6.3.3", "NDIF", "Rdxx");
         public override IMediaImage _plugin => new Ndif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskCopy65/UDCO.cs b/Aaru.Tests/Images/DiskCopy65/UDCO.cs
index a8b4bc249..ce892ea83 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDCO.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDCO.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskCopy65
     public class UDCO : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDCO");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 6.5", "UDIF", "UDCO");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs b/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs
index 881733c53..5d584087b 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskCopy65
     public class UDCo_obsolete : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDCo_OBS");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 6.5", "UDIF", "UDCo_OBS");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskCopy65/UDRAW.cs b/Aaru.Tests/Images/DiskCopy65/UDRAW.cs
index aafa44fdd..ae4091c19 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDRAW.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDRAW.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskCopy65
     public class UDRAW : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRAW");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRAW");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskCopy65/UDRO.cs b/Aaru.Tests/Images/DiskCopy65/UDRO.cs
index 839f959f7..e0c3cba5d 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDRO.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDRO.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskCopy65
     public class UDRO : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRO");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRO");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs b/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs
index 94ebae375..86fb7290f 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskCopy65
     public class UDRo_obsolete : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRo_OBS");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRo_OBS");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskDupe.cs b/Aaru.Tests/Images/DiskDupe.cs
index 79f9c69d8..560d400f8 100644
--- a/Aaru.Tests/Images/DiskDupe.cs
+++ b/Aaru.Tests/Images/DiskDupe.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class DiskDupe : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskDupe");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskDupe");
         public override IMediaImage _plugin => new DiscImages.DiskDupe();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
index cb4ef85f1..6bd998ac3 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework
     public class DiskCopy42 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "DiskCopy 4.2");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "DiskCopy 4.2");
         public override IMediaImage _plugin => new DiscImages.DiskCopy42();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
index 0a7850077..c7d417094 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
     public class ROCo : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "ROCo");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "NDIF", "ROCo");
         public override IMediaImage _plugin => new Ndif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
index 6e8178a47..ca223d8d0 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
     public class RdWr : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "RdWr");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "NDIF", "RdWr");
         public override IMediaImage _plugin => new Ndif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
index bee6cfcfb..48a4040fd 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
     public class Rdxx : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "Rdxx");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "NDIF", "Rdxx");
         public override IMediaImage _plugin => new Ndif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
index 3e0f4a021..e4909235d 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
     public class IPOD : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "IPOD");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "UDIF", "IPOD");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
index 9f35dbb01..247bd3467 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
     public class UDBZ : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDBZ");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "UDIF", "UDBZ");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
index b2d807364..a31af5784 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
     public class UDCO : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDCO");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "UDIF", "UDCO");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
index 7c68c52e3..440f076cc 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
     public class UDRO : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDRO");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "UDIF", "UDRO");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
index 90d7c440c..bf4ab9300 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
     public class UDRW : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDRW");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "UDIF", "UDRW");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
index 932f81e40..4ca710687 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
     public class UDTO : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDTO");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "UDIF", "UDTO");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
index 3a76d6bd8..e8b145e9c 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
     public class UDZO : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDZO");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "UDIF", "UDZO");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
index 7d26e70f0..e3b613cc0 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
     public class UFBI : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UFBI");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "UDIF", "UFBI");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
index fb2922edb..bfca9b4d0 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
     public class ULMO : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "ULMO");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DiskImagesFramework", "UDIF", "ULMO");
         public override IMediaImage _plugin => new Udif();
 
         public override BlockImageTestExpected[] Tests => new BlockImageTestExpected[]
diff --git a/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs b/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs
index adcb1e0e5..26474a598 100644
--- a/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs
+++ b/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskUtilities
     public class ImageDisk : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "disk-analyse", "ImageDisk");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "disk-analyse", "ImageDisk");
         public override IMediaImage _plugin => new Imd();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DiskUtilities/Raw.cs b/Aaru.Tests/Images/DiskUtilities/Raw.cs
index 4e4f2b544..bb557fff1 100644
--- a/Aaru.Tests/Images/DiskUtilities/Raw.cs
+++ b/Aaru.Tests/Images/DiskUtilities/Raw.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.DiskUtilities
     public class Raw : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "disk-analyse", "raw");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "disk-analyse", "raw");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/DriDiskCopy.cs b/Aaru.Tests/Images/DriDiskCopy.cs
index 279e70979..934e233fe 100644
--- a/Aaru.Tests/Images/DriDiskCopy.cs
+++ b/Aaru.Tests/Images/DriDiskCopy.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     public class DriDiskCopy : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DRI DISKCOPY");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "DRI DISKCOPY");
         public override IMediaImage _plugin => new DiscImages.DriDiskCopy();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/GameJack6.cs b/Aaru.Tests/Images/GameJack6.cs
index eda9788cf..c23a08ed0 100644
--- a/Aaru.Tests/Images/GameJack6.cs
+++ b/Aaru.Tests/Images/GameJack6.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class GameJack6 : OpticalMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "GameJack 6");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "GameJack 6");
         public override IMediaImage _plugin => new DiscImages.Alcohol120();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/HDCopy.cs b/Aaru.Tests/Images/HDCopy.cs
index 4c3c708b2..04dd85fc8 100644
--- a/Aaru.Tests/Images/HDCopy.cs
+++ b/Aaru.Tests/Images/HDCopy.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class HDCopy : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HD-COPY");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "HD-COPY");
         public override IMediaImage _plugin => new HdCopy();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/HxC/ImageDisk.cs b/Aaru.Tests/Images/HxC/ImageDisk.cs
index 8f56e9f6f..f47c018f8 100644
--- a/Aaru.Tests/Images/HxC/ImageDisk.cs
+++ b/Aaru.Tests/Images/HxC/ImageDisk.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.HxC
     public class ImageDisk : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HxC", "ImageDisk");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "HxC", "ImageDisk");
         public override IMediaImage _plugin => new Imd();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/HxC/Raw.cs b/Aaru.Tests/Images/HxC/Raw.cs
index b635d9e6e..288ace555 100644
--- a/Aaru.Tests/Images/HxC/Raw.cs
+++ b/Aaru.Tests/Images/HxC/Raw.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.HxC
     [TestFixture]
     public class Raw : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HxC", "raw");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "HxC", "raw");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/HyperV.cs b/Aaru.Tests/Images/HyperV.cs
index b80ca8ce0..8db0d8640 100644
--- a/Aaru.Tests/Images/HyperV.cs
+++ b/Aaru.Tests/Images/HyperV.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class HyperV : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Hyper-V");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "Hyper-V");
         public override IMediaImage _plugin => new Vhdx();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/ImageDisk.cs b/Aaru.Tests/Images/ImageDisk.cs
index d1896bc10..954c2d4d2 100644
--- a/Aaru.Tests/Images/ImageDisk.cs
+++ b/Aaru.Tests/Images/ImageDisk.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class ImageDisk : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ImageDisk");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "ImageDisk");
         public override IMediaImage _plugin => new Imd();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/IsoBuster/Cuesheet.cs b/Aaru.Tests/Images/IsoBuster/Cuesheet.cs
index 079a1cbd8..283088c6d 100644
--- a/Aaru.Tests/Images/IsoBuster/Cuesheet.cs
+++ b/Aaru.Tests/Images/IsoBuster/Cuesheet.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.IsoBuster
     public class Cuesheet : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "IsoBuster", "Cuesheet");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "IsoBuster", "Cuesheet");
         public override IMediaImage _plugin => new CdrWin();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/KryoFlux/Raw.cs b/Aaru.Tests/Images/KryoFlux/Raw.cs
index 933731b24..ba542e308 100644
--- a/Aaru.Tests/Images/KryoFlux/Raw.cs
+++ b/Aaru.Tests/Images/KryoFlux/Raw.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.KryoFlux
     public class Raw : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "KryoFlux", "raw");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "KryoFlux", "raw");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/Lisa/Raw.cs b/Aaru.Tests/Images/Lisa/Raw.cs
index a6c5e0a1b..3be11759d 100644
--- a/Aaru.Tests/Images/Lisa/Raw.cs
+++ b/Aaru.Tests/Images/Lisa/Raw.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.Lisa
     public class Raw : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Lisa emulators", "raw");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "Lisa emulators", "raw");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/MAME/v1.cs b/Aaru.Tests/Images/MAME/v1.cs
index f9de2bbec..047842205 100644
--- a/Aaru.Tests/Images/MAME/v1.cs
+++ b/Aaru.Tests/Images/MAME/v1.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.MAME
     [TestFixture]
     public class V1 : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v1");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "MAME", "v1");
         public override IMediaImage _plugin => new Chd();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/MAME/v3.cs b/Aaru.Tests/Images/MAME/v3.cs
index 2c053b71a..f410a8688 100644
--- a/Aaru.Tests/Images/MAME/v3.cs
+++ b/Aaru.Tests/Images/MAME/v3.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.MAME
     [TestFixture]
     public class V3 : OpticalMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v3");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "MAME", "v3");
         public override IMediaImage _plugin => new Chd();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/MAME/v4.cs b/Aaru.Tests/Images/MAME/v4.cs
index 9dc5a7829..a68f1bd18 100644
--- a/Aaru.Tests/Images/MAME/v4.cs
+++ b/Aaru.Tests/Images/MAME/v4.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.MAME
     [TestFixture]
     public class V4 : OpticalMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v4");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "MAME", "v4");
         public override IMediaImage _plugin => new Chd();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/MAME/v5/compressed.cs b/Aaru.Tests/Images/MAME/v5/compressed.cs
index 8710c0201..78422149b 100644
--- a/Aaru.Tests/Images/MAME/v5/compressed.cs
+++ b/Aaru.Tests/Images/MAME/v5/compressed.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.MAME.v5
     public class Compressed : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v5", "compressed");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "MAME", "v5", "compressed");
         public override IMediaImage _plugin => new Chd();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/MAME/v5/uncompressed.cs b/Aaru.Tests/Images/MAME/v5/uncompressed.cs
index be11fd516..a4f25653c 100644
--- a/Aaru.Tests/Images/MAME/v5/uncompressed.cs
+++ b/Aaru.Tests/Images/MAME/v5/uncompressed.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.MAME.v5
     public class Uncompressed : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v5", "uncompressed");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "MAME", "v5", "uncompressed");
         public override IMediaImage _plugin => new Chd();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/MagicISO/Cuesheet.cs b/Aaru.Tests/Images/MagicISO/Cuesheet.cs
index 5cb0ffc7e..f657bf7ba 100644
--- a/Aaru.Tests/Images/MagicISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/MagicISO/Cuesheet.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.MagicISO
     public class Cuesheet : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MagicISO", "Cuesheet");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "MagicISO", "Cuesheet");
         public override IMediaImage _plugin => new CdrWin();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/MagicISO/Nero.cs b/Aaru.Tests/Images/MagicISO/Nero.cs
index 79fd13149..44c273858 100644
--- a/Aaru.Tests/Images/MagicISO/Nero.cs
+++ b/Aaru.Tests/Images/MagicISO/Nero.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.MagicISO
     public class Nero : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MagicISO", "Nero");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "MagicISO", "Nero");
         public override IMediaImage _plugin => new DiscImages.Nero();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/MaxiDisk.cs b/Aaru.Tests/Images/MaxiDisk.cs
index c9922a85e..70c1e290f 100644
--- a/Aaru.Tests/Images/MaxiDisk.cs
+++ b/Aaru.Tests/Images/MaxiDisk.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class MaxiDisk : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MaxiDisk");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "MaxiDisk");
         public override IMediaImage _plugin => new DiscImages.MaxiDisk();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/NHDr0.cs b/Aaru.Tests/Images/NHDr0.cs
index af688185c..ad472ba22 100644
--- a/Aaru.Tests/Images/NHDr0.cs
+++ b/Aaru.Tests/Images/NHDr0.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class NHDr0 : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "T-98 Next");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "T-98 Next");
         public override IMediaImage _plugin => new Nhdr0();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/Nero/V1.cs b/Aaru.Tests/Images/Nero/V1.cs
index 19d0bf7ee..9927fbfbd 100644
--- a/Aaru.Tests/Images/Nero/V1.cs
+++ b/Aaru.Tests/Images/Nero/V1.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.Nero
     public class V1 : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nero Burning ROM", "V1");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "Nero Burning ROM", "V1");
         public override IMediaImage _plugin => new DiscImages.Nero();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/Nero/V2.cs b/Aaru.Tests/Images/Nero/V2.cs
index a7550a382..fc6356970 100644
--- a/Aaru.Tests/Images/Nero/V2.cs
+++ b/Aaru.Tests/Images/Nero/V2.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.Nero
     public class V2 : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nero Burning ROM", "V2");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "Nero Burning ROM", "V2");
         public override IMediaImage _plugin => new DiscImages.Nero();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/PowerISO/Cuesheet.cs b/Aaru.Tests/Images/PowerISO/Cuesheet.cs
index d70ab023f..465233e0b 100644
--- a/Aaru.Tests/Images/PowerISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/PowerISO/Cuesheet.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.PowerISO
     public class Cuesheet : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "PowerISO", "Cuesheet");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "PowerISO", "Cuesheet");
         public override IMediaImage _plugin => new CdrWin();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/QEMU/HyperV.cs b/Aaru.Tests/Images/QEMU/HyperV.cs
index db84fdc67..847eb0e85 100644
--- a/Aaru.Tests/Images/QEMU/HyperV.cs
+++ b/Aaru.Tests/Images/QEMU/HyperV.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.QEMU
     public class HyperV : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "Hyper-V");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "Hyper-V");
         public override IMediaImage _plugin => new Vhdx();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/QEMU/Parallels.cs b/Aaru.Tests/Images/QEMU/Parallels.cs
index ee3068f7d..4dd091f55 100644
--- a/Aaru.Tests/Images/QEMU/Parallels.cs
+++ b/Aaru.Tests/Images/QEMU/Parallels.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU
     public class Parallels : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "Parallels");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "Parallels");
         public override IMediaImage _plugin => new DiscImages.Parallels();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/QEMU/QCOW.cs b/Aaru.Tests/Images/QEMU/QCOW.cs
index 801a27976..83724731b 100644
--- a/Aaru.Tests/Images/QEMU/QCOW.cs
+++ b/Aaru.Tests/Images/QEMU/QCOW.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.QEMU
     public class QCOW : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "QEMU Copy On Write");
         public override IMediaImage _plugin => new Qcow();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/QEMU/QCOW2.cs b/Aaru.Tests/Images/QEMU/QCOW2.cs
index 42550249f..f515d2f0f 100644
--- a/Aaru.Tests/Images/QEMU/QCOW2.cs
+++ b/Aaru.Tests/Images/QEMU/QCOW2.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.QEMU
     public class QCOW2 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write 2");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "QEMU Copy On Write 2");
         public override IMediaImage _plugin => new Qcow2();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/QEMU/QCOW3.cs b/Aaru.Tests/Images/QEMU/QCOW3.cs
index 9e42b97d9..387e5b01b 100644
--- a/Aaru.Tests/Images/QEMU/QCOW3.cs
+++ b/Aaru.Tests/Images/QEMU/QCOW3.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.QEMU
     public class QCOW3 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write 3");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "QEMU Copy On Write 3");
         public override IMediaImage _plugin => new Qcow2();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/QEMU/QED.cs b/Aaru.Tests/Images/QEMU/QED.cs
index e7d508531..6d366e034 100644
--- a/Aaru.Tests/Images/QEMU/QED.cs
+++ b/Aaru.Tests/Images/QEMU/QED.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.QEMU
     public class QED : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Enhanced Disk");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "QEMU Enhanced Disk");
         public override IMediaImage _plugin => new Qed();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/QEMU/Raw.cs b/Aaru.Tests/Images/QEMU/Raw.cs
index c9c90c755..b8250fab6 100644
--- a/Aaru.Tests/Images/QEMU/Raw.cs
+++ b/Aaru.Tests/Images/QEMU/Raw.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.QEMU
     [TestFixture]
     public class Raw : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "raw");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "raw");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/QEMU/VMware5.cs b/Aaru.Tests/Images/QEMU/VMware5.cs
index 7a2c76e1b..8cd95dfd0 100644
--- a/Aaru.Tests/Images/QEMU/VMware5.cs
+++ b/Aaru.Tests/Images/QEMU/VMware5.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.QEMU
     public class VMware5 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VMware 5");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "VMware 5");
         public override IMediaImage _plugin => new VMware();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/QEMU/VMware6.cs b/Aaru.Tests/Images/QEMU/VMware6.cs
index d7ad4f049..694f83dd9 100644
--- a/Aaru.Tests/Images/QEMU/VMware6.cs
+++ b/Aaru.Tests/Images/QEMU/VMware6.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.QEMU
     public class VMware6 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VMware 6");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "VMware 6");
         public override IMediaImage _plugin => new VMware();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/QEMU/VirtualBox.cs b/Aaru.Tests/Images/QEMU/VirtualBox.cs
index e0505c6d8..93f521e25 100644
--- a/Aaru.Tests/Images/QEMU/VirtualBox.cs
+++ b/Aaru.Tests/Images/QEMU/VirtualBox.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.QEMU
     public class VirtualBox : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VirtualBox");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "VirtualBox");
         public override IMediaImage _plugin => new Vdi();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/QEMU/VirtualPC.cs b/Aaru.Tests/Images/QEMU/VirtualPC.cs
index 9dd1c6382..e573b5c1f 100644
--- a/Aaru.Tests/Images/QEMU/VirtualPC.cs
+++ b/Aaru.Tests/Images/QEMU/VirtualPC.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.QEMU
     public class VirtualPC : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VirtualPC");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "QEMU", "VirtualPC");
         public override IMediaImage _plugin => new Vhd();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/RayDIM.cs b/Aaru.Tests/Images/RayDIM.cs
index cec23aa51..5a472fde5 100644
--- a/Aaru.Tests/Images/RayDIM.cs
+++ b/Aaru.Tests/Images/RayDIM.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images
     public class RayDIM : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Disk IMage Archiver");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "Disk IMage Archiver");
         public override IMediaImage _plugin => new RayDim();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/RsIde.cs b/Aaru.Tests/Images/RsIde.cs
index e8b8af7be..e72e9d4cd 100644
--- a/Aaru.Tests/Images/RsIde.cs
+++ b/Aaru.Tests/Images/RsIde.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class RsIde : BlockMediaImageTest
     {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "RS-IDE");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "RS-IDE");
         public override IMediaImage _plugin    => new DiscImages.RsIde();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/SaveDskF.cs b/Aaru.Tests/Images/SaveDskF.cs
index 7887c7bde..0406746f0 100644
--- a/Aaru.Tests/Images/SaveDskF.cs
+++ b/Aaru.Tests/Images/SaveDskF.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class SaveDskF : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "SaveDskF");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "SaveDskF");
         public override IMediaImage _plugin => new DiscImages.SaveDskF();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
index 9a89a7807..e95eff46b 100644
--- a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.ShrinkWrap
     public class DiskCopy42 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "DiskCopy 4.2");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "ShrinkWrap 3", "DiskCopy 4.2");
         public override IMediaImage _plugin => new DiscImages.DiskCopy42();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
index 2aaab3fb1..0ee8aafc6 100644
--- a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.ShrinkWrap
     public class DiskDup : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "DiskDup+");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "ShrinkWrap 3", "DiskDup+");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
index 654e68717..69bf0f166 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
     [TestFixture]
     public class ROCo : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "ShrinkWrap 3",
                                                           "NDIF", "DiskCopy compression");
         public override IMediaImage _plugin => new Ndif();
 
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
index 311ca1274..a00be9ded 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
     [TestFixture]
     public class RdWr : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "ShrinkWrap 3",
                                                           "NDIF", "No compression", "No encryption");
         public override IMediaImage _plugin => new Ndif();
 
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
index da5e4fec8..3f2842a5b 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.ShrinkWrap.NDIF
     [TestFixture]
     public class Rdxx : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3",
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "ShrinkWrap 3",
                                                           "NDIF", "Simple compression");
         public override IMediaImage _plugin => new Ndif();
 
diff --git a/Aaru.Tests/Images/ShrinkWrap/Raw.cs b/Aaru.Tests/Images/ShrinkWrap/Raw.cs
index d3fb6f527..34cb6e50f 100644
--- a/Aaru.Tests/Images/ShrinkWrap/Raw.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/Raw.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.ShrinkWrap
     public class Raw : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "raw");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "ShrinkWrap 3", "raw");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/TeleDisk.cs b/Aaru.Tests/Images/TeleDisk.cs
index 3fd26fad7..4ae399d93 100644
--- a/Aaru.Tests/Images/TeleDisk.cs
+++ b/Aaru.Tests/Images/TeleDisk.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class TeleDisk : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "TeleDisk");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "TeleDisk");
         public override IMediaImage _plugin => new DiscImages.TeleDisk();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/Toast.cs b/Aaru.Tests/Images/Toast.cs
index be0725982..eba23f1bf 100644
--- a/Aaru.Tests/Images/Toast.cs
+++ b/Aaru.Tests/Images/Toast.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class Toast : OpticalMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Roxio Toast");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "Roxio Toast");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/UltraISO/Alcohol.cs b/Aaru.Tests/Images/UltraISO/Alcohol.cs
index 25f5c0dd7..bf68f610c 100644
--- a/Aaru.Tests/Images/UltraISO/Alcohol.cs
+++ b/Aaru.Tests/Images/UltraISO/Alcohol.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.UltraISO
     public class Alcohol : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Alcohol");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "UltraISO", "Alcohol");
         public override IMediaImage _plugin => new DiscImages.Alcohol120();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/UltraISO/CloneCD.cs b/Aaru.Tests/Images/UltraISO/CloneCD.cs
index 3b32e84c0..6a5b4faec 100644
--- a/Aaru.Tests/Images/UltraISO/CloneCD.cs
+++ b/Aaru.Tests/Images/UltraISO/CloneCD.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.UltraISO
     public class CloneCD : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "CloneCD");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "UltraISO", "CloneCD");
         public override IMediaImage _plugin => new CloneCd();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/UltraISO/Cuesheet.cs b/Aaru.Tests/Images/UltraISO/Cuesheet.cs
index f86c61af3..f9038a628 100644
--- a/Aaru.Tests/Images/UltraISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/UltraISO/Cuesheet.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.UltraISO
     public class Cuesheet : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Cuesheet");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "UltraISO", "Cuesheet");
         public override IMediaImage _plugin => new CdrWin();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/UltraISO/Nero.cs b/Aaru.Tests/Images/UltraISO/Nero.cs
index d7c26aeb2..85239a3d1 100644
--- a/Aaru.Tests/Images/UltraISO/Nero.cs
+++ b/Aaru.Tests/Images/UltraISO/Nero.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.UltraISO
     public class Nero : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Nero");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "UltraISO", "Nero");
         public override IMediaImage _plugin => new DiscImages.Nero();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/Virtual98.cs b/Aaru.Tests/Images/Virtual98.cs
index ef279ad22..5561af041 100644
--- a/Aaru.Tests/Images/Virtual98.cs
+++ b/Aaru.Tests/Images/Virtual98.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class Virtual98 : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Virtual98");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "Virtual98");
         public override IMediaImage _plugin => new DiscImages.Virtual98();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
index 8bcdc02d8..d3610b451 100644
--- a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
+++ b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.VirtualBox
     public class VirtualPc : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualBox", "VirtualPC");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "VirtualBox", "VirtualPC");
         public override IMediaImage _plugin => new Vhd();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/VirtualPC/Raw.cs b/Aaru.Tests/Images/VirtualPC/Raw.cs
index bf4967631..3e4214c5b 100644
--- a/Aaru.Tests/Images/VirtualPC/Raw.cs
+++ b/Aaru.Tests/Images/VirtualPC/Raw.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.VirtualPC
     [TestFixture]
     public class Raw : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "VirtualPC");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
index a73fea818..6ae58ccd1 100644
--- a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
+++ b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.VirtualPC
     [TestFixture]
     public class VirtualPc : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "VirtualPC");
         public override IMediaImage _plugin => new Vhd();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/cdrdao/cooked/nosub.cs b/Aaru.Tests/Images/cdrdao/cooked/nosub.cs
index 7502fa8ba..bcd87d47f 100644
--- a/Aaru.Tests/Images/cdrdao/cooked/nosub.cs
+++ b/Aaru.Tests/Images/cdrdao/cooked/nosub.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked
     public class nosub : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "nosub");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "cdrdao", "cooked", "nosub");
         public override IMediaImage _plugin => new Cdrdao();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/cdrdao/cooked/rw.cs b/Aaru.Tests/Images/cdrdao/cooked/rw.cs
index 9d06af2b7..2551e12e8 100644
--- a/Aaru.Tests/Images/cdrdao/cooked/rw.cs
+++ b/Aaru.Tests/Images/cdrdao/cooked/rw.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked
     public class rw : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "rw");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "cdrdao", "cooked", "rw");
         public override IMediaImage _plugin => new Cdrdao();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs b/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
index 22cf050c7..6e6f18d0b 100644
--- a/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
+++ b/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked
     public class rw_raw : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "rw_raw");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "cdrdao", "cooked", "rw_raw");
         public override IMediaImage _plugin => new Cdrdao();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/cdrdao/raw/nosub.cs b/Aaru.Tests/Images/cdrdao/raw/nosub.cs
index 638391493..9b14b0036 100644
--- a/Aaru.Tests/Images/cdrdao/raw/nosub.cs
+++ b/Aaru.Tests/Images/cdrdao/raw/nosub.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.cdrdao.raw
     public class nosub : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "nosub");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "cdrdao", "raw", "nosub");
         public override IMediaImage _plugin => new Cdrdao();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/cdrdao/raw/rw.cs b/Aaru.Tests/Images/cdrdao/raw/rw.cs
index 48ae9aadb..91b0f3650 100644
--- a/Aaru.Tests/Images/cdrdao/raw/rw.cs
+++ b/Aaru.Tests/Images/cdrdao/raw/rw.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.cdrdao.raw
     public class rw : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "rw");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "cdrdao", "raw", "rw");
         public override IMediaImage _plugin => new Cdrdao();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs b/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs
index fa8964d32..abd7667c4 100644
--- a/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs
+++ b/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.cdrdao.raw
     public class rw_raw : OpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "rw_raw");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "cdrdao", "raw", "rw_raw");
         public override IMediaImage _plugin => new Cdrdao();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/partclone.cs b/Aaru.Tests/Images/partclone.cs
index 62016b37c..dfc600455 100644
--- a/Aaru.Tests/Images/partclone.cs
+++ b/Aaru.Tests/Images/partclone.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images
     [TestFixture]
     public class Partclone : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "partclone");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "partclone");
         public override IMediaImage _plugin => new PartClone();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/pce/DiskCopy42.cs b/Aaru.Tests/Images/pce/DiskCopy42.cs
index cceb712ea..d375cfe35 100644
--- a/Aaru.Tests/Images/pce/DiskCopy42.cs
+++ b/Aaru.Tests/Images/pce/DiskCopy42.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.pce
     public class DiskCopy42 : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "DiskCopy 4.2");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "pce", "DiskCopy 4.2");
         public override IMediaImage _plugin => new DiscImages.DiskCopy42();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/pce/ImageDisk.cs b/Aaru.Tests/Images/pce/ImageDisk.cs
index 48a830398..4cf3bc542 100644
--- a/Aaru.Tests/Images/pce/ImageDisk.cs
+++ b/Aaru.Tests/Images/pce/ImageDisk.cs
@@ -38,7 +38,7 @@ namespace Aaru.Tests.Images.pce
     public class ImageDisk : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "ImageDisk");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "pce", "ImageDisk");
         public override IMediaImage _plugin => new Imd();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/pce/TeleDisk.cs b/Aaru.Tests/Images/pce/TeleDisk.cs
index cc8c8df44..6f4bb1245 100644
--- a/Aaru.Tests/Images/pce/TeleDisk.cs
+++ b/Aaru.Tests/Images/pce/TeleDisk.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.pce
     public class TeleDisk : BlockMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "TeleDisk");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "pce", "TeleDisk");
         public override IMediaImage _plugin => new DiscImages.TeleDisk();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/pce/XDF.cs b/Aaru.Tests/Images/pce/XDF.cs
index a24d852bd..846db3b1b 100644
--- a/Aaru.Tests/Images/pce/XDF.cs
+++ b/Aaru.Tests/Images/pce/XDF.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.pce
     [TestFixture]
     public class XDF : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "XDF");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "pce", "XDF");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Images/pce/raw.cs b/Aaru.Tests/Images/pce/raw.cs
index c11987233..8fce1e20f 100644
--- a/Aaru.Tests/Images/pce/raw.cs
+++ b/Aaru.Tests/Images/pce/raw.cs
@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.pce
     [TestFixture]
     public class Raw : BlockMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "raw");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Media image formats", "pce", "raw");
         public override IMediaImage _plugin => new ZZZRawImage();
 
         public override BlockImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Issues/176.cs b/Aaru.Tests/Issues/176.cs
index ecb910bc1..b1df1191d 100644
--- a/Aaru.Tests/Issues/176.cs
+++ b/Aaru.Tests/Issues/176.cs
@@ -17,7 +17,7 @@ namespace Aaru.Tests.Issues
     [TestFixture]
     public class _176 : OpticalImageReadIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue176");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue176");
         public override string TestFile   => "WEBBEARS.mds";
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/257.cs b/Aaru.Tests/Issues/257.cs
index 2421c3705..700dec7ce 100644
--- a/Aaru.Tests/Issues/257.cs
+++ b/Aaru.Tests/Issues/257.cs
@@ -20,7 +20,7 @@ namespace Aaru.Tests.Issues
     public class _257 : OpticalImageConvertIssueTest
     {
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue257");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue257");
         public override string InputPath => "TempImage.nrg.xz";
         public override string SuggestedOutputFilename => "AaruIssue257Output.iso";
         public override IWritableImage OutputFormat => new ZZZRawImage();
diff --git a/Aaru.Tests/Issues/263/AaruFormat.cs b/Aaru.Tests/Issues/263/AaruFormat.cs
index 95e71ee7f..84c84d536 100644
--- a/Aaru.Tests/Issues/263/AaruFormat.cs
+++ b/Aaru.Tests/Issues/263/AaruFormat.cs
@@ -16,7 +16,7 @@ namespace Aaru.Tests.Issues._263
     // 20200309 CLAUNIA: Fixed in 3b2bb0ebf0c6c615c5622aebff494ed34b51055d
     public class AaruFormat : FsExtractIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue263");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue263");
         public override string TestFile => "Sony1.dicf";
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override bool Debug => true;
diff --git a/Aaru.Tests/Issues/263/Raw.cs b/Aaru.Tests/Issues/263/Raw.cs
index 010c1fc3d..ffb8a81dd 100644
--- a/Aaru.Tests/Issues/263/Raw.cs
+++ b/Aaru.Tests/Issues/263/Raw.cs
@@ -16,7 +16,7 @@ namespace Aaru.Tests.Issues._263
     // 20200309 CLAUNIA: Fixed in 3b2bb0ebf0c6c615c5622aebff494ed34b51055d
     public class Raw : FsExtractIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue263");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue263");
         public override string TestFile => "Sony2.iso";
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override bool Debug => true;
diff --git a/Aaru.Tests/Issues/266.cs b/Aaru.Tests/Issues/266.cs
index 79205619a..3e9c4f88c 100644
--- a/Aaru.Tests/Issues/266.cs
+++ b/Aaru.Tests/Issues/266.cs
@@ -17,7 +17,7 @@ namespace Aaru.Tests.Issues
     // 20200309 CLAUNIA: Fixed in 3b2bb0ebf0c6c615c5622aebff494ed34b51055d
     public class _266 : FsExtractHashIssueTest
     {
-        protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue266");
+        protected override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue266");
         protected override string TestFile => "Namco (USA) (2005 Assets).cue";
         protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         protected override bool Debug => false;
diff --git a/Aaru.Tests/Issues/286.cs b/Aaru.Tests/Issues/286.cs
index 390529d26..aa704f84a 100644
--- a/Aaru.Tests/Issues/286.cs
+++ b/Aaru.Tests/Issues/286.cs
@@ -16,7 +16,7 @@ namespace Aaru.Tests.Issues
     public class _286 : OpticalImageConvertIssueTest
     {
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue286");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue286");
         public override string InputPath => "2d_house_of_terror.nrg";
         public override string SuggestedOutputFilename => "AaruTestIssue286.aif";
         public override IWritableImage OutputFormat => new AaruFormat();
diff --git a/Aaru.Tests/Issues/288/18Wheeler.cs b/Aaru.Tests/Issues/288/18Wheeler.cs
index 4035cb10f..8789b8cd4 100644
--- a/Aaru.Tests/Issues/288/18Wheeler.cs
+++ b/Aaru.Tests/Issues/288/18Wheeler.cs
@@ -15,7 +15,7 @@ namespace Aaru.Tests.Issues._288
     {
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue288", "18wheeler");
+            Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue288", "18wheeler");
         public override string         InputPath => "18 Wheeler - American Pro Trucker v1.500 (2001)(Sega)(US)[!].gdi";
         public override string         SuggestedOutputFilename => "AaruTestIssue288_18wheeler.aif";
         public override IWritableImage OutputFormat => new AaruFormat();
diff --git a/Aaru.Tests/Issues/288/ArcadeHits.cs b/Aaru.Tests/Issues/288/ArcadeHits.cs
index 4f027c03b..4161487f6 100644
--- a/Aaru.Tests/Issues/288/ArcadeHits.cs
+++ b/Aaru.Tests/Issues/288/ArcadeHits.cs
@@ -15,7 +15,7 @@ namespace Aaru.Tests.Issues._288
     {
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue288", "arcadehits");
+            Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue288", "arcadehits");
         public override string InputPath =>
             "Midway's Greatest Arcade Hits Volume 1 v1.001 (2000)(Midway)(US)[!][compilation].gdi";
         public override string         SuggestedOutputFilename => "AaruTestIssue288_arcadehits.aif";
diff --git a/Aaru.Tests/Issues/288/Roadsters.cs b/Aaru.Tests/Issues/288/Roadsters.cs
index 4e7fa4cbe..fc177aa2c 100644
--- a/Aaru.Tests/Issues/288/Roadsters.cs
+++ b/Aaru.Tests/Issues/288/Roadsters.cs
@@ -15,7 +15,7 @@ namespace Aaru.Tests.Issues._288
     {
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue288", "roadsters");
+            Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue288", "roadsters");
         public override string         InputPath               => "Roadsters (USA).cue";
         public override string         SuggestedOutputFilename => "AaruTestIssue288_roadsters.aif";
         public override IWritableImage OutputFormat            => new AaruFormat();
diff --git a/Aaru.Tests/Issues/299.cs b/Aaru.Tests/Issues/299.cs
index 32de6b575..10fd49e39 100644
--- a/Aaru.Tests/Issues/299.cs
+++ b/Aaru.Tests/Issues/299.cs
@@ -14,7 +14,7 @@ namespace Aaru.Tests.Issues
     public class _299 : OpticalImageConvertIssueTest
     {
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Pending", "issue299");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Pending", "issue299");
         public override string InputPath => "2d_house_of_terror.cdi";
         public override string SuggestedOutputFilename => "AaruTestIssue299.aif";
         public override IWritableImage OutputFormat => new AaruFormat();
diff --git a/Aaru.Tests/Issues/300.cs b/Aaru.Tests/Issues/300.cs
index 20029e910..3077b5a31 100644
--- a/Aaru.Tests/Issues/300.cs
+++ b/Aaru.Tests/Issues/300.cs
@@ -21,7 +21,7 @@ namespace Aaru.Tests.Issues
     // 20200309 CLAUNIA: Fixed in 48f067d79ff30cfd10e084085ff479bbb0939512
     public class _300 : FsExtractHashIssueTest
     {
-        protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue300");
+        protected override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue300");
         protected override string TestFile => "sony.dicf";
         protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         protected override bool Debug => true;
diff --git a/Aaru.Tests/Issues/325.cs b/Aaru.Tests/Issues/325.cs
index 51e3ae6be..b590cfe9a 100644
--- a/Aaru.Tests/Issues/325.cs
+++ b/Aaru.Tests/Issues/325.cs
@@ -15,7 +15,7 @@ namespace Aaru.Tests.Issues
     [TestFixture]
     public class _325 : OpticalImageReadIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue325");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue325");
         public override string TestFile   => "TEST.cue";
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/338.cs b/Aaru.Tests/Issues/338.cs
index ff2854ecb..237695151 100644
--- a/Aaru.Tests/Issues/338.cs
+++ b/Aaru.Tests/Issues/338.cs
@@ -13,7 +13,7 @@ namespace Aaru.Tests.Issues
     [TestFixture]
     public class _338 : OpticalImageReadIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue338");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue338");
         public override string TestFile   => "TempImage.nrg.xz";
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/358.cs b/Aaru.Tests/Issues/358.cs
index 84a880b6d..23d3213b3 100644
--- a/Aaru.Tests/Issues/358.cs
+++ b/Aaru.Tests/Issues/358.cs
@@ -16,7 +16,7 @@ namespace Aaru.Tests.Issues
     // 20200621 CLAUNIA: Fixed in 83a28237fab9e21b23bd43eb91b5b29f1bf9f220
     public class _358 : FsExtractHashIssueTest
     {
-        protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue358");
+        protected override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue358");
         protected override string TestFile => "cdi.aif";
         protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         protected override bool Debug => false;
diff --git a/Aaru.Tests/Issues/360.cs b/Aaru.Tests/Issues/360.cs
index f8ae0c697..abe4179ec 100644
--- a/Aaru.Tests/Issues/360.cs
+++ b/Aaru.Tests/Issues/360.cs
@@ -14,7 +14,7 @@ namespace Aaru.Tests.Issues
     // 20210307 CLAUNIA: Reopened
     public class _360 : FsExtractIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue360");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue360");
         public override string TestFile => "AAAA.iso.xz";
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override bool Debug => true;
diff --git a/Aaru.Tests/Issues/379.cs b/Aaru.Tests/Issues/379.cs
index 48983bc2c..aceac0b49 100644
--- a/Aaru.Tests/Issues/379.cs
+++ b/Aaru.Tests/Issues/379.cs
@@ -18,7 +18,7 @@ namespace Aaru.Tests.Issues
     public class _379 : OpticalImageConvertIssueTest
     {
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue379");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue379");
         public override string InputPath => "Sony USB Driver.B6T";
         public override string SuggestedOutputFilename => "AaruIssue379Output.aif";
         public override IWritableImage OutputFormat => new AaruFormat();
diff --git a/Aaru.Tests/Issues/398.cs b/Aaru.Tests/Issues/398.cs
index e9be5fec1..cb54b43b7 100644
--- a/Aaru.Tests/Issues/398.cs
+++ b/Aaru.Tests/Issues/398.cs
@@ -17,7 +17,7 @@ namespace Aaru.Tests.Issues
     public class _398 : OpticalImageConvertIssueTest
     {
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue398");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue398");
         public override string InputPath => "sonycdi.cdi.xz";
         public override string SuggestedOutputFilename => "AaruIssue398Output.aif";
         public override IWritableImage OutputFormat => new AaruFormat();
diff --git a/Aaru.Tests/Issues/410.cs b/Aaru.Tests/Issues/410.cs
index bdc11d309..e5bd58f9b 100644
--- a/Aaru.Tests/Issues/410.cs
+++ b/Aaru.Tests/Issues/410.cs
@@ -21,7 +21,7 @@ namespace Aaru.Tests.Issues
     // 20201106 CLAUNIA: Fixed in d30a6d18cd1f6d8b9075f096bd56e23fc5106dbf
     public class _410 : FsExtractIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue410");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue410");
         public override string TestFile => "cyberstorm.mds";
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override bool Debug => false;
diff --git a/Aaru.Tests/Issues/411.cs b/Aaru.Tests/Issues/411.cs
index 5a65189d5..d4c7411ff 100644
--- a/Aaru.Tests/Issues/411.cs
+++ b/Aaru.Tests/Issues/411.cs
@@ -21,7 +21,7 @@ namespace Aaru.Tests.Issues
     // 20201106 CLAUNIA: Fixed in d30a6d18cd1f6d8b9075f096bd56e23fc5106dbf
     public class _411 : FsExtractIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue411");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue411");
         public override string TestFile => "CD02 - Master Quiz - Das total abgeflogene Quiz.mds";
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override bool Debug => false;
diff --git a/Aaru.Tests/Issues/441.cs b/Aaru.Tests/Issues/441.cs
index a23a2f1b6..980904031 100644
--- a/Aaru.Tests/Issues/441.cs
+++ b/Aaru.Tests/Issues/441.cs
@@ -13,7 +13,7 @@ namespace Aaru.Tests.Issues
 
     public class _441 : FsExtractIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue441");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue441");
         public override string TestFile => "Zip-100_aaru_5.2.aaruf";
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override bool Debug => true;
diff --git a/Aaru.Tests/Issues/448.cs b/Aaru.Tests/Issues/448.cs
index 85ffe679e..1aefa028d 100644
--- a/Aaru.Tests/Issues/448.cs
+++ b/Aaru.Tests/Issues/448.cs
@@ -8,7 +8,7 @@ namespace Aaru.Tests.Issues
 {
     public class _448 : OpticalMediaImageTest
     {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Pending", "issue448");
+        public override string      DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Pending", "issue448");
         public override IMediaImage _plugin    => new BlindWrite5();
 
         public override OpticalImageTestExpected[] Tests => new[]
diff --git a/Aaru.Tests/Issues/449.cs b/Aaru.Tests/Issues/449.cs
index b0c558e86..58d6c7753 100644
--- a/Aaru.Tests/Issues/449.cs
+++ b/Aaru.Tests/Issues/449.cs
@@ -9,7 +9,7 @@ namespace Aaru.Tests.Issues
 
     public class _449 : OpticalImageReadIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue449");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue449");
         public override string TestFile   => "NRG-Nero_Burning_ROM4.nrg";
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/450.cs b/Aaru.Tests/Issues/450.cs
index 286e0304e..11cc15512 100644
--- a/Aaru.Tests/Issues/450.cs
+++ b/Aaru.Tests/Issues/450.cs
@@ -13,7 +13,7 @@ namespace Aaru.Tests.Issues
     public class _450 : OpticalImageConvertIssueTest
     {
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue450");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue450");
         public override string InputPath => "NRG-Nero_Burning_ROM7.nrg";
         public override string SuggestedOutputFilename => "AaruTestIssue450.aif";
         public override IWritableImage OutputFormat => new AaruFormat();
diff --git a/Aaru.Tests/Issues/495.cs b/Aaru.Tests/Issues/495.cs
index 2a80cede5..fafd85044 100644
--- a/Aaru.Tests/Issues/495.cs
+++ b/Aaru.Tests/Issues/495.cs
@@ -12,7 +12,7 @@ namespace Aaru.Tests.Issues
 
     public class _495 : FsExtractIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue495");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue495");
         public override string TestFile => "NetworkCD.aaruf";
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override bool Debug => false;
diff --git a/Aaru.Tests/Issues/531.cs b/Aaru.Tests/Issues/531.cs
index 295e04b1e..8ed656d25 100644
--- a/Aaru.Tests/Issues/531.cs
+++ b/Aaru.Tests/Issues/531.cs
@@ -13,7 +13,7 @@ namespace Aaru.Tests.Issues
 
     public class _531 : FsExtractIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue531");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue531");
         public override string TestFile => "DVD-RAM-GEN1_aaru_5.3.aaruf";
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override bool Debug => true;
diff --git a/Aaru.Tests/Issues/542/Sims.cs b/Aaru.Tests/Issues/542/Sims.cs
index 5e4ba8343..74f8dda16 100644
--- a/Aaru.Tests/Issues/542/Sims.cs
+++ b/Aaru.Tests/Issues/542/Sims.cs
@@ -15,7 +15,7 @@ namespace Aaru.Tests.Issues._542
     public class Sims : FsExtractHashIssueTest
     {
         protected override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue542", "sims");
+            Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue542", "sims");
         protected override string                     TestFile         => "The Sims.aaruf";
         protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
         protected override bool                       Debug            => false;
diff --git a/Aaru.Tests/Issues/542/SimsEP.cs b/Aaru.Tests/Issues/542/SimsEP.cs
index b899df03c..a7238ed68 100644
--- a/Aaru.Tests/Issues/542/SimsEP.cs
+++ b/Aaru.Tests/Issues/542/SimsEP.cs
@@ -15,7 +15,7 @@ namespace Aaru.Tests.Issues._542
     public class SimsEP : FsExtractHashIssueTest
     {
         protected override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue542", "exp");
+            Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue542", "exp");
         protected override string                     TestFile         => "THE_SIMS_EP.aaruf";
         protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
         protected override bool                       Debug            => false;
diff --git a/Aaru.Tests/Issues/584.cs b/Aaru.Tests/Issues/584.cs
index 4e1a4948b..531684162 100644
--- a/Aaru.Tests/Issues/584.cs
+++ b/Aaru.Tests/Issues/584.cs
@@ -12,7 +12,7 @@ namespace Aaru.Tests.Issues
 
     public class _584 : FsExtractIssueTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue584");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue584");
         public override string TestFile => "001-Disquette_issue_584.img";
         public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         public override bool Debug => false;
diff --git a/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs b/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs
index 9993dc525..3d9f11580 100644
--- a/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs
+++ b/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs
@@ -14,7 +14,7 @@ namespace Aaru.Tests.Issues._590
 
     public class asus_driver_gpu_tweak_v1231_2014 : FsExtractHashIssueTest
     {
-        protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue590",
+        protected override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue590",
                                                              "asus-driver-gpu-tweak-v1231-2014");
         protected override string                     TestFile         => "V1231.aaruf";
         protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
diff --git a/Aaru.Tests/Issues/590/m5a99fx.cs b/Aaru.Tests/Issues/590/m5a99fx.cs
index 907fd5568..5c0f3b864 100644
--- a/Aaru.Tests/Issues/590/m5a99fx.cs
+++ b/Aaru.Tests/Issues/590/m5a99fx.cs
@@ -15,7 +15,7 @@ namespace Aaru.Tests.Issues._590
     public class m5a99fx : FsExtractHashIssueTest
     {
         protected override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue590", "m5a99fx");
+            Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue590", "m5a99fx");
         protected override string                     TestFile         => "MB Support CD.aaruf";
         protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
         protected override bool                       Debug            => false;
diff --git a/Aaru.Tests/Issues/590/win3.cs b/Aaru.Tests/Issues/590/win3.cs
index 51703fcdc..68182b0be 100644
--- a/Aaru.Tests/Issues/590/win3.cs
+++ b/Aaru.Tests/Issues/590/win3.cs
@@ -15,7 +15,7 @@ namespace Aaru.Tests.Issues._590
     public class win3 : FsExtractHashIssueTest
     {
         protected override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue590", "win3");
+            Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue590", "win3");
         protected override string TestFile => "microsoft-windows-3.0-international-versions-promotional-copy.aif";
         protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
         protected override bool Debug => false;
diff --git a/Aaru.Tests/Issues/623.cs b/Aaru.Tests/Issues/623.cs
index 932a1e2c3..37e2cd978 100644
--- a/Aaru.Tests/Issues/623.cs
+++ b/Aaru.Tests/Issues/623.cs
@@ -8,7 +8,7 @@ namespace Aaru.Tests.Issues
 {
     public class _623 : WritableOpticalMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue623");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue623");
         public override IMediaImage InputPlugin => new AaruFormat();
         public override IWritableImage OutputPlugin => new Alcohol120();
         public override string OutputExtension => "mds";
diff --git a/Aaru.Tests/Issues/624.cs b/Aaru.Tests/Issues/624.cs
index 9b295a271..ac1cddde5 100644
--- a/Aaru.Tests/Issues/624.cs
+++ b/Aaru.Tests/Issues/624.cs
@@ -8,7 +8,7 @@ namespace Aaru.Tests.Issues
 {
     public class _624 : WritableOpticalMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Pending", "issue624");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Pending", "issue624");
         public override IMediaImage InputPlugin => new ZZZRawImage();
         public override IWritableImage OutputPlugin => new Alcohol120();
         public override string OutputExtension => "mds";
diff --git a/Aaru.Tests/Issues/625.cs b/Aaru.Tests/Issues/625.cs
index 147a1d74b..264f5225f 100644
--- a/Aaru.Tests/Issues/625.cs
+++ b/Aaru.Tests/Issues/625.cs
@@ -8,7 +8,7 @@ namespace Aaru.Tests.Issues
 {
     public class _625 : WritableOpticalMediaImageTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue625");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Issues", "Fixed", "issue625");
         public override IMediaImage InputPlugin => new Cdrdao();
         public override IWritableImage OutputPlugin => new CloneCd();
         public override string OutputExtension => "mds";
diff --git a/Aaru.Tests/Partitions/Acorn.cs b/Aaru.Tests/Partitions/Acorn.cs
index c3d4ebba5..220ebf1c3 100644
--- a/Aaru.Tests/Partitions/Acorn.cs
+++ b/Aaru.Tests/Partitions/Acorn.cs
@@ -35,7 +35,7 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Acorn : PartitionSchemeTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Acorn");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Acorn");
 
         public override PartitionTest[] Tests => new[]
         {
diff --git a/Aaru.Tests/Partitions/AppleMap.cs b/Aaru.Tests/Partitions/AppleMap.cs
index c34e49a64..a4ae45941 100644
--- a/Aaru.Tests/Partitions/AppleMap.cs
+++ b/Aaru.Tests/Partitions/AppleMap.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Partitions
     public class AppleMap : PartitionSchemeTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Apple Partition Map");
+            Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Apple Partition Map");
         public override PartitionTest[] Tests => new[]
         {
             new PartitionTest
diff --git a/Aaru.Tests/Partitions/Atari.cs b/Aaru.Tests/Partitions/Atari.cs
index bd78f3fae..b0b4ea533 100644
--- a/Aaru.Tests/Partitions/Atari.cs
+++ b/Aaru.Tests/Partitions/Atari.cs
@@ -35,7 +35,7 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Atari : PartitionSchemeTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Atari ST");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Atari ST");
         public override PartitionTest[] Tests => new[]
         {
             new PartitionTest
diff --git a/Aaru.Tests/Partitions/BSD.cs b/Aaru.Tests/Partitions/BSD.cs
index 07ecdf134..1dd41fb3c 100644
--- a/Aaru.Tests/Partitions/BSD.cs
+++ b/Aaru.Tests/Partitions/BSD.cs
@@ -35,7 +35,7 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Bsd : PartitionSchemeTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "BSD slices");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "BSD slices");
 
         public override PartitionTest[] Tests => new[]
         {
diff --git a/Aaru.Tests/Partitions/GPT.cs b/Aaru.Tests/Partitions/GPT.cs
index 079224476..68059e8fd 100644
--- a/Aaru.Tests/Partitions/GPT.cs
+++ b/Aaru.Tests/Partitions/GPT.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Partitions
     public class Gpt : PartitionSchemeTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "GUID Partition Table");
+            Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "GUID Partition Table");
 
         public override PartitionTest[] Tests => new[]
         {
diff --git a/Aaru.Tests/Partitions/MBR.cs b/Aaru.Tests/Partitions/MBR.cs
index 42754cdea..25e2e8c63 100644
--- a/Aaru.Tests/Partitions/MBR.cs
+++ b/Aaru.Tests/Partitions/MBR.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Partitions
     public class Mbr : PartitionSchemeTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Master Boot Record");
+            Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Master Boot Record");
 
         public override PartitionTest[] Tests => new[]
         {
diff --git a/Aaru.Tests/Partitions/MINIX.cs b/Aaru.Tests/Partitions/MINIX.cs
index 80741d175..6c015b354 100644
--- a/Aaru.Tests/Partitions/MINIX.cs
+++ b/Aaru.Tests/Partitions/MINIX.cs
@@ -35,7 +35,7 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Minix : PartitionSchemeTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "MINIX");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "MINIX");
 
         public override PartitionTest[] Tests => new[]
         {
diff --git a/Aaru.Tests/Partitions/PC98.cs b/Aaru.Tests/Partitions/PC98.cs
index 827ab97a9..5acf9542e 100644
--- a/Aaru.Tests/Partitions/PC98.cs
+++ b/Aaru.Tests/Partitions/PC98.cs
@@ -35,7 +35,7 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Pc98 : PartitionSchemeTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "PC-98");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "PC-98");
 
         public override PartitionTest[] Tests => new[]
         {
diff --git a/Aaru.Tests/Partitions/RDB.cs b/Aaru.Tests/Partitions/RDB.cs
index 94562cd54..be191b564 100644
--- a/Aaru.Tests/Partitions/RDB.cs
+++ b/Aaru.Tests/Partitions/RDB.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Partitions
     public class Rdb : PartitionSchemeTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Rigid Disk Block");
+            Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Rigid Disk Block");
 
         public override PartitionTest[] Tests => new[]
         {
diff --git a/Aaru.Tests/Partitions/SGI.cs b/Aaru.Tests/Partitions/SGI.cs
index b0c164e96..aa0cd1728 100644
--- a/Aaru.Tests/Partitions/SGI.cs
+++ b/Aaru.Tests/Partitions/SGI.cs
@@ -35,7 +35,7 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Sgi : PartitionSchemeTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "SGI");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "SGI");
 
         public override PartitionTest[] Tests => new[]
         {
diff --git a/Aaru.Tests/Partitions/Sun.cs b/Aaru.Tests/Partitions/Sun.cs
index 571e76bc1..c8c5c427c 100644
--- a/Aaru.Tests/Partitions/Sun.cs
+++ b/Aaru.Tests/Partitions/Sun.cs
@@ -36,7 +36,7 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Sun : PartitionSchemeTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Sun");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Sun");
 
         public override PartitionTest[] Tests => new[]
         {
diff --git a/Aaru.Tests/Partitions/VTOC.cs b/Aaru.Tests/Partitions/VTOC.cs
index c78255df2..6ec5c86ca 100644
--- a/Aaru.Tests/Partitions/VTOC.cs
+++ b/Aaru.Tests/Partitions/VTOC.cs
@@ -35,7 +35,7 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Vtoc : PartitionSchemeTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "UNIX VTOC");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "UNIX VTOC");
 
         public override PartitionTest[] Tests => new[]
         {
diff --git a/Aaru.Tests/Partitions/Xbox.cs b/Aaru.Tests/Partitions/Xbox.cs
index 6f1c32c3c..8f7de52ec 100644
--- a/Aaru.Tests/Partitions/Xbox.cs
+++ b/Aaru.Tests/Partitions/Xbox.cs
@@ -35,7 +35,7 @@ namespace Aaru.Tests.Partitions
     [TestFixture]
     public class Xbox : PartitionSchemeTest
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Xbox");
+        public override string DataFolder => Path.Combine(Consts.TestFilesRoot, "Partitioning schemes", "Xbox");
 
         public override PartitionTest[] Tests => new[]
         {
diff --git a/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs b/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs
index f0d560664..b74e41dcf 100644
--- a/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs
@@ -7,7 +7,7 @@ namespace Aaru.Tests.WritableImages.AaruFormat.V1
     public class FromAaru : WritableOpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
         public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
         public override IWritableImage OutputPlugin    => new DiscImages.AaruFormat();
         public override string         OutputExtension => "aif";
diff --git a/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs b/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs
index 6d10511df..969ebbfb3 100644
--- a/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs
@@ -8,7 +8,7 @@ namespace Aaru.Tests.WritableImages.Alcohol
     public class FromAaru : WritableOpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
         public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
         public override IWritableImage OutputPlugin    => new Alcohol120();
         public override string         OutputExtension => "mds";
diff --git a/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs b/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs
index 57999e840..791d823b0 100644
--- a/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs
@@ -8,7 +8,7 @@ namespace Aaru.Tests.WritableImages.CDRDAO
     public class FromAaru : WritableOpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
         public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
         public override IWritableImage OutputPlugin    => new Cdrdao();
         public override string         OutputExtension => "toc";
diff --git a/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs b/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs
index 93165b6a6..587e19f12 100644
--- a/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs
@@ -8,7 +8,7 @@ namespace Aaru.Tests.WritableImages.CDRWin
     public class FromAaru : WritableOpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
         public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
         public override IWritableImage OutputPlugin    => new CdrWin();
         public override string         OutputExtension => "cue";
diff --git a/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs b/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs
index 585f201b4..c44afa6b5 100644
--- a/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs
@@ -8,7 +8,7 @@ namespace Aaru.Tests.WritableImages.CloneCD
     public class FromAaru : WritableOpticalMediaImageTest
     {
         public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+            Path.Combine(Consts.TestFilesRoot, "Media image formats", "AaruFormat", "V1");
         public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
         public override IWritableImage OutputPlugin    => new CloneCd();
         public override string         OutputExtension => "ccd";
diff --git a/CICMMetadata b/CICMMetadata
index 7944bca8e..c87240b80 160000
--- a/CICMMetadata
+++ b/CICMMetadata
@@ -1 +1 @@
-Subproject commit 7944bca8e6051f7294f19863a7447e40d797abf7
+Subproject commit c87240b80b2bbf62746013ef705f520ade6a0599