diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90c83e5..90dd475 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,7 +163,6 @@ target_link_libraries(comsquare
 
 add_executable(unit_tests EXCLUDE_FROM_ALL
 	${SOURCES}
-	tests/MainTest.cpp
 	tests/tests.hpp
 	tests/CPU/testInterupts.cpp
 	tests/APU/testAPUInstructions.cpp
diff --git a/sources/Models/Logger.hpp b/sources/Models/Logger.hpp
index d56e1af..6d621f1 100644
--- a/sources/Models/Logger.hpp
+++ b/sources/Models/Logger.hpp
@@ -8,7 +8,7 @@
 #include <iostream>
 
 #ifdef TESTS
-#include <catch2/catch.hpp>
+#include <catch2/catch_message.hpp>
 #endif
 
 namespace ComSquare
diff --git a/tests/APU/testAPU.cpp b/tests/APU/testAPU.cpp
index d954c36..10e97e9 100644
--- a/tests/APU/testAPU.cpp
+++ b/tests/APU/testAPU.cpp
@@ -2,7 +2,7 @@
 // Created by Melefo on 12/02/2020.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "tests.hpp"
 #include "SNES.hpp"
 #include "APU/APU.hpp"
diff --git a/tests/APU/testAPUInstructions.cpp b/tests/APU/testAPUInstructions.cpp
index 914f5d0..5b58ec2 100644
--- a/tests/APU/testAPUInstructions.cpp
+++ b/tests/APU/testAPUInstructions.cpp
@@ -2,7 +2,7 @@
 // Created by Melefo on 11/02/2020.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <iostream>
 #include <bitset>
 #include "../tests.hpp"
diff --git a/tests/APU/testOperand.cpp b/tests/APU/testOperand.cpp
index 91c4940..1026927 100644
--- a/tests/APU/testOperand.cpp
+++ b/tests/APU/testOperand.cpp
@@ -2,7 +2,7 @@
 // Created by Melefo on 26/02/2020.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "tests.hpp"
 #include "SNES.hpp"
 #include "APU/APU.hpp"
diff --git a/tests/CPU/Math/testADC.cpp b/tests/CPU/Math/testADC.cpp
index 39e345b..5673ebc 100644
--- a/tests/CPU/Math/testADC.cpp
+++ b/tests/CPU/Math/testADC.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 2/11/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <bitset>
 #include "../../tests.hpp"
 #include "../../../sources/SNES.hpp"
diff --git a/tests/CPU/Math/testCMP.cpp b/tests/CPU/Math/testCMP.cpp
index fcdee84..52759b9 100644
--- a/tests/CPU/Math/testCMP.cpp
+++ b/tests/CPU/Math/testCMP.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 4/6/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <bitset>
 #include "../../tests.hpp"
 #include "../../../sources/SNES.hpp"
diff --git a/tests/CPU/Math/testOthersMath.cpp b/tests/CPU/Math/testOthersMath.cpp
index a39212c..a345f92 100644
--- a/tests/CPU/Math/testOthersMath.cpp
+++ b/tests/CPU/Math/testOthersMath.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 4/3/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <bitset>
 #include "../../tests.hpp"
 #include "../../../sources/SNES.hpp"
diff --git a/tests/CPU/Math/testSBC.cpp b/tests/CPU/Math/testSBC.cpp
index d4eaeb0..a970614 100644
--- a/tests/CPU/Math/testSBC.cpp
+++ b/tests/CPU/Math/testSBC.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 27/02/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <bitset>
 #include "../../tests.hpp"
 #include "../../../sources/SNES.hpp"
diff --git a/tests/CPU/testAddressingMode.cpp b/tests/CPU/testAddressingMode.cpp
index d7e419e..4dc2243 100644
--- a/tests/CPU/testAddressingMode.cpp
+++ b/tests/CPU/testAddressingMode.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 2/10/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "../tests.hpp"
 #include "SNES.hpp"
 using namespace ComSquare;
diff --git a/tests/CPU/testBits.cpp b/tests/CPU/testBits.cpp
index d7e0bec..83f747b 100644
--- a/tests/CPU/testBits.cpp
+++ b/tests/CPU/testBits.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 2/20/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <bitset>
 #include <iostream>
 #include "../tests.hpp"
diff --git a/tests/CPU/testDMA.cpp b/tests/CPU/testDMA.cpp
index ab5ada6..6c75ad4 100644
--- a/tests/CPU/testDMA.cpp
+++ b/tests/CPU/testDMA.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 2/1/21.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <bitset>
 #include "../tests.hpp"
 using namespace ComSquare;
diff --git a/tests/CPU/testInternal.cpp b/tests/CPU/testInternal.cpp
index 2ca5db1..c76bc71 100644
--- a/tests/CPU/testInternal.cpp
+++ b/tests/CPU/testInternal.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 2/13/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <bitset>
 #include "../tests.hpp"
 using namespace ComSquare;
diff --git a/tests/CPU/testInterupts.cpp b/tests/CPU/testInterupts.cpp
index a9b2d50..47916a8 100644
--- a/tests/CPU/testInterupts.cpp
+++ b/tests/CPU/testInterupts.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 1/24/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <iostream>
 #include <bitset>
 #include "../tests.hpp"
diff --git a/tests/CPU/testStore.cpp b/tests/CPU/testStore.cpp
index 85a2f7d..f7f1b3f 100644
--- a/tests/CPU/testStore.cpp
+++ b/tests/CPU/testStore.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 2/12/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <iostream>
 #include <bitset>
 #include "../tests.hpp"
diff --git a/tests/CPU/testTransfers.cpp b/tests/CPU/testTransfers.cpp
index b60ded7..192e07a 100644
--- a/tests/CPU/testTransfers.cpp
+++ b/tests/CPU/testTransfers.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 2/28/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <iostream>
 #include <bitset>
 #include "../tests.hpp"
diff --git a/tests/MainTest.cpp b/tests/MainTest.cpp
deleted file mode 100644
index 6f2c369..0000000
--- a/tests/MainTest.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// Created by Zoe Roux on 5/17/21.
-//
-
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
\ No newline at end of file
diff --git a/tests/PPU/testBackground.cpp b/tests/PPU/testBackground.cpp
index 325f16e..2de9812 100644
--- a/tests/PPU/testBackground.cpp
+++ b/tests/PPU/testBackground.cpp
@@ -2,7 +2,7 @@
 // Created by cbihan on 9/29/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <iostream>
 #include <bitset>
 #include "../tests.hpp"
diff --git a/tests/PPU/testPpuRead.cpp b/tests/PPU/testPpuRead.cpp
index 4d6ea46..c32f7dc 100644
--- a/tests/PPU/testPpuRead.cpp
+++ b/tests/PPU/testPpuRead.cpp
@@ -2,7 +2,7 @@
 // Created by cbihan on 2/1/21.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <bitset>
 #include "../tests.hpp"
 #include "../../sources/SNES.hpp"
diff --git a/tests/PPU/testPpuWrite.cpp b/tests/PPU/testPpuWrite.cpp
index 4423516..9f02bfb 100644
--- a/tests/PPU/testPpuWrite.cpp
+++ b/tests/PPU/testPpuWrite.cpp
@@ -2,13 +2,13 @@
 // Created by cbihan on 2/10/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <iostream>
 #include <bitset>
-#include "../tests.hpp"
-#include "../../sources/SNES.hpp"
-#include "../../sources/Memory/MemoryBus.hpp"
-#include "../../sources/PPU/PPU.hpp"
+#include "tests.hpp"
+#include "SNES.hpp"
+#include "Memory/MemoryBus.hpp"
+#include "PPU/PPU.hpp"
 using namespace ComSquare;
 
 TEST_CASE("inidisp_data_full_ones PPU_write", "[PPU_write]")
diff --git a/tests/PPU/testPpuWriteFromVmain.cpp b/tests/PPU/testPpuWriteFromVmain.cpp
index f499e84..4e565c6 100644
--- a/tests/PPU/testPpuWriteFromVmain.cpp
+++ b/tests/PPU/testPpuWriteFromVmain.cpp
@@ -4,7 +4,7 @@
 
 #include <bitset>
 #include "tests.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "SNES.hpp"
 #include "Memory/MemoryBus.hpp"
 #include "PPU/PPU.hpp"
diff --git a/tests/testMemoryBus.cpp b/tests/testMemoryBus.cpp
index 042d224..1f35a35 100644
--- a/tests/testMemoryBus.cpp
+++ b/tests/testMemoryBus.cpp
@@ -2,7 +2,7 @@
 // Created by Melefo on 05/02/2020.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <iostream>
 #include "tests.hpp"
 #include "Memory/MemoryShadow.hpp"
diff --git a/tests/testRectangleMemory.cpp b/tests/testRectangleMemory.cpp
index afdc97c..14a777d 100644
--- a/tests/testRectangleMemory.cpp
+++ b/tests/testRectangleMemory.cpp
@@ -2,7 +2,7 @@
 // Created by anonymus-raccoon on 4/6/20.
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include "tests.hpp"
 #include "Memory/RectangleShadow.hpp"