diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 34acea06..c7930b63 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -17,16 +17,16 @@ concurrency:
 jobs:
   handle-syncwith:
     name: Call Reusable SyncWith Handler
-    uses: NilFoundation/ci-cd/.github/workflows/reusable-handle-syncwith.yml@v1.2.0
+    uses: NilFoundation/ci-cd/.github/workflows/reusable-handle-syncwith.yml@v1.2.1
     with:
-      ci-cd-ref: 'v1.2.0'
+      ci-cd-ref: 'v1.2.1'
     secrets: inherit
 
   test-linux:
     name: Linux Reusable Crypto3 Testing
     needs:
       - handle-syncwith
-    uses: NilFoundation/crypto3/.github/workflows/reusable-submodule-testing-linux.yml@14b2aac2501c57fd1ee8174cc43cfbfc87b40ecc
+    uses: NilFoundation/crypto3/.github/workflows/reusable-submodule-testing-linux.yml@1bd56b12f410f3f1a4891076705a9261a6b1efaa
 
     secrets: inherit
     with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5a05119..ae969215 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,16 +29,8 @@ endif()
 
 cm_project(hash WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES C CXX)
 
-macro(cm_find_package NAME)
-    if(NOT "${NAME}" MATCHES "^${CMAKE_WORKSPACE_NAME}_.*$" AND NOT "${NAME}" STREQUAL CM)
-        find_package(${ARGV})
-    else()
-        set(${ARGV0}_FOUND ON CACHE BOOL "")
-    endif()
-endmacro()
-
 if(NOT Boost_FOUND AND NOT CMAKE_CROSSCOMPILING)
-    cm_find_package(Boost COMPONENTS REQUIRED container)
+    find_package(Boost COMPONENTS REQUIRED container)
 endif()
 
 include(TargetArchitecture)
@@ -47,8 +39,8 @@ include(PlatformConfiguration)
 
 include(CheckSSE)
 include(CheckAVX)
-
-option(BUILD_TESTS "Build unit tests" FALSE)
+include(CMTest)
+cm_add_test_subdirectory(test)
 
 option(CRYPTO3_HASH_BLAKE2B "Build with Blake2 hash support" TRUE)
 option(CRYPTO3_HASH_CHECKSUM_ADLER "Build with Adler checksum support" TRUE)
@@ -279,4 +271,3 @@ elseif(${CMAKE_TARGET_ARCHITECTURE} STREQUAL "ppc64")
             "${CMAKE_UPPER_WORKSPACE_NAME}_HAS_POWER8")
 endif()
 
-cm_add_test_subdirectory(test)
diff --git a/cmake/modules b/cmake/modules
index 5e6b354e..57639741 160000
--- a/cmake/modules
+++ b/cmake/modules
@@ -1 +1 @@
-Subproject commit 5e6b354eaa69f6a275992e08220e925c34ba0a19
+Subproject commit 57639741ecf018835deb97a04db2200241d7fbd3
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 20bfcb65..1602fb9c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -11,7 +11,7 @@ include(CMTest)
 cm_find_package(${CMAKE_WORKSPACE_NAME}_block)
 
 if(NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-    cm_find_package(Boost REQUIRED COMPONENTS unit_test_framework)
+    find_package(Boost REQUIRED COMPONENTS unit_test_framework)
 endif()
 
 cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}