diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b22b091..bfed2ae 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Third Party
-find_package(GTest)
+find_package(GTest QUIET)
 find_package(Qt6 REQUIRED COMPONENTS Core)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
@@ -9,28 +9,31 @@ set(CMAKE_AUTORCC ON)
 file(GLOB_RECURSE TEST_SOURCES "*.[hc]pp")
 file(GLOB_RECURSE CAN "../server/CAN/to_id.cpp")
 if (GTest_FOUND)
-add_executable(tests ${TEST_SOURCES} ${CAN})
+    message(STATUS "GTest found - building target tests")
+    add_executable(tests ${TEST_SOURCES} ${CAN})
 
-target_compile_options(tests PRIVATE $<$<CONFIG:Debug>:
-    -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
-    >)
+    target_compile_options(tests PRIVATE $<$<CONFIG:Debug>:
+        -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
+        >)
 
-target_link_libraries(tests
-    PRIVATE
-    UI
-    gtest
-    GTest::gtest_main
-    Qt::Core
-)
+    target_link_libraries(tests
+        PRIVATE
+        UI
+        gtest
+        magic_enum::magic_enum
+        GTest::gtest_main
+        Qt::Core
+    )
 
-target_include_directories(tests
-    PUBLIC
-    ${CMAKE_MAIN_SOURCE_DIR}/external/**
-    ${CMAKE_CURRENT_LIST_DIR}
-    ${CMAKE_MAIN_SOURCE_DIR}/src/**
-    ${PROJECT_BINARY_DIR}
-)
+    target_include_directories(tests
+        PUBLIC
+        ${CMAKE_SOURCE_DIR}/external/cpp-templates
+        ${CMAKE_CURRENT_LIST_DIR}
+        ${PROJECT_BINARY_DIR}
+    )
 
-include(GoogleTest)
-gtest_discover_tests(tests)
+    include(GoogleTest)
+    gtest_discover_tests(tests)
+else()
+    message(STATUS "GTest not found - not building target tests")
 endif()