Trying to use catch instead of critertion

tests/tests.hpp

@@ -2,28 +2,29 @@
 // Created by Melefo on 05/02/2020.
 //
 
-#ifndef COMSQUARE_TESTS_HPP
-#define COMSQUARE_TESTS_HPP
+#pragma once
+
+#include <cstring>
+// The include here is to prevent successive includes of this file to come after the define.
+#include <filesystem>
 
 #define private public
 #define protected public
 #define class struct
 
-#include "../sources/Memory/MemoryBus.hpp"
-#include <criterion/criterion.h>
-#include <iostream>
-#include <zconf.h>
-#include "tests.hpp"
-#include "../sources/Renderer/NoRenderer.hpp"
-#include "../sources/SNES.hpp"
+#include "Memory/MemoryBus.hpp"
+#include "Renderer/NoRenderer.hpp"
+#include "SNES.hpp"
 
 #define Init() \
-	Renderer::NoRenderer norenderer(0, 0, 0); \
-	SNES snes("../tests/my_cartridge", norenderer); \
-	snes.cartridge->_size = 100; \
+	Renderer::NoRenderer norenderer(0, 0, 0);                   \
+	SNES snes("../tests/my_cartridge", norenderer);             \
+	snes.cartridge->_size = 100;                                \
+    delete[] snes.cartridge->_data;                             \
 	snes.cartridge->_data = new uint8_t[snes.cartridge->_size]; \
-	snes.cartridge->header.mappingMode = Cartridge::LoRom; \
-	snes.sram->_size = 100; \
-	snes.sram->_data = new uint8_t[snes.cartridge->_size];
-
-#endif //COMSQUARE_TESTS_HPP
+    memset(snes.cartridge->_data, 0, snes.cartridge->_size);    \
+	snes.cartridge->header.mappingMode = Cartridge::LoRom;      \
+	snes.sram->_size = 100;                                     \
+    delete[] snes.sram->_data;                                  \
+	snes.sram->_data = new uint8_t[snes.sram->_size];           \
+	memset(snes.sram->_data, 0, snes.cartridge->_size);