diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7b1375bc4..0596906c8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -132,7 +132,7 @@ jobs:
 
       - name: Run tests
         run: |
-          ctest --preset "$CMAKE_PRESET" --build-config "$BUILD_TYPE" --extra-verbose --output-on-failure
+          ctest --preset "$CMAKE_PRESET" --build-config "$BUILD_TYPE"
 
       ##
       # PACKAGE
diff --git a/CMakePresets.json b/CMakePresets.json
index 5e9ee8b39..f8496acb6 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -105,7 +105,7 @@
                 "lhs": "${hostSystemName}",
                 "rhs": "Darwin"
             },
-      "configurePreset": "macos"
+            "configurePreset": "macos"
         },
         {
             "name": "macos_universal",
@@ -141,7 +141,8 @@
             "name": "base",
             "hidden": true,
             "output": {
-                "outputOnFailure": true
+                "outputOnFailure": true,
+                "verbosity": "extra"
             },
             "execution": {
                 "noTestsAction": "error"
@@ -152,11 +153,11 @@
                 }
             }
         },
-      {
-          "name": "linux",
+        {
+            "name": "linux",
             "displayName": "Linux",
             "inherits": [
-              "base"
+                "base"
             ],
             "condition": {
                 "type": "equals",
@@ -165,11 +166,11 @@
             },
             "configurePreset": "linux"
         },
-      {
-          "name": "macos",
+        {
+            "name": "macos",
             "displayName": "macOS",
             "inherits": [
-              "base"
+                "base"
             ],
             "condition": {
                 "type": "equals",
@@ -178,11 +179,11 @@
             },
             "configurePreset": "macos"
         },
-      {
-          "name": "macos_universal",
+        {
+            "name": "macos_universal",
             "displayName": "macOS (Universal Binary)",
             "inherits": [
-              "base"
+                "base"
             ],
             "condition": {
                 "type": "equals",
@@ -191,11 +192,11 @@
             },
             "configurePreset": "macos_universal"
         },
-      {
-          "name": "windows_mingw",
+        {
+            "name": "windows_mingw",
             "displayName": "Windows (MinGW)",
             "inherits": [
-              "base"
+                "base"
             ],
             "condition": {
                 "type": "equals",
@@ -204,11 +205,11 @@
             },
             "configurePreset": "windows_mingw"
         },
-      {
-          "name": "windows_msvc",
+        {
+            "name": "windows_msvc",
             "displayName": "Windows (MSVC)",
             "inherits": [
-              "base"
+                "base"
             ],
             "condition": {
                 "type": "equals",
diff --git a/tests/Library_test.cpp b/tests/Library_test.cpp
index ba9283c37..4649bfe1b 100644
--- a/tests/Library_test.cpp
+++ b/tests/Library_test.cpp
@@ -73,7 +73,7 @@ class LibraryTest : public QObject {
     {
         cache.reset(new HttpMetaCache());
         cache->addBase("libraries", QDir("libraries").absolutePath());
-        dataDir = QDir(QFINDTESTDATA("testdata/Library")).absolutePath();
+        dataDir = QDir(QFINDTESTDATA("testdata/Libraries")).absolutePath();
     }
     void test_legacy()
     {
@@ -119,14 +119,14 @@ class LibraryTest : public QObject {
         QCOMPARE(test.isNative(), false);
         QStringList failedFiles;
         test.setHint("local");
-        auto downloads = test.getDownloads(r, cache.get(), failedFiles, QFINDTESTDATA("testdata/Library"));
+        auto downloads = test.getDownloads(r, cache.get(), failedFiles, QFINDTESTDATA("testdata/Libraries"));
         QCOMPARE(downloads.size(), 0);
         qDebug() << failedFiles;
         QCOMPARE(failedFiles.size(), 0);
 
         QStringList jar, native, native32, native64;
-        test.getApplicableFiles(r, jar, native, native32, native64, QFINDTESTDATA("testdata/Library"));
-        QCOMPARE(jar, { QFileInfo(QFINDTESTDATA("testdata/Library/codecwav-20101023.jar")).absoluteFilePath() });
+        test.getApplicableFiles(r, jar, native, native32, native64, QFINDTESTDATA("testdata/Libraries"));
+        QCOMPARE(jar, { QFileInfo(QFINDTESTDATA("testdata/Libraries/codecwav-20101023.jar")).absoluteFilePath() });
         QCOMPARE(native, {});
         QCOMPARE(native32, {});
         QCOMPARE(native64, {});
@@ -217,22 +217,23 @@ class LibraryTest : public QObject {
         test.setRepositoryURL("file://foo/bar");
         {
             QStringList jar, native, native32, native64;
-            test.getApplicableFiles(r, jar, native, native32, native64, QFINDTESTDATA("testdata/Library"));
+            test.getApplicableFiles(r, jar, native, native32, native64, QFINDTESTDATA("testdata/Libraries"));
             QCOMPARE(jar, {});
             QCOMPARE(native, {});
-            QCOMPARE(native32, { QFileInfo(QFINDTESTDATA("testdata/Library/testname-testversion-linux-32.jar")).absoluteFilePath() });
-            QCOMPARE(native64, { QFileInfo(QFINDTESTDATA("testdata/Library") + "/testname-testversion-linux-64.jar").absoluteFilePath() });
+            QCOMPARE(native32, { QFileInfo(QFINDTESTDATA("testdata/Libraries/testname-testversion-linux-32.jar")).absoluteFilePath() });
+            QCOMPARE(native64,
+                     { QFileInfo(QFINDTESTDATA("testdata/Libraries") + "/testname-testversion-linux-64.jar").absoluteFilePath() });
             QStringList failedFiles;
-            auto dls = test.getDownloads(r, cache.get(), failedFiles, QFINDTESTDATA("testdata/Library"));
+            auto dls = test.getDownloads(r, cache.get(), failedFiles, QFINDTESTDATA("testdata/Libraries"));
             QCOMPARE(dls.size(), 0);
             QCOMPARE(failedFiles,
-                     { QFileInfo(QFINDTESTDATA("testdata/Library") + "/testname-testversion-linux-64.jar").absoluteFilePath() });
+                     { QFileInfo(QFINDTESTDATA("testdata/Libraries") + "/testname-testversion-linux-64.jar").absoluteFilePath() });
         }
     }
     void test_onenine()
     {
         RuntimeContext r = dummyContext("osx");
-        auto test = readMojangJson(QFINDTESTDATA("testdata/Library/lib-simple.json"));
+        auto test = readMojangJson(QFINDTESTDATA("testdata/Libraries/lib-simple.json"));
         {
             QStringList jar, native, native32, native64;
             test->getApplicableFiles(r, jar, native, native32, native64, QString());
@@ -253,8 +254,8 @@ class LibraryTest : public QObject {
         test->setHint("local");
         {
             QStringList jar, native, native32, native64;
-            test->getApplicableFiles(r, jar, native, native32, native64, QFINDTESTDATA("testdata/Library"));
-            QCOMPARE(jar, { QFileInfo(QFINDTESTDATA("testdata/Library/codecwav-20101023.jar")).absoluteFilePath() });
+            test->getApplicableFiles(r, jar, native, native32, native64, QFINDTESTDATA("testdata/Libraries"));
+            QCOMPARE(jar, { QFileInfo(QFINDTESTDATA("testdata/Libraries/codecwav-20101023.jar")).absoluteFilePath() });
             QCOMPARE(native, {});
             QCOMPARE(native32, {});
             QCOMPARE(native64, {});
@@ -262,7 +263,7 @@ class LibraryTest : public QObject {
         r.system = "linux";
         {
             QStringList failedFiles;
-            auto dls = test->getDownloads(r, cache.get(), failedFiles, QFINDTESTDATA("testdata/Library"));
+            auto dls = test->getDownloads(r, cache.get(), failedFiles, QFINDTESTDATA("testdata/Libraries"));
             QCOMPARE(dls.size(), 0);
             QCOMPARE(failedFiles, {});
         }
@@ -270,12 +271,12 @@ class LibraryTest : public QObject {
     void test_onenine_local_override()
     {
         RuntimeContext r = dummyContext("osx");
-        auto test = readMojangJson(QFINDTESTDATA("testdata/Library/lib-simple.json"));
+        auto test = readMojangJson(QFINDTESTDATA("testdata/Libraries/lib-simple.json"));
         test->setHint("local");
         {
             QStringList jar, native, native32, native64;
-            test->getApplicableFiles(r, jar, native, native32, native64, QFINDTESTDATA("testdata/Library"));
-            QCOMPARE(jar, { QFileInfo(QFINDTESTDATA("testdata/Library/codecwav-20101023.jar")).absoluteFilePath() });
+            test->getApplicableFiles(r, jar, native, native32, native64, QFINDTESTDATA("testdata/Libraries"));
+            QCOMPARE(jar, { QFileInfo(QFINDTESTDATA("testdata/Libraries/codecwav-20101023.jar")).absoluteFilePath() });
             QCOMPARE(native, {});
             QCOMPARE(native32, {});
             QCOMPARE(native64, {});
@@ -283,7 +284,7 @@ class LibraryTest : public QObject {
         r.system = "linux";
         {
             QStringList failedFiles;
-            auto dls = test->getDownloads(r, cache.get(), failedFiles, QFINDTESTDATA("testdata/Library"));
+            auto dls = test->getDownloads(r, cache.get(), failedFiles, QFINDTESTDATA("testdata/Libraries"));
             QCOMPARE(dls.size(), 0);
             QCOMPARE(failedFiles, {});
         }
@@ -291,7 +292,7 @@ class LibraryTest : public QObject {
     void test_onenine_native()
     {
         RuntimeContext r = dummyContext("osx");
-        auto test = readMojangJson(QFINDTESTDATA("testdata/Library/lib-native.json"));
+        auto test = readMojangJson(QFINDTESTDATA("testdata/Libraries/lib-native.json"));
         QStringList jar, native, native32, native64;
         test->getApplicableFiles(r, jar, native, native32, native64, QString());
         QCOMPARE(jar, QStringList());
@@ -309,7 +310,7 @@ class LibraryTest : public QObject {
     void test_onenine_native_arch()
     {
         RuntimeContext r = dummyContext("windows");
-        auto test = readMojangJson(QFINDTESTDATA("testdata/Library/lib-native-arch.json"));
+        auto test = readMojangJson(QFINDTESTDATA("testdata/Libraries/lib-native-arch.json"));
         QStringList jar, native, native32, native64;
         test->getApplicableFiles(r, jar, native, native32, native64, QString());
         QCOMPARE(jar, {});
diff --git a/tests/MojangVersionFormat_test.cpp b/tests/MojangVersionFormat_test.cpp
index 3c8d3ffc5..d55c6561e 100644
--- a/tests/MojangVersionFormat_test.cpp
+++ b/tests/MojangVersionFormat_test.cpp
@@ -33,7 +33,7 @@ class MojangVersionFormatTest : public QObject {
    private slots:
     void test_Through_Simple()
     {
-        QJsonDocument doc = readJson(QFINDTESTDATA("testdata/MojangVersionFormat/1.9-simple.json"));
+        QJsonDocument doc = readJson(QFINDTESTDATA("testdata/Libraries/1.9-simple.json"));
         auto vfile = MojangVersionFormat::versionFileFromJson(doc, "1.9-simple.json");
         auto doc2 = MojangVersionFormat::versionFileToJson(vfile);
         writeJson("1.9-simple-passthorugh.json", doc2);
@@ -43,7 +43,7 @@ class MojangVersionFormatTest : public QObject {
 
     void test_Through()
     {
-        QJsonDocument doc = readJson(QFINDTESTDATA("testdata/MojangVersionFormat/1.9.json"));
+        QJsonDocument doc = readJson(QFINDTESTDATA("testdata/Libraries/1.9.json"));
         auto vfile = MojangVersionFormat::versionFileFromJson(doc, "1.9.json");
         auto doc2 = MojangVersionFormat::versionFileToJson(vfile);
         writeJson("1.9-passthorugh.json", doc2);
diff --git a/tests/ResourceFolderModel_test.cpp b/tests/ResourceFolderModel_test.cpp
index f2201a5e9..145e6b3d7 100644
--- a/tests/ResourceFolderModel_test.cpp
+++ b/tests/ResourceFolderModel_test.cpp
@@ -69,7 +69,7 @@ class ResourceFolderModelTest : public QObject {
     void test_1178()
     {
         // source
-        QString source = QFINDTESTDATA("testdata/ResourceFolderModel/test_folder");
+        QString source = QFINDTESTDATA("testdata/Resources/test_folder");
 
         // sanity check
         QVERIFY(!source.endsWith('/'));
@@ -133,7 +133,7 @@ class ResourceFolderModelTest : public QObject {
 
     void test_addFromWatch()
     {
-        QString source = QFINDTESTDATA("testdata/ResourceFolderModel");
+        QString source = QFINDTESTDATA("testdata/Resources");
         ModFolderModel model(source, nullptr, false, true);
 
         QCOMPARE(model.size(), 0);
@@ -150,8 +150,8 @@ class ResourceFolderModelTest : public QObject {
 
     void test_removeResource()
     {
-        QString folder_resource = QFINDTESTDATA("testdata/ResourceFolderModel/test_folder");
-        QString file_mod = QFINDTESTDATA("testdata/ResourceFolderModel/supercoolmod.jar");
+        QString folder_resource = QFINDTESTDATA("testdata/Resources/test_folder");
+        QString file_mod = QFINDTESTDATA("testdata/Resources/supercoolmod.jar");
 
         QTemporaryDir tmp;
         ResourceFolderModel model(QDir(tmp.path()), nullptr, false, false);
@@ -195,8 +195,8 @@ class ResourceFolderModelTest : public QObject {
 
     void test_enable_disable()
     {
-        QString folder_resource = QFINDTESTDATA("testdata/ResourceFolderModel/test_folder");
-        QString file_mod = QFINDTESTDATA("testdata/ResourceFolderModel/supercoolmod.jar");
+        QString folder_resource = QFINDTESTDATA("testdata/Resources/test_folder");
+        QString file_mod = QFINDTESTDATA("testdata/Resources/supercoolmod.jar");
 
         QTemporaryDir tmp;
         ResourceFolderModel model(tmp.path(), nullptr, false, false);
diff --git a/tests/ResourcePackParse_test.cpp b/tests/ResourcePackParse_test.cpp
index 5400d888a..c3a82b83d 100644
--- a/tests/ResourcePackParse_test.cpp
+++ b/tests/ResourcePackParse_test.cpp
@@ -30,7 +30,7 @@ class ResourcePackParseTest : public QObject {
    private slots:
     void test_parseZIP()
     {
-        QString source = QFINDTESTDATA("testdata/ResourcePackParse");
+        QString source = QFINDTESTDATA("testdata/Resources");
 
         QString zip_rp = FS::PathCombine(source, "test_resource_pack_idk.zip");
         ResourcePack pack{ QFileInfo(zip_rp) };
@@ -46,7 +46,7 @@ class ResourcePackParseTest : public QObject {
 
     void test_parseFolder()
     {
-        QString source = QFINDTESTDATA("testdata/ResourcePackParse");
+        QString source = QFINDTESTDATA("testdata/Resources");
 
         QString folder_rp = FS::PathCombine(source, "test_folder");
         ResourcePack pack{ QFileInfo(folder_rp) };
@@ -60,7 +60,7 @@ class ResourcePackParseTest : public QObject {
 
     void test_parseFolder2()
     {
-        QString source = QFINDTESTDATA("testdata/ResourcePackParse");
+        QString source = QFINDTESTDATA("testdata/Resources");
 
         QString folder_rp = FS::PathCombine(source, "another_test_folder");
         ResourcePack pack{ QFileInfo(folder_rp) };
diff --git a/tests/testdata/MojangVersionFormat/1.9-simple.json b/tests/testdata/Libraries/1.9-simple.json
similarity index 100%
rename from tests/testdata/MojangVersionFormat/1.9-simple.json
rename to tests/testdata/Libraries/1.9-simple.json
diff --git a/tests/testdata/MojangVersionFormat/1.9.json b/tests/testdata/Libraries/1.9.json
similarity index 100%
rename from tests/testdata/MojangVersionFormat/1.9.json
rename to tests/testdata/Libraries/1.9.json
diff --git a/tests/testdata/MojangVersionFormat/codecwav-20101023.jar b/tests/testdata/Libraries/codecwav-20101023.jar
similarity index 100%
rename from tests/testdata/MojangVersionFormat/codecwav-20101023.jar
rename to tests/testdata/Libraries/codecwav-20101023.jar
diff --git a/tests/testdata/MojangVersionFormat/lib-native-arch.json b/tests/testdata/Libraries/lib-native-arch.json
similarity index 100%
rename from tests/testdata/MojangVersionFormat/lib-native-arch.json
rename to tests/testdata/Libraries/lib-native-arch.json
diff --git a/tests/testdata/MojangVersionFormat/lib-native.json b/tests/testdata/Libraries/lib-native.json
similarity index 100%
rename from tests/testdata/MojangVersionFormat/lib-native.json
rename to tests/testdata/Libraries/lib-native.json
diff --git a/tests/testdata/MojangVersionFormat/lib-simple.json b/tests/testdata/Libraries/lib-simple.json
similarity index 100%
rename from tests/testdata/MojangVersionFormat/lib-simple.json
rename to tests/testdata/Libraries/lib-simple.json
diff --git a/tests/testdata/MojangVersionFormat/testname-testversion-linux-32.jar b/tests/testdata/Libraries/testname-testversion-linux-32.jar
similarity index 100%
rename from tests/testdata/MojangVersionFormat/testname-testversion-linux-32.jar
rename to tests/testdata/Libraries/testname-testversion-linux-32.jar
diff --git a/tests/testdata/Library b/tests/testdata/Library
deleted file mode 120000
index 0e7a22864..000000000
--- a/tests/testdata/Library
+++ /dev/null
@@ -1 +0,0 @@
-MojangVersionFormat/
\ No newline at end of file
diff --git a/tests/testdata/ResourceFolderModel b/tests/testdata/ResourceFolderModel
deleted file mode 120000
index c653d859b..000000000
--- a/tests/testdata/ResourceFolderModel
+++ /dev/null
@@ -1 +0,0 @@
-ResourcePackParse
\ No newline at end of file
diff --git a/tests/testdata/ResourcePackParse/another_test_folder/pack.mcmeta b/tests/testdata/Resources/another_test_folder/pack.mcmeta
similarity index 100%
rename from tests/testdata/ResourcePackParse/another_test_folder/pack.mcmeta
rename to tests/testdata/Resources/another_test_folder/pack.mcmeta
diff --git a/tests/testdata/ResourcePackParse/supercoolmod.jar b/tests/testdata/Resources/supercoolmod.jar
similarity index 100%
rename from tests/testdata/ResourcePackParse/supercoolmod.jar
rename to tests/testdata/Resources/supercoolmod.jar
diff --git a/tests/testdata/ResourcePackParse/test_folder/assets/minecraft/textures/blah.txt b/tests/testdata/Resources/test_folder/assets/minecraft/textures/blah.txt
similarity index 100%
rename from tests/testdata/ResourcePackParse/test_folder/assets/minecraft/textures/blah.txt
rename to tests/testdata/Resources/test_folder/assets/minecraft/textures/blah.txt
diff --git a/tests/testdata/ResourcePackParse/test_folder/pack.mcmeta b/tests/testdata/Resources/test_folder/pack.mcmeta
similarity index 100%
rename from tests/testdata/ResourcePackParse/test_folder/pack.mcmeta
rename to tests/testdata/Resources/test_folder/pack.mcmeta
diff --git a/tests/testdata/ResourcePackParse/test_folder/pack.nfo b/tests/testdata/Resources/test_folder/pack.nfo
similarity index 100%
rename from tests/testdata/ResourcePackParse/test_folder/pack.nfo
rename to tests/testdata/Resources/test_folder/pack.nfo
diff --git a/tests/testdata/ResourcePackParse/test_resource_pack_idk.zip b/tests/testdata/Resources/test_resource_pack_idk.zip
similarity index 100%
rename from tests/testdata/ResourcePackParse/test_resource_pack_idk.zip
rename to tests/testdata/Resources/test_resource_pack_idk.zip