diff --git a/src/common/byteArrayHelper/CMakeLists.txt b/src/common/byteArrayHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/byteArrayHelper/CMakeLists.txt
+++ b/src/common/byteArrayHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/byteArrayHelper/tests/CMakeLists.txt b/src/common/byteArrayHelper/tests/CMakeLists.txt
index 300bbbed97..16a2f1952f 100644
--- a/src/common/byteArrayHelper/tests/CMakeLists.txt
+++ b/src/common/byteArrayHelper/tests/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(byte_array_helper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
 
@@ -11,74 +18,57 @@ file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
 
 file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(byte_array_helper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(byte_array_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(byte_array_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
         -static-libgcc
         ws2_32
-        crypt32
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(byte_array_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(byte_array_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(byte_array_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(byte_array_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME byteArrayHelperTests
+         COMMAND byte_array_helper_tests)
diff --git a/src/common/byteArrayHelper/tests/byteArrayHelper_test.cpp b/src/common/byteArrayHelper/tests/byteArrayHelper_test.cpp
index 78a3f80952..4a1a39613b 100644
--- a/src/common/byteArrayHelper/tests/byteArrayHelper_test.cpp
+++ b/src/common/byteArrayHelper/tests/byteArrayHelper_test.cpp
@@ -16,16 +16,16 @@ void ByteArrayHelperTest::SetUp() {};
 
 void ByteArrayHelperTest::TearDown() {};
 
-constexpr uint8_t bufferBE[] = {0x12, 0x34, 0x56, 0x78};
-constexpr uint8_t bufferLE[] = {0x78, 0x56, 0x34, 0x12};
-constexpr int32_t result {305419896};
+constexpr uint8_t BUFFER_BE[] = {0x12, 0x34, 0x56, 0x78};
+constexpr uint8_t BUFFER_LE[] = {0x78, 0x56, 0x34, 0x12};
+constexpr int32_t RESULT {305419896};
 
 TEST_F(ByteArrayHelperTest, toInt32BE)
 {
-    EXPECT_EQ(result, Utils::toInt32BE(bufferBE));
+    EXPECT_EQ(RESULT, Utils::toInt32BE(BUFFER_BE));
 }
 
 TEST_F(ByteArrayHelperTest, toInt32LE)
 {
-    EXPECT_EQ(result, Utils::toInt32LE(bufferLE));
+    EXPECT_EQ(RESULT, Utils::toInt32LE(BUFFER_LE));
 }
diff --git a/src/common/cmdHelper/CMakeLists.txt b/src/common/cmdHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/cmdHelper/CMakeLists.txt
+++ b/src/common/cmdHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/cmdHelper/tests/CMakeLists.txt b/src/common/cmdHelper/tests/CMakeLists.txt
index 8b1078ea0d..80507a91f4 100644
--- a/src/common/cmdHelper/tests/CMakeLists.txt
+++ b/src/common/cmdHelper/tests/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(cmd_helper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
 
@@ -11,74 +18,59 @@ file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
 
 file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(cmd_helper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(cmd_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(cmd_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
         -static-libgcc
         ws2_32
-        crypt32
+        pal
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(cmd_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(cmd_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(cmd_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(cmd_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
+        pal
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME cmdHelperTests
+         COMMAND cmd_helper_tests)
diff --git a/src/common/data_provider/CMakeLists.txt b/src/common/data_provider/CMakeLists.txt
index 1ad7f8ef04..299a8c1b72 100644
--- a/src/common/data_provider/CMakeLists.txt
+++ b/src/common/data_provider/CMakeLists.txt
@@ -2,12 +2,13 @@ cmake_minimum_required(VERSION 3.22)
 
 project(sysinfo)
 
+include(../../cmake/CommonSettings.cmake)
+set_common_settings()
+
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif()
 
-enable_testing()
-
 get_filename_component(SRC_FOLDER     ${CMAKE_CURRENT_SOURCE_DIR}/../../ ABSOLUTE)
 
 if(COVERITY)
@@ -206,18 +207,13 @@ target_link_libraries(sysinfo PUBLIC
   unofficial::sqlite3::sqlite3)
 
 if(BUILD_TESTS)
-  if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      target_link_libraries(sysinfo PRIVATE -fprofile-arcs)
-    else()
-      target_link_libraries(sysinfo PRIVATE gcov)
-    endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  enable_testing()
+  add_subdirectory(tests)
+endif(BUILD_TESTS)
 
-    add_subdirectory(tests)
-  endif(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
-else()
+if(NOT DEFINED COVERITY AND NOT DEFINED BUILD_TESTS)
   if(FSANITIZE)
       target_link_libraries(sysinfo PRIVATE gcov)
   endif(FSANITIZE)
   add_subdirectory(testtool)
-endif(BUILD_TESTS)
+endif(NOT DEFINED COVERITY AND NOT DEFINED BUILD_TESTS)
diff --git a/src/common/data_provider/tests/CMakeLists.txt b/src/common/data_provider/tests/CMakeLists.txt
index 522c24a6ae..d00a506bef 100644
--- a/src/common/data_provider/tests/CMakeLists.txt
+++ b/src/common/data_provider/tests/CMakeLists.txt
@@ -23,11 +23,5 @@ if(HAS_FILESYSTEM OR CMAKE_SYSTEM_NAME STREQUAL "Windows")
   add_subdirectory(sysInfoPackages)
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS " -fprofile-arcs ")
-else()
-  string(APPEND CMAKE_EXE_LINKER_FLAGS " -lgcov ")
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
 add_subdirectory(sysInfo)
 add_subdirectory(sysInfoPorts)
diff --git a/src/common/dbsync/CMakeLists.txt b/src/common/dbsync/CMakeLists.txt
index a359a703f6..60e0c126cf 100644
--- a/src/common/dbsync/CMakeLists.txt
+++ b/src/common/dbsync/CMakeLists.txt
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.22)
 
 project(dbsync)
 
-enable_testing()
+include(../../cmake/CommonSettings.cmake)
+set_common_settings()
 
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
@@ -70,16 +71,9 @@ add_library(dbsync STATIC
 target_link_libraries(dbsync PUBLIC utils nlohmann_json::nlohmann_json cjson unofficial::sqlite3::sqlite3 pal)
 
 if(BUILD_TESTS)
-  if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      target_link_libraries(dbsync PRIVATE -fprofile-arcs)
-    else()
-      target_link_libraries(dbsync PRIVATE gcov)
-    endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-    add_subdirectory(tests)
-    add_subdirectory(integrationTests)
-  endif(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  enable_testing()
+  add_subdirectory(tests)
+  add_subdirectory(integrationTests)
 endif(BUILD_TESTS)
 
 if(NOT DEFINED COVERITY AND NOT DEFINED BUILD_TESTS)
diff --git a/src/common/dbsync/integrationTests/CMakeLists.txt b/src/common/dbsync/integrationTests/CMakeLists.txt
index 15713dae31..a58c60850f 100644
--- a/src/common/dbsync/integrationTests/CMakeLists.txt
+++ b/src/common/dbsync/integrationTests/CMakeLists.txt
@@ -6,10 +6,4 @@ include_directories(${CMAKE_SOURCE_DIR}/include/)
 
 find_package(GTest CONFIG REQUIRED)
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS " -fprofile-arcs ")
-else()
-  string(APPEND CMAKE_EXE_LINKER_FLAGS " -lgcov ")
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
 add_subdirectory(fim)
diff --git a/src/common/dbsync/tests/CMakeLists.txt b/src/common/dbsync/tests/CMakeLists.txt
index a8e147c950..bdd16af3af 100644
--- a/src/common/dbsync/tests/CMakeLists.txt
+++ b/src/common/dbsync/tests/CMakeLists.txt
@@ -7,12 +7,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src/sqlite/)
 
 find_package(GTest CONFIG REQUIRED)
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  string(APPEND CMAKE_EXE_LINKER_FLAGS " -fprofile-arcs ")
-else()
-  string(APPEND CMAKE_EXE_LINKER_FLAGS " -lgcov ")
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
 add_subdirectory(sqlite)
 add_subdirectory(interface)
 add_subdirectory(pipelineFactory)
diff --git a/src/common/encodingHelper/CMakeLists.txt b/src/common/encodingHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/encodingHelper/CMakeLists.txt
+++ b/src/common/encodingHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/encodingHelper/tests/CMakeLists.txt b/src/common/encodingHelper/tests/CMakeLists.txt
index c9c30ac217..0ed48212b7 100644
--- a/src/common/encodingHelper/tests/CMakeLists.txt
+++ b/src/common/encodingHelper/tests/CMakeLists.txt
@@ -1,6 +1,14 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(encoding_helper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+find_package(nlohmann_json CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC
     "encodingWindows_test.cpp"
@@ -12,74 +20,59 @@ file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
 
 file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(encoding_helper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(encoding_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(encoding_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
+        nlohmann_json::nlohmann_json
         -static-libgcc
         ws2_32
-        crypt32
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(encoding_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(encoding_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(encoding_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(encoding_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
+        nlohmann_json::nlohmann_json
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME encodingHelperTests
+         COMMAND encoding_helper_tests)
diff --git a/src/common/encodingHelper/tests/encodingWindows_test.cpp b/src/common/encodingHelper/tests/encodingWindows_test.cpp
index 261338b708..58e833917d 100644
--- a/src/common/encodingHelper/tests/encodingWindows_test.cpp
+++ b/src/common/encodingHelper/tests/encodingWindows_test.cpp
@@ -11,7 +11,7 @@
 #ifdef WIN32
 #include "encodingWindows_test.h"
 #include "encodingWindowsHelper.h"
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 void EncodingWindowsHelperTest::SetUp() {};
 
diff --git a/src/common/fileHelper/CMakeLists.txt b/src/common/fileHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/fileHelper/CMakeLists.txt
+++ b/src/common/fileHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/fileHelper/include/filesystemHelper.h b/src/common/fileHelper/include/filesystemHelper.h
index b5c6847926..cdbe2538c0 100644
--- a/src/common/fileHelper/include/filesystemHelper.h
+++ b/src/common/fileHelper/include/filesystemHelper.h
@@ -97,7 +97,7 @@ namespace Utils
 
     static std::vector<char> getBinaryContent(const std::string& filePath)
     {
-        auto size { 0 };
+        long size { 0 };
         std::unique_ptr<char[]> spBuffer;
         std::ifstream file { filePath, std::ios_base::binary };
 
@@ -112,7 +112,7 @@ namespace Utils
                 size = buffer->pubseekoff(0, file.end, file.in);
                 buffer->pubseekpos(0, file.in);
                 // Allocate memory to contain file data
-                spBuffer = std::make_unique<char[]>(size);
+                spBuffer = std::make_unique<char[]>(static_cast<size_t>(size));
                 // Get file data
                 buffer->sgetn(spBuffer.get(), size);
             }
diff --git a/src/common/fileHelper/tests/CMakeLists.txt b/src/common/fileHelper/tests/CMakeLists.txt
index 513b9818e5..236c84aa72 100644
--- a/src/common/fileHelper/tests/CMakeLists.txt
+++ b/src/common/fileHelper/tests/CMakeLists.txt
@@ -1,84 +1,53 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    project(file_helper_tests)
 
-file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
+    include(../../../cmake/CommonSettings.cmake)
+    set_common_settings()
 
-file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
-    "filesystemHelper_test.cpp"
-    "main.cpp"
-)
+    find_package(GTest CONFIG REQUIRED)
 
-file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
+    set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
+    file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
+        "filesystemHelper_test.cpp"
+        "stdFileSystemHelper_test.cpp"
+        "main.cpp"
+    )
 
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+    file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
-      ${UTIL_CXX_UNITTEST_COMMON_SRC}
-      ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
-      ${UTIL_CXX_UNITTEST_CPP17_SRC}
-    )
-    add_definitions(-DWIN32=1
-                    -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
-        -static-libgcc
-        ws2_32
-        crypt32
-    )
-else()
+    add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(file_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(file_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(file_helper_tests)
+
+    include_directories(../include/)
+    include_directories(../../globHelper/include/)
+    include_directories(../../stringHelper/include/)
+
+    target_link_libraries(file_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
     )
-endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    add_test(NAME fileHelperTests
+            COMMAND file_helper_tests)
 
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+endif(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
diff --git a/src/common/globHelper/CMakeLists.txt b/src/common/globHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/globHelper/CMakeLists.txt
+++ b/src/common/globHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/globHelper/tests/CMakeLists.txt b/src/common/globHelper/tests/CMakeLists.txt
index 230e66025f..8c3ced793d 100644
--- a/src/common/globHelper/tests/CMakeLists.txt
+++ b/src/common/globHelper/tests/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(glob_helper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
 
@@ -11,74 +18,57 @@ file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
 
 file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(glob_helper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(glob_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(glob_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
         -static-libgcc
         ws2_32
-        crypt32
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(glob_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(glob_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(glob_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(glob_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME globHelperTests
+         COMMAND glob_helper_tests)
diff --git a/src/common/hashHelper/CMakeLists.txt b/src/common/hashHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/hashHelper/CMakeLists.txt
+++ b/src/common/hashHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/hashHelper/tests/CMakeLists.txt b/src/common/hashHelper/tests/CMakeLists.txt
index 52885d8b32..00e810888a 100644
--- a/src/common/hashHelper/tests/CMakeLists.txt
+++ b/src/common/hashHelper/tests/CMakeLists.txt
@@ -1,6 +1,14 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(hash_helper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+find_package(OpenSSL REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
 
@@ -13,72 +21,61 @@ file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
 file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(hash_helper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(hash_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(hash_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
+        OpenSSL::SSL
+        OpenSSL::Crypto
         -static-libgcc
         ws2_32
-        crypt32
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(hash_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(hash_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(hash_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(hash_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
+        OpenSSL::SSL
+        OpenSSL::Crypto
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME hashHelperTests
+         COMMAND hash_helper_tests)
diff --git a/src/common/hashHelper/tests/hashHelper_test.cpp b/src/common/hashHelper/tests/hashHelper_test.cpp
index 51be579a81..db4d7a08e8 100644
--- a/src/common/hashHelper/tests/hashHelper_test.cpp
+++ b/src/common/hashHelper/tests/hashHelper_test.cpp
@@ -17,7 +17,6 @@ void HashHelperTest::SetUp() {};
 
 void HashHelperTest::TearDown() {};
 
-using ::testing::_;
 using ::testing::Return;
 using namespace Utils;
 
@@ -99,7 +98,7 @@ TEST_F(HashHelperTest, HashFile)
     const std::vector<unsigned char> expectedHash { 0x2e, 0x95, 0xd7, 0x58, 0x2c, 0x53, 0x58, 0x3f, 0xa8, 0xaf,
                                                     0xb5, 0x4e, 0x0f, 0xe7, 0xa2, 0x59, 0x7c, 0x92, 0xcb, 0xba};
 
-    EXPECT_EQ(Utils::hashFile(TEST_FILE), expectedHash);
+    EXPECT_EQ(Utils::hashFile(TEST_FILE.generic_string()), expectedHash);
 }
 
 /**
@@ -108,5 +107,5 @@ TEST_F(HashHelperTest, HashFile)
  */
 TEST_F(HashHelperTest, HashFileInexistantFile)
 {
-    EXPECT_THROW(Utils::hashFile(INPUT_FILES_DIR / "inexistant_file.xml"), std::runtime_error);
+    EXPECT_THROW(Utils::hashFile((INPUT_FILES_DIR / "inexistant_file.xml").generic_string()), std::runtime_error);
 }
diff --git a/src/common/jsonHelper/CMakeLists.txt b/src/common/jsonHelper/CMakeLists.txt
index 352bfd0c00..e6c221c6e6 100644
--- a/src/common/jsonHelper/CMakeLists.txt
+++ b/src/common/jsonHelper/CMakeLists.txt
@@ -1,5 +1 @@
 cmake_minimum_required(VERSION 3.22)
-
-if(UNIT_TEST)
-    add_subdirectory(tests)
-endif()
diff --git a/src/common/linuxHelper/CMakeLists.txt b/src/common/linuxHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/linuxHelper/CMakeLists.txt
+++ b/src/common/linuxHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/linuxHelper/tests/CMakeLists.txt b/src/common/linuxHelper/tests/CMakeLists.txt
index 321604de4f..7aa56f12d8 100644
--- a/src/common/linuxHelper/tests/CMakeLists.txt
+++ b/src/common/linuxHelper/tests/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(linux_helper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
 
@@ -12,74 +19,63 @@ file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC
     "linuxInfoHelper_test.cpp"
 )
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(linux_helper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(linux_helper_tests)
+
+    include_directories(../include/)
+    include_directories(../../cmdHelper/include/)
+    include_directories(../../fileHelper/include/)
+    include_directories(../../stringHelper/include/)
+
+    target_link_libraries(linux_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
         -static-libgcc
         ws2_32
-        crypt32
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(linux_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(linux_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(linux_helper_tests)
+
+    include_directories(../include/)
+    include_directories(../../cmdHelper/include/)
+    include_directories(../../fileHelper/include/)
+    include_directories(../../stringHelper/include/)
+
+    target_link_libraries(linux_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME linuxHelperTests
+         COMMAND linux_helper_tests)
diff --git a/src/common/mapWrapper/CMakeLists.txt b/src/common/mapWrapper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/mapWrapper/CMakeLists.txt
+++ b/src/common/mapWrapper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/mapWrapper/tests/CMakeLists.txt b/src/common/mapWrapper/tests/CMakeLists.txt
index 9c12a04c2a..6fb8c527a3 100644
--- a/src/common/mapWrapper/tests/CMakeLists.txt
+++ b/src/common/mapWrapper/tests/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(map_wrapper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
 
@@ -11,74 +18,57 @@ file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
 
 file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(map_wrapper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(map_wrapper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(map_wrapper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
         -static-libgcc
         ws2_32
-        crypt32
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(map_wrapper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(map_wrapper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(map_wrapper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(map_wrapper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME mapWrapperTests
+         COMMAND map_wrapper_tests)
diff --git a/src/common/networkHelper/CMakeLists.txt b/src/common/networkHelper/CMakeLists.txt
index 352bfd0c00..e6c221c6e6 100644
--- a/src/common/networkHelper/CMakeLists.txt
+++ b/src/common/networkHelper/CMakeLists.txt
@@ -1,5 +1 @@
 cmake_minimum_required(VERSION 3.22)
-
-if(UNIT_TEST)
-    add_subdirectory(tests)
-endif()
diff --git a/src/common/pal/CMakeLists.txt b/src/common/pal/CMakeLists.txt
index a5301adee0..508184b527 100644
--- a/src/common/pal/CMakeLists.txt
+++ b/src/common/pal/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.22)
+
 project(pal)
 
+include(../../cmake/CommonSettings.cmake)
+set_common_settings()
+
 if(WIN32)
     set(OS_NAME "windows")
 elseif(APPLE)
diff --git a/src/common/pal/tests/windows/CMakeLists.txt b/src/common/pal/tests/windows/CMakeLists.txt
index 43a2ab129d..7c204922e2 100644
--- a/src/common/pal/tests/windows/CMakeLists.txt
+++ b/src/common/pal/tests/windows/CMakeLists.txt
@@ -1,6 +1,7 @@
 find_package(GTest CONFIG REQUIRED)
 
 add_executable(PalTime_test pal_time_test.cpp)
+configure_target(PalTime_test)
 target_include_directories(PalTime_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
 target_link_libraries(PalTime_test PRIVATE pal GTest::gtest GTest::gtest_main)
 add_test(NAME PalTimeTest COMMAND PalTime_test)
diff --git a/src/common/pipelineHelper/CMakeLists.txt b/src/common/pipelineHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/pipelineHelper/CMakeLists.txt
+++ b/src/common/pipelineHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/pipelineHelper/tests/CMakeLists.txt b/src/common/pipelineHelper/tests/CMakeLists.txt
index c2cd0c37e0..b122d292fc 100644
--- a/src/common/pipelineHelper/tests/CMakeLists.txt
+++ b/src/common/pipelineHelper/tests/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(pipeline_helper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
 
@@ -11,74 +18,63 @@ file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
 
 file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(pipeline_helper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(pipeline_helper_tests)
+
+    include_directories(../include/)
+    include_directories(../../)
+    include_directories(../../threadDispatcher/include/)
+    include_directories(../../utils/include/)
+
+    target_link_libraries(pipeline_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
         -static-libgcc
         ws2_32
-        crypt32
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(pipeline_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(pipeline_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(pipeline_helper_tests)
+
+    include_directories(../include/)
+    include_directories(../../)
+    include_directories(../../threadDispatcher/include/)
+    include_directories(../../utils/include/)
+
+    target_link_libraries(pipeline_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME pipelineHelperTests
+         COMMAND pipeline_helper_tests)
diff --git a/src/common/pipelineHelper/tests/pipelineNodes_test.cpp b/src/common/pipelineHelper/tests/pipelineNodes_test.cpp
index 3acbf32f90..c11d5b866e 100644
--- a/src/common/pipelineHelper/tests/pipelineNodes_test.cpp
+++ b/src/common/pipelineHelper/tests/pipelineNodes_test.cpp
@@ -21,12 +21,18 @@ class FunctorWrapper
     public:
         FunctorWrapper() = default;
         ~FunctorWrapper() = default;
+
+        FunctorWrapper(const FunctorWrapper&) = delete;
+        FunctorWrapper& operator=(const FunctorWrapper&) = delete;
+        FunctorWrapper(FunctorWrapper&&) = delete;
+        FunctorWrapper& operator=(FunctorWrapper&&) = delete;
+
         MOCK_METHOD(void, Operator, (const int), ());
         void operator()(const int value)
         {
             Operator(value);
         }
-        void receive(const int& value)
+        void receive(const int& value) // NOLINT(readability-identifier-naming)
         {
             Operator(value);
         }
@@ -151,12 +157,12 @@ TEST_F(PipelineNodesTest, ConnectInvalidPtrs3)
 template<typename T>
 static void ReadNodeBehaviour(FunctorWrapper& functor, T& rNode)
 {
-    for (int i = 0; i < 10; ++i)
+    for (int i = 0; i < 10; ++i) // NOLINT(cppcoreguidelines-avoid-magic-numbers)
     {
         EXPECT_CALL(functor, Operator(i));
     }
 
-    for (int i = 0; i < 10; ++i)
+    for (int i = 0; i < 10; ++i) // NOLINT(cppcoreguidelines-avoid-magic-numbers)
     {
         rNode.receive(i);
     }
@@ -171,12 +177,12 @@ static void ReadWriteNodeBehaviour(FunctorWrapper& functor, std::shared_ptr<R>&
 {
     Utils::connect(spReadWriteNode, spReadNode);
 
-    for (int i = 0; i < 10; ++i)
+    for (int i = 0; i < 10; ++i) // NOLINT(cppcoreguidelines-avoid-magic-numbers)
     {
         EXPECT_CALL(functor, Operator(i));
     }
 
-    for (int i = 0; i < 10; ++i)
+    for (int i = 0; i < 10; ++i) // NOLINT(cppcoreguidelines-avoid-magic-numbers)
     {
         spReadWriteNode->receive(std::to_string(i));
     }
diff --git a/src/common/registryHelper/CMakeLists.txt b/src/common/registryHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/registryHelper/CMakeLists.txt
+++ b/src/common/registryHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/registryHelper/tests/CMakeLists.txt b/src/common/registryHelper/tests/CMakeLists.txt
index dbb1bec88d..a5a198b570 100644
--- a/src/common/registryHelper/tests/CMakeLists.txt
+++ b/src/common/registryHelper/tests/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(registry_helper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC
     "registryHelper_test.cpp"
@@ -12,74 +19,67 @@ file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
 
 file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(registry_helper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(registry_helper_tests)
+
+    include_directories(../include/)
+    include_directories(../../encodingHelper/include/)
+    include_directories(../../globHelper/include/)
+    include_directories(../../stringHelper/include/)
+    include_directories(../../timeHelper/include/)
+    include_directories(../../windowsHelper/include/)
+
+    target_link_libraries(registry_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
         -static-libgcc
         ws2_32
-        crypt32
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(registry_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(registry_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(registry_helper_tests)
+
+    include_directories(../include/)
+    include_directories(../../encodingHelper/include/)
+    include_directories(../../globHelper/include/)
+    include_directories(../../stringHelper/include/)
+    include_directories(../../timeHelper/include/)
+    include_directories(../../windowsHelper/include/)
+
+    target_link_libraries(registry_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME registryHelperTests
+         COMMAND registry_helper_tests)
diff --git a/src/common/sqliteWrapper/CMakeLists.txt b/src/common/sqliteWrapper/CMakeLists.txt
index 352bfd0c00..e6c221c6e6 100644
--- a/src/common/sqliteWrapper/CMakeLists.txt
+++ b/src/common/sqliteWrapper/CMakeLists.txt
@@ -1,5 +1 @@
 cmake_minimum_required(VERSION 3.22)
-
-if(UNIT_TEST)
-    add_subdirectory(tests)
-endif()
diff --git a/src/common/stringHelper/CMakeLists.txt b/src/common/stringHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/stringHelper/CMakeLists.txt
+++ b/src/common/stringHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/stringHelper/tests/CMakeLists.txt b/src/common/stringHelper/tests/CMakeLists.txt
index 9e9aae40b3..9d53b21d7c 100644
--- a/src/common/stringHelper/tests/CMakeLists.txt
+++ b/src/common/stringHelper/tests/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(string_helper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
 
@@ -11,74 +18,57 @@ file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
 
 file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(string_helper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(string_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(string_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
         -static-libgcc
         ws2_32
-        crypt32
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(string_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(string_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(string_helper_tests)
+
+    include_directories(../include/)
+
+    target_link_libraries(string_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME stringHelperTests
+         COMMAND string_helper_tests)
diff --git a/src/common/threadDispatcher/CMakeLists.txt b/src/common/threadDispatcher/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/threadDispatcher/CMakeLists.txt
+++ b/src/common/threadDispatcher/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/threadDispatcher/tests/CMakeLists.txt b/src/common/threadDispatcher/tests/CMakeLists.txt
index 32e4000270..ebbae3b4ff 100644
--- a/src/common/threadDispatcher/tests/CMakeLists.txt
+++ b/src/common/threadDispatcher/tests/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(thread_dispatcher_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
 
@@ -12,74 +19,61 @@ file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
 
 file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(thread_dispatcher_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(thread_dispatcher_tests)
+
+    include_directories(../include/)
+    include_directories(../../)
+    include_directories(../../utils/include/)
+
+    target_link_libraries(thread_dispatcher_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
         -static-libgcc
         ws2_32
-        crypt32
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(thread_dispatcher_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(thread_dispatcher_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(thread_dispatcher_tests)
+
+    include_directories(../include/)
+    include_directories(../../)
+    include_directories(../../utils/include/)
+
+    target_link_libraries(thread_dispatcher_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME threadDispatcherTests
+         COMMAND thread_dispatcher_tests)
diff --git a/src/common/threadDispatcher/tests/threadDispatcher_test.cpp b/src/common/threadDispatcher/tests/threadDispatcher_test.cpp
index d106193ff9..9e8b285c6a 100644
--- a/src/common/threadDispatcher/tests/threadDispatcher_test.cpp
+++ b/src/common/threadDispatcher/tests/threadDispatcher_test.cpp
@@ -18,15 +18,20 @@ void ThreadDispatcherTest::SetUp() {};
 
 void ThreadDispatcherTest::TearDown() {};
 
-using ::testing::_;
 using namespace Utils;
 
 // LCOV_EXCL_START
 class FunctorWrapper
 {
     public:
-        FunctorWrapper() {}
-        ~FunctorWrapper() {}
+        FunctorWrapper() = default;
+        ~FunctorWrapper() = default;
+
+        FunctorWrapper(const FunctorWrapper&) = delete;
+        FunctorWrapper(FunctorWrapper&&) = delete;
+        FunctorWrapper& operator=(const FunctorWrapper&) = delete;
+        FunctorWrapper& operator=(FunctorWrapper&&) = delete;
+
         MOCK_METHOD(void, Operator, (const int), ());
         void operator()(const int value)
         {
@@ -44,12 +49,12 @@ TEST_F(ThreadDispatcherTest, AsyncDispatcherPushAndRundown)
     };
     EXPECT_EQ(std::thread::hardware_concurrency(), dispatcher.numberOfThreads());
 
-    for (int i = 0; i < 10; ++i)
+    for (int i = 0; i < 10; ++i) // NOLINT(cppcoreguidelines-avoid-magic-numbers)
     {
         EXPECT_CALL(functor, Operator(i));
     }
 
-    for (int i = 0; i < 10; ++i)
+    for (int i = 0; i < 10; ++i) // NOLINT(cppcoreguidelines-avoid-magic-numbers)
     {
         dispatcher.push(i);
     }
@@ -69,7 +74,7 @@ TEST_F(ThreadDispatcherTest, AsyncDispatcherCancel)
     EXPECT_EQ(std::thread::hardware_concurrency(), dispatcher.numberOfThreads());
     dispatcher.cancel();
 
-    for (int i = 0; i < 10; ++i)
+    for (int i = 0; i < 10; ++i) // NOLINT(cppcoreguidelines-avoid-magic-numbers)
     {
         EXPECT_CALL(functor, Operator(i)).Times(0);
         dispatcher.push(i);
@@ -94,13 +99,13 @@ TEST_F(ThreadDispatcherTest, AsyncDispatcherQueue)
     {
         [&mutex, &condition, &firstCall](int)
         {
-            std::unique_lock<std::mutex> lock(mutex);
+            std::unique_lock<std::mutex> lock2(mutex);
             condition.notify_one();
 
             if (firstCall)
             {
                 firstCall = false;
-                condition.wait(lock);
+                condition.wait(lock2);
             }
         }
         , NUMBER_OF_THREADS
diff --git a/src/common/timeHelper/CMakeLists.txt b/src/common/timeHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/timeHelper/CMakeLists.txt
+++ b/src/common/timeHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/timeHelper/tests/CMakeLists.txt b/src/common/timeHelper/tests/CMakeLists.txt
index 7a74a01fac..d2de0b5a3e 100644
--- a/src/common/timeHelper/tests/CMakeLists.txt
+++ b/src/common/timeHelper/tests/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(time_helper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC)
 
@@ -11,74 +18,61 @@ file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
 
 file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(time_helper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(time_helper_tests)
+
+    include_directories(../include/)
+    include_directories(../../stringHelper/include/)
+
+    target_link_libraries(time_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
         -static-libgcc
         ws2_32
-        crypt32
+        pal
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(time_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(time_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(time_helper_tests)
+
+    include_directories(../include/)
+    include_directories(../../stringHelper/include/)
+
+    target_link_libraries(time_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
+        pal
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME timeHelperTests
+         COMMAND time_helper_tests)
diff --git a/src/common/windowsHelper/CMakeLists.txt b/src/common/windowsHelper/CMakeLists.txt
index 352bfd0c00..22785dcf0a 100644
--- a/src/common/windowsHelper/CMakeLists.txt
+++ b/src/common/windowsHelper/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
+    enable_testing()
     add_subdirectory(tests)
 endif()
diff --git a/src/common/windowsHelper/tests/CMakeLists.txt b/src/common/windowsHelper/tests/CMakeLists.txt
index 17dae0ed02..6092351d21 100644
--- a/src/common/windowsHelper/tests/CMakeLists.txt
+++ b/src/common/windowsHelper/tests/CMakeLists.txt
@@ -1,6 +1,13 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(utils_unit_test)
+project(windows_helper_tests)
+
+include(../../../cmake/CommonSettings.cmake)
+set_common_settings()
+
+find_package(GTest CONFIG REQUIRED)
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g --coverage")
 
 file(GLOB UTIL_CXX_UNITTEST_WINDOWS_SRC
     "windowsHelper_test.cpp"
@@ -12,74 +19,65 @@ file(GLOB UTIL_CXX_UNITTEST_COMMON_SRC
 
 file(GLOB UTIL_CXX_UNITTEST_LINUX_SRC)
 
-file(COPY input_files DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories(${SRC_FOLDER}/external/googletest/lib)
-link_directories(${SRC_FOLDER}/external/libarchive/.libs/)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
-  add_definitions(-DPROMISE_TYPE=PromiseType::SLEEP)
-else()
-  add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
-endif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
+add_definitions(-DPROMISE_TYPE=PromiseType::NORMAL)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_executable(utils_unit_test
+    add_executable(windows_helper_tests
       ${UTIL_CXX_UNITTEST_COMMON_SRC}
       ${UTIL_CXX_UNITTEST_WINDOWS_SRC}
       ${UTIL_CXX_UNITTEST_CPP17_SRC}
     )
+
     add_definitions(-DWIN32=1
                     -D_WIN32_WINNT=0x600)
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        pthread
-        crypto
-        ssl
+
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(windows_helper_tests)
+
+    include_directories(../include/)
+    include_directories(../../encodingHelper/include/)
+    include_directories(../../stringHelper/include/)
+    include_directories(../../timeHelper/include/)
+
+    target_link_libraries(windows_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
         -static-libgcc
         ws2_32
-        crypt32
+        pal
     )
 else()
-
-    if (APPLE)
-      add_executable(utils_unit_test
+    if(APPLE)
+      add_executable(windows_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     else()
-      add_executable(utils_unit_test
+      add_executable(windows_helper_tests
         ${UTIL_CXX_UNITTEST_COMMON_SRC}
         ${UTIL_CXX_UNITTEST_LINUX_SRC}
         ${UTIL_CXX_UNITTEST_CPP17_SRC}
       )
     endif(APPLE)
 
-    target_link_libraries(utils_unit_test
-        debug gtestd
-        debug gmockd
-        optimized gtest
-        optimized gmock
-        rocksdb
-        crypto
-        dl
-        pthread
-        rt
-        lzma
-        z
-        minizip
-        archive
+    include(../../../cmake/ConfigureTarget.cmake)
+    configure_target(windows_helper_tests)
+
+    include_directories(../include/)
+    include_directories(../../encodingHelper/include/)
+    include_directories(../../stringHelper/include/)
+    include_directories(../../timeHelper/include/)
+
+    target_link_libraries(windows_helper_tests
+        GTest::gtest
+        GTest::gmock
+        GTest::gtest_main
+        GTest::gmock_main
+        pal
     )
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  target_link_libraries(utils_unit_test -fprofile-arcs)
-else()
-  target_link_libraries(utils_unit_test gcov)
-endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-
-add_test(NAME utils_unit_test
-         COMMAND utils_unit_test)
+add_test(NAME windowsHelperTests
+         COMMAND windows_helper_tests)
diff --git a/src/modules/fim/CMakeLists.txt b/src/modules/fim/CMakeLists.txt
index 8f79c2645a..e5589e4b56 100644
--- a/src/modules/fim/CMakeLists.txt
+++ b/src/modules/fim/CMakeLists.txt
@@ -111,7 +111,7 @@ if (UNIX)
     endif(NOT APPLE)
 endif(UNIX)
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
   add_definitions(-DWAZUH_UNIT_TESTING)
   if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_link_libraries(wazuh-syscheckd -fprofile-arcs cmocka)
diff --git a/src/modules/fim/db/CMakeLists.txt b/src/modules/fim/db/CMakeLists.txt
index 4a5d9b9e67..fa84fe050e 100644
--- a/src/modules/fim/db/CMakeLists.txt
+++ b/src/modules/fim/db/CMakeLists.txt
@@ -87,7 +87,7 @@ add_custom_command(TARGET fimdb POST_BUILD
   COMMENT "Creating delayed load library for fimdb.")
 endif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 
-if(UNIT_TEST)
+if(BUILD_TESTS)
   if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_link_libraries(fimdb -fprofile-arcs)
   else()