diff --git a/src/dynarmic/tests/A32/fuzz_arm.cpp b/src/dynarmic/tests/A32/fuzz_arm.cpp
index fd17b3bd01..cd2eade884 100644
--- a/src/dynarmic/tests/A32/fuzz_arm.cpp
+++ b/src/dynarmic/tests/A32/fuzz_arm.cpp
@@ -20,15 +20,14 @@
 #include <mcl/scope_exit.hpp>
 #include "dynarmic/common/common_types.h"
 
-#include "../fuzz_util.h"
-#include "../rand_int.h"
-#include "../unicorn_emu/a32_unicorn.h"
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/fuzz_util.h"
+#include "dynarmic/tests/rand_int.h"
+#include "dynarmic/tests/unicorn_emu/a32_unicorn.h"
+#include "dynarmic/tests/A32/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
 #include "dynarmic/common/llvm_disassemble.h"
-#include "dynarmic/common/variant_util.h"
 #include "dynarmic/frontend/A32/ITState.h"
 #include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/frontend/A32/a32_types.h"
diff --git a/src/dynarmic/tests/A32/fuzz_thumb.cpp b/src/dynarmic/tests/A32/fuzz_thumb.cpp
index 3a561a18d9..f985e6f93d 100644
--- a/src/dynarmic/tests/A32/fuzz_thumb.cpp
+++ b/src/dynarmic/tests/A32/fuzz_thumb.cpp
@@ -19,10 +19,10 @@
 #include <mcl/bit/bit_field.hpp>
 #include "dynarmic/common/common_types.h"
 
-#include "../rand_int.h"
-#include "../unicorn_emu/a32_unicorn.h"
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/rand_int.h"
+#include "dynarmic/tests/unicorn_emu/a32_unicorn.h"
+#include "dynarmic/tests/A32/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 #include "dynarmic/frontend/A32/FPSCR.h"
 #include "dynarmic/frontend/A32/PSR.h"
 #include "dynarmic/frontend/A32/a32_location_descriptor.h"
@@ -107,7 +107,7 @@ static bool DoesBehaviorMatch(const A32Unicorn<ThumbTestEnv>& uni, const A32::Ji
     return std::equal(interp_regs.begin(), interp_regs.end(), jit_regs.begin(), jit_regs.end()) && uni.GetCpsr() == jit.Cpsr() && interp_write_records == jit_write_records;
 }
 
