diff --git a/tests/LibraryTests/SpeciesLibraryTests.cpp b/tests/LibraryTests/SpeciesLibraryTests.cpp
index 4e467a6..7303cb7 100644
--- a/tests/LibraryTests/SpeciesLibraryTests.cpp
+++ b/tests/LibraryTests/SpeciesLibraryTests.cpp
@@ -8,7 +8,6 @@ TEST_CASE("Able to build and destroy empty library") {
     delete lib;
 }
 
-
 REGISTER_EXCEPTION_TRANSLATOR(ArbUt::Exception& ex) {
     return {(std::string(ex.what()) + "\n" + ex.GetStacktrace()).c_str()};
 }
diff --git a/tests/LibraryTests/SpeciesTests.cpp b/tests/LibraryTests/SpeciesTests.cpp
index e60f9f5..55e96c0 100644
--- a/tests/LibraryTests/SpeciesTests.cpp
+++ b/tests/LibraryTests/SpeciesTests.cpp
@@ -2,6 +2,4 @@
 #include <doctest.h>
 #include "../../src/Library/Species/PokemonSpecies.hpp"
 
-
-
 #endif
\ No newline at end of file
diff --git a/tests/ScriptTests/Angelscript/BaseScriptClassTests.cpp b/tests/ScriptTests/Angelscript/BaseScriptClassTests.cpp
index ea9ba71..3703b4a 100644
--- a/tests/ScriptTests/Angelscript/BaseScriptClassTests.cpp
+++ b/tests/ScriptTests/Angelscript/BaseScriptClassTests.cpp
@@ -1,14 +1,12 @@
 #if TESTS_BUILD and ANGELSCRIPT
 #include <doctest.h>
+#include "../../TestLibrary/TestLibrary.hpp"
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../TestLibrary/TestLibrary.hpp"
 
 #define AS_CLASS(name, contents)                                                                                       \
-    {                                                                                                                  \
-#name, "namespace Pokemon{ [Pokemon effect=" #name "] shared class " #name " : PkmnScript { " contents "}}"    \
-    }
+    { #name, "namespace Pokemon{ [Pokemon effect=" #name "] shared class " #name " : PkmnScript { " contents "}}" }
 
 static std::unordered_map<const char*, const char*> _scripts = std::unordered_map<const char*, const char*>{
     AS_CLASS(blankScript, ),
diff --git a/tests/ScriptTests/Angelscript/ItemUseScriptTests.cpp b/tests/ScriptTests/Angelscript/ItemUseScriptTests.cpp
index 5d98a2d..5173024 100644
--- a/tests/ScriptTests/Angelscript/ItemUseScriptTests.cpp
+++ b/tests/ScriptTests/Angelscript/ItemUseScriptTests.cpp
@@ -1,8 +1,8 @@
 #if TESTS_BUILD and ANGELSCRIPT
 #include <doctest.h>
+#include "../../TestLibrary/TestLibrary.hpp"
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
-#include "../../TestLibrary/TestLibrary.hpp"
 
 #define AS_CLASS(name, contents)                                                                                       \
     { #name, "namespace Pokemon{ [ItemUse effect=" #name "] class " #name " : ItemUseScript { " contents "}}" }
diff --git a/tests/ScriptTests/Angelscript/ScriptOwnerTest.cpp b/tests/ScriptTests/Angelscript/ScriptOwnerTest.cpp
index 39047af..ddc93bc 100644
--- a/tests/ScriptTests/Angelscript/ScriptOwnerTest.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptOwnerTest.cpp
@@ -1,9 +1,9 @@
 #if TESTS_BUILD and ANGELSCRIPT
 #include <doctest.h>
+#include "../../TestLibrary/TestLibrary.hpp"
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =
     std::unordered_map<const char*, const char*>{{"basic_ownership_test",
diff --git a/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/BattleTests.cpp b/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/BattleTests.cpp
index b6363da..6bab623 100644
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/BattleTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/BattleTests.cpp
@@ -1,10 +1,10 @@
 #if TESTS_BUILD and ANGELSCRIPT
 #include <doctest.h>
+#include "../../../../TestLibrary/TestLibrary.hpp"
 #include "../../../../src/Battling/Battle/Battle.hpp"
 #include "../../../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =
     std::unordered_map<const char*, const char*>{{"testScript1", R"(
diff --git a/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/PokemonTests.cpp b/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/PokemonTests.cpp
index e5470c9..a514282 100644
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/PokemonTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Battle/PokemonTests.cpp
@@ -1,9 +1,9 @@
 #if TESTS_BUILD and ANGELSCRIPT
 #include <doctest.h>
+#include "../../../../TestLibrary/TestLibrary.hpp"
 #include "../../../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =
     std::unordered_map<const char*, const char*>{{"testScript1", R"(
diff --git a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/FormesTests.cpp b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/FormesTests.cpp
index 75838d6..3caadcd 100644
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/FormesTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/FormesTests.cpp
@@ -1,8 +1,8 @@
 #if TESTS_BUILD and ANGELSCRIPT
 #include <doctest.h>
+#include "../../../../TestLibrary/TestLibrary.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =
     std::unordered_map<const char*, const char*>{{"testScript1", R"(
diff --git a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/ItemDataTests.cpp b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/ItemDataTests.cpp
index 17196f3..7905e16 100644
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/ItemDataTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/ItemDataTests.cpp
@@ -1,8 +1,8 @@
 #if TESTS_BUILD and ANGELSCRIPT
 #include <doctest.h>
+#include "../../../../TestLibrary/TestLibrary.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =
     std::unordered_map<const char*, const char*>{{"testScript1", R"(
diff --git a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/MoveTests.cpp b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/MoveTests.cpp
index 9faf4e5..38930b8 100644
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/MoveTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/MoveTests.cpp
@@ -1,8 +1,8 @@
 #if TESTS_BUILD and ANGELSCRIPT
 #include <doctest.h>
+#include "../../../../TestLibrary/TestLibrary.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =
     std::unordered_map<const char*, const char*>{{"testScript1", R"(
diff --git a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/SpeciesTests.cpp b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/SpeciesTests.cpp
index 06f6a5f..b2f71ff 100644
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/SpeciesTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/SpeciesTests.cpp
@@ -1,8 +1,8 @@
 #if TESTS_BUILD && ANGELSCRIPT
 #include <doctest.h>
+#include "../../../../TestLibrary/TestLibrary.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =
     std::unordered_map<const char*, const char*>{{"testScript1", R"(
diff --git a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/StaticLibraryTests.cpp b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/StaticLibraryTests.cpp
index 908e7b7..2654eaf 100644
--- a/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/StaticLibraryTests.cpp
+++ b/tests/ScriptTests/Angelscript/ScriptTypeTests/Library/StaticLibraryTests.cpp
@@ -1,8 +1,8 @@
 #if TESTS_BUILD and ANGELSCRIPT
 #include <doctest.h>
+#include "../../../../TestLibrary/TestLibrary.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
-#include "../../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =
     std::unordered_map<const char*, const char*>{{"testScript1", R"(