-static void RunInstance(size_t run_number, ThumbTestEnv& test_env, A32Unicorn<ThumbTestEnv>& uni, A32::Jit& jit, const ThumbTestEnv::RegisterArray& initial_regs, size_t instruction_count, size_t instructions_to_execute_count) {
+static void RunInstance(size_t run_number, ThumbTestEnv& test_env, A32::UserConfig const& config, A32Unicorn<ThumbTestEnv>& uni, A32::Jit& jit, const ThumbTestEnv::RegisterArray& initial_regs, size_t instruction_count, size_t instructions_to_execute_count) {
     uni.ClearPageCache();
     jit.ClearCache();
 
@@ -145,9 +145,8 @@ static void RunInstance(size_t run_number, ThumbTestEnv& test_env, A32Unicorn<Th
         printf("Failed at execution number %zu\n", run_number);
 
         printf("\nInstruction Listing: \n");
-        for (size_t i = 0; i < instruction_count; i++) {
-            printf("%04x %s\n", test_env.code_mem[i], A32::DisassembleThumb16(test_env.code_mem[i]).c_str());
-        }
+        for (size_t i = 0; i < instruction_count; i++)
+            printf("%04x\n", test_env.code_mem[i]);
 
         printf("\nInitial Register Listing: \n");
         for (size_t i = 0; i < initial_regs.size(); i++) {
@@ -175,11 +174,14 @@ static void RunInstance(size_t run_number, ThumbTestEnv& test_env, A32Unicorn<Th
         A32::PSR cpsr;
         cpsr.T(true);
 
+        IR::Block ir_block{A32::LocationDescriptor{0, {}, {}}};
+
         size_t num_insts = 0;
         while (num_insts < instructions_to_execute_count) {
             A32::LocationDescriptor descriptor = {u32(num_insts * 4), cpsr, A32::FPSCR{}};
-            IR::Block ir_block = A32::Translate(descriptor, &test_env, {});
-            Optimization::Optimize(ir_block, &test_env, {});
+            ir_block.Reset(descriptor);
+            A32::Translate(ir_block, descriptor, &test_env, {});
+            Optimization::Optimize(ir_block, config, {});
             printf("\n\nIR:\n%s", IR::DumpBlock(ir_block).c_str());
             printf("\n\nx86_64:\n");
             printf("%s", jit.Disassemble().c_str());
@@ -201,8 +203,9 @@ void FuzzJitThumb16(const size_t instruction_count, const size_t instructions_to
     test_env.code_mem.back() = 0xE7FE;  // b +#0
 
     // Prepare test subjects
+    A32::UserConfig config{GetUserConfig(&test_env)};
     A32Unicorn uni{test_env};
-    A32::Jit jit{GetUserConfig(&test_env)};
+    A32::Jit jit{config};
 
     for (size_t run_number = 0; run_number < run_count; run_number++) {
         ThumbTestEnv::RegisterArray initial_regs;
@@ -211,7 +214,7 @@ void FuzzJitThumb16(const size_t instruction_count, const size_t instructions_to
 
         std::generate_n(test_env.code_mem.begin(), instruction_count, instruction_generator);
 
-        RunInstance(run_number, test_env, uni, jit, initial_regs, instruction_count, instructions_to_execute_count);
+        RunInstance(run_number, test_env, config, uni, jit, initial_regs, instruction_count, instructions_to_execute_count);
     }
 }
 
@@ -225,7 +228,8 @@ void FuzzJitThumb32(const size_t instruction_count, const size_t instructions_to
 
     // Prepare test subjects
     A32Unicorn uni{test_env};
-    A32::Jit jit{GetUserConfig(&test_env)};
+    A32::UserConfig config{GetUserConfig(&test_env)};
+    A32::Jit jit{config};
 
     for (size_t run_number = 0; run_number < run_count; run_number++) {
         ThumbTestEnv::RegisterArray initial_regs;
@@ -241,7 +245,7 @@ void FuzzJitThumb32(const size_t instruction_count, const size_t instructions_to
             test_env.code_mem[i * 2 + 1] = first_halfword;
         }
 
-        RunInstance(run_number, test_env, uni, jit, initial_regs, instruction_count, instructions_to_execute_count);
+        RunInstance(run_number, test_env, config, uni, jit, initial_regs, instruction_count, instructions_to_execute_count);
     }
 }
 
@@ -504,7 +508,8 @@ TEST_CASE("Verify fix for off by one error in MemoryRead32 worked", "[Thumb][Thu
 
     // Prepare test subjects
     A32Unicorn<ThumbTestEnv> uni{test_env};
-    A32::Jit jit{GetUserConfig(&test_env)};
+    A32::UserConfig config{GetUserConfig(&test_env)};
+    A32::Jit jit{config};
 
     constexpr ThumbTestEnv::RegisterArray initial_regs{
         0xe90ecd70,
@@ -534,5 +539,5 @@ TEST_CASE("Verify fix for off by one error in MemoryRead32 worked", "[Thumb][Thu
         0xE7FE,  // b +#0
     };
 
-    RunInstance(1, test_env, uni, jit, initial_regs, 5, 5);
+    RunInstance(1, test_env, config, uni, jit, initial_regs, 5, 5);
 }
diff --git a/src/dynarmic/tests/A32/test_arm_instructions.cpp b/src/dynarmic/tests/A32/test_arm_instructions.cpp
index 2e7e7dc5d8..5a27cd499c 100644
--- a/src/dynarmic/tests/A32/test_arm_instructions.cpp
+++ b/src/dynarmic/tests/A32/test_arm_instructions.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -8,8 +8,8 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/A32/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 #include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/interface/A32/a32.h"
 
diff --git a/src/dynarmic/tests/A32/test_coprocessor.cpp b/src/dynarmic/tests/A32/test_coprocessor.cpp
index 3888d2c68b..66ae6ebb09 100644
--- a/src/dynarmic/tests/A32/test_coprocessor.cpp
+++ b/src/dynarmic/tests/A32/test_coprocessor.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -10,8 +10,8 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/A32/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 #include "dynarmic/frontend/A32/a32_location_descriptor.h"
 #include "dynarmic/interface/A32/a32.h"
 #include "dynarmic/interface/A32/coprocessor.h"
diff --git a/src/dynarmic/tests/A32/test_svc.cpp b/src/dynarmic/tests/A32/test_svc.cpp
index 0be2432c7b..0cfaf23ec5 100644
--- a/src/dynarmic/tests/A32/test_svc.cpp
+++ b/src/dynarmic/tests/A32/test_svc.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -10,8 +10,8 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/A32/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 
 using namespace Dynarmic;
 
diff --git a/src/dynarmic/tests/A32/test_thumb_instructions.cpp b/src/dynarmic/tests/A32/test_thumb_instructions.cpp
index d509acdd8d..6aa1b7389b 100644
--- a/src/dynarmic/tests/A32/test_thumb_instructions.cpp
+++ b/src/dynarmic/tests/A32/test_thumb_instructions.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -9,8 +9,8 @@
 #include <catch2/catch_test_macros.hpp>
 #include "dynarmic/common/common_types.h"
 
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/A32/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 #include "dynarmic/interface/A32/a32.h"
 
 static Dynarmic::A32::UserConfig GetUserConfig(ThumbTestEnv* testenv) {
diff --git a/src/dynarmic/tests/A64/a64.cpp b/src/dynarmic/tests/A64/a64.cpp
index d331c5e8a1..4d4484e53e 100644
--- a/src/dynarmic/tests/A64/a64.cpp
+++ b/src/dynarmic/tests/A64/a64.cpp
@@ -9,8 +9,8 @@
 #include <catch2/catch_test_macros.hpp>
 #include <oaknut/oaknut.hpp>
 
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/A64/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 #include "dynarmic/common/fp/fpsr.h"
 #include "dynarmic/interface/exclusive_monitor.h"
 #include "dynarmic/interface/optimization_flags.h"
diff --git a/src/dynarmic/tests/A64/fp_min_max.cpp b/src/dynarmic/tests/A64/fp_min_max.cpp
index 1669b63071..313b5e5117 100644
--- a/src/dynarmic/tests/A64/fp_min_max.cpp
+++ b/src/dynarmic/tests/A64/fp_min_max.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -11,8 +11,8 @@
 #include <catch2/catch_test_macros.hpp>
 #include "dynarmic/common/common_types.h"
 
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/A64/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 
 using namespace Dynarmic;
 
diff --git a/src/dynarmic/tests/A64/fuzz_with_unicorn.cpp b/src/dynarmic/tests/A64/fuzz_with_unicorn.cpp
index 2cdf288eab..0c7a30a868 100644
--- a/src/dynarmic/tests/A64/fuzz_with_unicorn.cpp
+++ b/src/dynarmic/tests/A64/fuzz_with_unicorn.cpp
@@ -15,11 +15,11 @@
 #include <mcl/scope_exit.hpp>
 #include "dynarmic/common/common_types.h"
 
-#include "../fuzz_util.h"
-#include "../rand_int.h"
-#include "../unicorn_emu/a64_unicorn.h"
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/fuzz_util.h"
+#include "dynarmic/tests/rand_int.h"
+#include "dynarmic/tests/unicorn_emu/a64_unicorn.h"
+#include "dynarmic/tests/A64/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
 #include "dynarmic/common/llvm_disassemble.h"
@@ -168,7 +168,7 @@ static Dynarmic::A64::UserConfig GetUserConfig(A64TestEnv& jit_env) {
     return jit_user_config;
 }
 
-static void RunTestInstance(Dynarmic::A64::Jit& jit, A64Unicorn& uni, A64TestEnv& jit_env, A64TestEnv& uni_env, const A64Unicorn::RegisterArray& regs, const A64Unicorn::VectorArray& vecs, const size_t instructions_start, const std::vector<u32>& instructions, const u32 pstate, const u32 fpcr) {
+static void RunTestInstance(Dynarmic::A64::Jit& jit, A64Unicorn& uni, A64TestEnv& jit_env, A64TestEnv& uni_env, Dynarmic::A64::UserConfig& conf, const A64Unicorn::RegisterArray& regs, const A64Unicorn::VectorArray& vecs, const size_t instructions_start, const std::vector<u32>& instructions, const u32 pstate, const u32 fpcr) {
     jit_env.code_mem = instructions;
     uni_env.code_mem = instructions;
     jit_env.code_mem.emplace_back(0x14000000);  // B .
@@ -269,16 +269,13 @@ static void RunTestInstance(Dynarmic::A64::Jit& jit, A64Unicorn& uni, A64TestEnv
         fmt::print("\n");
 
         const auto get_code = [&jit_env](u64 vaddr) { return jit_env.MemoryReadCode(vaddr); };
-        IR::Block ir_block = A64::Translate({instructions_start, FP::FPCR{fpcr}}, get_code, {});
-        fmt::print("IR:\n");
-        fmt::print("{}\n", IR::DumpBlock(ir_block));
+        const A64::LocationDescriptor location{instructions_start, FP::FPCR{fpcr}};
+        IR::Block ir_block{location};
+        A64::Translate(ir_block, location, get_code, {});
+        fmt::print("IR:\n{}\n", IR::DumpBlock(ir_block));
         Optimization::Optimize(ir_block, conf, {});
-        fmt::print("Optimized IR:\n");
-        fmt::print("{}\n", IR::DumpBlock(ir_block));
-
-        fmt::print("x86_64:\n");
-        fmt::print("{}", jit.Disassemble());
-
+        fmt::print("Optimized IR:\n{}\n", IR::DumpBlock(ir_block));
+        fmt::print("x86_64:\n{}", jit.Disassemble());
         fmt::print("Interrupts:\n");
         for (auto& i : uni_env.interrupts) {
             puts(i.c_str());
@@ -304,7 +301,8 @@ TEST_CASE("A64: Single random instruction", "[a64][unicorn]") {
     A64TestEnv jit_env{};
     A64TestEnv uni_env{};
 
-    Dynarmic::A64::Jit jit{GetUserConfig(jit_env)};
+    Dynarmic::A64::UserConfig conf{GetUserConfig(jit_env)};
+    Dynarmic::A64::Jit jit{conf};
     A64Unicorn uni{uni_env};
 
     A64Unicorn::RegisterArray regs;
@@ -323,7 +321,7 @@ TEST_CASE("A64: Single random instruction", "[a64][unicorn]") {
 
         INFO("Instruction: 0x" << std::hex << instructions[0]);
 
-        RunTestInstance(jit, uni, jit_env, uni_env, regs, vecs, start_address, instructions, pstate, fpcr);
+        RunTestInstance(jit, uni, jit_env, uni_env, conf, regs, vecs, start_address, instructions, pstate, fpcr);
     }
 }
 
@@ -331,7 +329,8 @@ TEST_CASE("A64: Floating point instructions", "[a64][unicorn]") {
     A64TestEnv jit_env{};
     A64TestEnv uni_env{};
 
-    Dynarmic::A64::Jit jit{GetUserConfig(jit_env)};
+    Dynarmic::A64::UserConfig conf{GetUserConfig(jit_env)};
+    Dynarmic::A64::Jit jit{conf};
     A64Unicorn uni{uni_env};
 
     static constexpr std::array<u64, 80> float_numbers{
@@ -448,7 +447,7 @@ TEST_CASE("A64: Floating point instructions", "[a64][unicorn]") {
 
         INFO("Instruction: 0x" << std::hex << instructions[0]);
 
-        RunTestInstance(jit, uni, jit_env, uni_env, regs, vecs, start_address, instructions, pstate, fpcr);
+        RunTestInstance(jit, uni, jit_env, uni_env, conf, regs, vecs, start_address, instructions, pstate, fpcr);
     }
 }
 
@@ -456,7 +455,8 @@ TEST_CASE("A64: Small random block", "[a64][unicorn]") {
     A64TestEnv jit_env{};
     A64TestEnv uni_env{};
 
-    Dynarmic::A64::Jit jit{GetUserConfig(jit_env)};
+    Dynarmic::A64::UserConfig conf{GetUserConfig(jit_env)};
+    Dynarmic::A64::Jit jit{conf};
     A64Unicorn uni{uni_env};
 
     A64Unicorn::RegisterArray regs;
@@ -483,7 +483,7 @@ TEST_CASE("A64: Small random block", "[a64][unicorn]") {
         INFO("Instruction 4: 0x" << std::hex << instructions[3]);
         INFO("Instruction 5: 0x" << std::hex << instructions[4]);
 
-        RunTestInstance(jit, uni, jit_env, uni_env, regs, vecs, start_address, instructions, pstate, fpcr);
+        RunTestInstance(jit, uni, jit_env, uni_env, conf, regs, vecs, start_address, instructions, pstate, fpcr);
     }
 }
 
@@ -491,7 +491,8 @@ TEST_CASE("A64: Large random block", "[a64][unicorn]") {
     A64TestEnv jit_env{};
     A64TestEnv uni_env{};
 
-    Dynarmic::A64::Jit jit{GetUserConfig(jit_env)};
+    Dynarmic::A64::UserConfig conf{GetUserConfig(jit_env)};
+    Dynarmic::A64::Jit jit{conf};
     A64Unicorn uni{uni_env};
 
     A64Unicorn::RegisterArray regs;
@@ -512,6 +513,6 @@ TEST_CASE("A64: Large random block", "[a64][unicorn]") {
         const u32 pstate = RandInt<u32>(0, 0xF) << 28;
         const u32 fpcr = RandomFpcr();
 
-        RunTestInstance(jit, uni, jit_env, uni_env, regs, vecs, start_address, instructions, pstate, fpcr);
+        RunTestInstance(jit, uni, jit_env, uni_env, conf, regs, vecs, start_address, instructions, pstate, fpcr);
     }
 }
diff --git a/src/dynarmic/tests/A64/misaligned_page_table.cpp b/src/dynarmic/tests/A64/misaligned_page_table.cpp
index fc0bc77428..99afba519d 100644
--- a/src/dynarmic/tests/A64/misaligned_page_table.cpp
+++ b/src/dynarmic/tests/A64/misaligned_page_table.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -8,8 +8,8 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/A64/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 #include "dynarmic/interface/A64/a64.h"
 
 TEST_CASE("misaligned load/store do not use page_table when detect_misaligned_access_via_page_table is set", "[a64]") {
diff --git a/src/dynarmic/tests/A64/real_world.cpp b/src/dynarmic/tests/A64/real_world.cpp
index a083f16d61..c15f307c3d 100644
--- a/src/dynarmic/tests/A64/real_world.cpp
+++ b/src/dynarmic/tests/A64/real_world.cpp
@@ -1,11 +1,11 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <catch2/catch_test_macros.hpp>
 #include <oaknut/oaknut.hpp>
 
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/A64/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 #include "dynarmic/interface/A64/a64.h"
 
 using namespace Dynarmic;
diff --git a/src/dynarmic/tests/A64/test_invalidation.cpp b/src/dynarmic/tests/A64/test_invalidation.cpp
index 0c92f5f606..3b2d5fef98 100644
--- a/src/dynarmic/tests/A64/test_invalidation.cpp
+++ b/src/dynarmic/tests/A64/test_invalidation.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -8,8 +8,8 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "./testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/A64/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 #include "dynarmic/interface/A64/a64.h"
 
 using namespace Dynarmic;
diff --git a/src/dynarmic/tests/A64/verify_unicorn.cpp b/src/dynarmic/tests/A64/verify_unicorn.cpp
index 0c0ccc1609..5bdcd0dc3e 100644
--- a/src/dynarmic/tests/A64/verify_unicorn.cpp
+++ b/src/dynarmic/tests/A64/verify_unicorn.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 /* This file is part of the dynarmic project.
  * Copyright (c) 2018 MerryMage
  * SPDX-License-Identifier: 0BSD
@@ -7,9 +10,9 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include "../rand_int.h"
-#include "../unicorn_emu/a64_unicorn.h"
-#include "./testenv.h"
+#include "dynarmic/tests/rand_int.h"
+#include "dynarmic/tests/unicorn_emu/a64_unicorn.h"
+#include "dynarmic/tests/A64/testenv.h"
 
 using namespace Dynarmic;
 
diff --git a/src/dynarmic/tests/fp/FPToFixed.cpp b/src/dynarmic/tests/fp/FPToFixed.cpp
index 570ebcbbd7..e16e4460ed 100644
--- a/src/dynarmic/tests/fp/FPToFixed.cpp
+++ b/src/dynarmic/tests/fp/FPToFixed.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -12,7 +12,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include "dynarmic/common/common_types.h"
 
-#include "../rand_int.h"
+#include "dynarmic/tests/rand_int.h"
 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
 #include "dynarmic/common/fp/op.h"
diff --git a/src/dynarmic/tests/fp/mantissa_util_tests.cpp b/src/dynarmic/tests/fp/mantissa_util_tests.cpp
index de29d51865..9d16c3624c 100644
--- a/src/dynarmic/tests/fp/mantissa_util_tests.cpp
+++ b/src/dynarmic/tests/fp/mantissa_util_tests.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -12,7 +12,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include "dynarmic/common/common_types.h"
 
-#include "../rand_int.h"
+#include "dynarmic/tests/rand_int.h"
 #include "dynarmic/common/fp/mantissa_util.h"
 #include "dynarmic/common/safe_ops.h"
 
diff --git a/src/dynarmic/tests/fp/unpacked_tests.cpp b/src/dynarmic/tests/fp/unpacked_tests.cpp
index 919f21bf2f..a4f10d1273 100644
--- a/src/dynarmic/tests/fp/unpacked_tests.cpp
+++ b/src/dynarmic/tests/fp/unpacked_tests.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -12,7 +12,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include "dynarmic/common/common_types.h"
 
-#include "../rand_int.h"
+#include "dynarmic/tests/rand_int.h"
 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
 #include "dynarmic/common/fp/unpacked.h"
diff --git a/src/dynarmic/tests/fuzz_util.cpp b/src/dynarmic/tests/fuzz_util.cpp
index 351eb1e10f..05f0a9e865 100644
--- a/src/dynarmic/tests/fuzz_util.cpp
+++ b/src/dynarmic/tests/fuzz_util.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "./fuzz_util.h"
+#include "dynarmic/tests/fuzz_util.h"
 
 #include <cstring>
 
@@ -14,7 +14,7 @@
 #include <fmt/ostream.h>
 #include "dynarmic/common/assert.h"
 
-#include "./rand_int.h"
+#include "dynarmic/tests/rand_int.h"
 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/rounding_mode.h"
 
diff --git a/src/dynarmic/tests/native/preserve_xmm.cpp b/src/dynarmic/tests/native/preserve_xmm.cpp
index 7421252063..6369e1a74d 100644
--- a/src/dynarmic/tests/native/preserve_xmm.cpp
+++ b/src/dynarmic/tests/native/preserve_xmm.cpp
@@ -1,12 +1,12 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <catch2/catch_test_macros.hpp>
 #include <oaknut/oaknut.hpp>
 #include <immintrin.h>
 
-#include "../A64/testenv.h"
-#include "../native/testenv.h"
+#include "dynarmic/tests/A64/testenv.h"
+#include "dynarmic/tests/native/testenv.h"
 #include "dynarmic/common/fp/fpsr.h"
 #include "dynarmic/interface/exclusive_monitor.h"
 
diff --git a/src/dynarmic/tests/test_generator.cpp b/src/dynarmic/tests/test_generator.cpp
index 4435e762ae..33e41099ff 100644
--- a/src/dynarmic/tests/test_generator.cpp
+++ b/src/dynarmic/tests/test_generator.cpp
@@ -22,8 +22,8 @@
 
 #include "./A32/testenv.h"
 #include "./A64/testenv.h"
-#include "./fuzz_util.h"
-#include "./rand_int.h"
+#include "dynarmic/tests/fuzz_util.h"
+#include "dynarmic/tests/rand_int.h"
 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/common/fp/fpsr.h"
 #include "dynarmic/common/llvm_disassemble.h"
diff --git a/src/dynarmic/tests/unicorn_emu/a32_unicorn.cpp b/src/dynarmic/tests/unicorn_emu/a32_unicorn.cpp
index 1a4f1845d5..66c1e7fd24 100644
--- a/src/dynarmic/tests/unicorn_emu/a32_unicorn.cpp
+++ b/src/dynarmic/tests/unicorn_emu/a32_unicorn.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -6,22 +6,14 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "./a32_unicorn.h"
-
 #include <type_traits>
-
-#include "dynarmic/common/assert.h"
+#include <fmt/format.h>
 #include <mcl/bit/bit_field.hpp>
+#include "dynarmic/tests/unicorn_emu/a32_unicorn.h"
+#include "dynarmic/common/assert.h"
+#include "dynarmic/tests/A32/testenv.h"
 
-#include "../A32/testenv.h"
-
-#define CHECKED(expr)                                                                                    \
-    do {                                                                                                 \
-        if (auto cerr_ = (expr)) {                                                                       \
-            ASSERT(false && "Call " #expr " failed with error: {} ({})\n", static_cast<size_t>(cerr_), \
-                       uc_strerror(cerr_));                                                              \
-        }                                                                                                \
-    } while (0)
+#define CHECKED(expr) do if ((expr)) ASSERT(false && "Call " #expr " failed with error\n"); while (0)
 
 constexpr u32 BEGIN_ADDRESS = 0;
 constexpr u32 END_ADDRESS = ~u32(0);
diff --git a/src/dynarmic/tests/unicorn_emu/a32_unicorn.h b/src/dynarmic/tests/unicorn_emu/a32_unicorn.h
index 79831b8111..d94724d9f2 100644
--- a/src/dynarmic/tests/unicorn_emu/a32_unicorn.h
+++ b/src/dynarmic/tests/unicorn_emu/a32_unicorn.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -21,7 +21,7 @@
 
 #include "dynarmic/common/common_types.h"
 
-#include "../A32/testenv.h"
+#include "dynarmic/tests/A32/testenv.h"
 
 namespace Unicorn::A32 {
 static constexpr size_t num_gprs = 16;
diff --git a/src/dynarmic/tests/unicorn_emu/a64_unicorn.cpp b/src/dynarmic/tests/unicorn_emu/a64_unicorn.cpp
index 3f13377f71..c8aa404199 100644
--- a/src/dynarmic/tests/unicorn_emu/a64_unicorn.cpp
+++ b/src/dynarmic/tests/unicorn_emu/a64_unicorn.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -6,17 +6,11 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include "./a64_unicorn.h"
-
+#include <fmt/format.h>
+#include "dynarmic/tests/unicorn_emu/a64_unicorn.h"
 #include "dynarmic/common/assert.h"
 
-#define CHECKED(expr)                                                                                    \
-    do {                                                                                                 \
-        if (auto cerr_ = (expr)) {                                                                       \
-            ASSERT(false && "Call " #expr " failed with error: {} ({})\n", static_cast<size_t>(cerr_), \
-                       uc_strerror(cerr_));                                                              \
-        }                                                                                                \
-    } while (0)
+#define CHECKED(expr) do if ((expr)) ASSERT(false && "Call " #expr " failed with error\n"); while (0)
 
 constexpr u64 BEGIN_ADDRESS = 0;
 constexpr u64 END_ADDRESS = ~u64(0);
@@ -172,7 +166,7 @@ void A64Unicorn::DumpMemoryInformation() {
 void A64Unicorn::InterruptHook(uc_engine* uc, u32 int_number, void* user_data) {
     auto* this_ = static_cast<A64Unicorn*>(user_data);
 
-    u32 esr;
+    u32 esr = 0;
     //CHECKED(uc_reg_read(uc, UC_ARM64_REG_ESR_EL0, &esr));
 
     auto ec = esr >> 26;
diff --git a/src/dynarmic/tests/unicorn_emu/a64_unicorn.h b/src/dynarmic/tests/unicorn_emu/a64_unicorn.h
index 54f09c3b28..1bc5b1cb8e 100644
--- a/src/dynarmic/tests/unicorn_emu/a64_unicorn.h
+++ b/src/dynarmic/tests/unicorn_emu/a64_unicorn.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 /* This file is part of the dynarmic project.
@@ -21,7 +21,7 @@
 
 #include "dynarmic/common/common_types.h"
 
-#include "../A64/testenv.h"
+#include "dynarmic/tests/A64/testenv.h"
 
 class A64Unicorn final {
 public: