diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60b797a39..14256666a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,6 @@ cmaize_option_list(
 cmaize_find_or_build_dependency(
     utilities
     URL github.com/NWChemEx/utilities
-    VERSION ${NWX_UTILITIES_VERSION}
     BUILD_TARGET utilities
     FIND_TARGET nwx::utilities
     CMAKE_ARGS BUILD_TESTING=${UTILITIES_BUILD_TESTING}
@@ -53,7 +52,6 @@ cmaize_find_or_build_dependency(
 cmaize_find_or_build_dependency(
     libfort
     URL github.com/seleznevae/libfort
-    VERSION ${NWX_LIBFORT_VERSION}
     BUILD_TARGET fort
     FIND_TARGET libfort::fort
     CMAKE_ARGS FORT_ENABLE_TESTING=OFF
@@ -62,7 +60,6 @@ cmaize_find_or_build_dependency(
 cmaize_find_or_build_dependency(
     parallelzone
     URL github.com/NWChemEx/ParallelZone
-    VERSION ${NWX_PARALLELZONE_VERSION}
     BUILD_TARGET parallelzone
     FIND_TARGET nwx::parallelzone
     CMAKE_ARGS BUILD_TESTING=${PARALLELZONE_BUILD_TESTING}
@@ -129,7 +126,7 @@ if("${BUILD_TESTING}")
         URL github.com/catchorg/Catch2
         BUILD_TARGET Catch2
         FIND_TARGET Catch2::Catch2
-        VERSION ${NWX_CATCH2_VERSION}
+        VERSION v3.6.0
     )
 
     cmaize_add_tests(
diff --git a/src/pluginplay/cache/database/key_injector.hpp b/src/pluginplay/cache/database/key_injector.hpp
index d60ed6b3b..e93ebb6e2 100644
--- a/src/pluginplay/cache/database/key_injector.hpp
+++ b/src/pluginplay/cache/database/key_injector.hpp
@@ -18,6 +18,7 @@
 #include "database_api.hpp"
 #include <cstdlib>
 #include <iostream>
+#include <memory>
 
 namespace pluginplay::cache::database {
 
diff --git a/src/pluginplay/cache/database/native.hpp b/src/pluginplay/cache/database/native.hpp
index c5ee89b69..a197df815 100644
--- a/src/pluginplay/cache/database/native.hpp
+++ b/src/pluginplay/cache/database/native.hpp
@@ -17,6 +17,7 @@
 #pragma once
 #include "database_api.hpp"
 #include <map>
+#include <memory>
 
 namespace pluginplay::cache::database {
 
diff --git a/tests/cxx/doc_snippets/main.cpp b/tests/cxx/doc_snippets/main.cpp
index 8dec24b9a..d35a4c377 100644
--- a/tests/cxx/doc_snippets/main.cpp
+++ b/tests/cxx/doc_snippets/main.cpp
@@ -15,7 +15,7 @@
  */
 
 #define CATCH_CONFIG_RUNNER
-#include <catch2/catch.hpp>
+#include <catch2/catch_session.hpp>
 #include <parallelzone/parallelzone.hpp>
 
 int main(int argc, char* argv[]) {
diff --git a/tests/cxx/doc_snippets/test_modules.cpp b/tests/cxx/doc_snippets/test_modules.cpp
index 1520ca8d7..26e3ddd30 100644
--- a/tests/cxx/doc_snippets/test_modules.cpp
+++ b/tests/cxx/doc_snippets/test_modules.cpp
@@ -18,7 +18,9 @@
 #include "force.hpp"
 #include "load_modules.hpp"
 #include "modules.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 using namespace pluginplay_examples;
 TEST_CASE("Tutorial modules") {
diff --git a/tests/cxx/doc_snippets/test_tutorial_module_documents.cpp b/tests/cxx/doc_snippets/test_tutorial_module_documents.cpp
index 13b29b040..8a153feeb 100644
--- a/tests/cxx/doc_snippets/test_tutorial_module_documents.cpp
+++ b/tests/cxx/doc_snippets/test_tutorial_module_documents.cpp
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <filesystem>
 #include <iterator>
 #include <pluginplay/printing/document_modules.hpp>
diff --git a/tests/cxx/regression_tests/issue_350.cpp b/tests/cxx/regression_tests/issue_350.cpp
index 4c905c545..b94125bb6 100644
--- a/tests/cxx/regression_tests/issue_350.cpp
+++ b/tests/cxx/regression_tests/issue_350.cpp
@@ -15,7 +15,9 @@
  */
 
 #include "pluginplay/property_type/property_type.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 namespace {
 struct FromClass {
diff --git a/tests/cxx/regression_tests/main.cpp b/tests/cxx/regression_tests/main.cpp
index 8dec24b9a..d35a4c377 100644
--- a/tests/cxx/regression_tests/main.cpp
+++ b/tests/cxx/regression_tests/main.cpp
@@ -15,7 +15,7 @@
  */
 
 #define CATCH_CONFIG_RUNNER
-#include <catch2/catch.hpp>
+#include <catch2/catch_session.hpp>
 #include <parallelzone/parallelzone.hpp>
 
 int main(int argc, char* argv[]) {
diff --git a/tests/cxx/unit_tests/pluginplay/any/test_any.hpp b/tests/cxx/unit_tests/pluginplay/any/test_any.hpp
index 68152c6c7..37676db8c 100644
--- a/tests/cxx/unit_tests/pluginplay/any/test_any.hpp
+++ b/tests/cxx/unit_tests/pluginplay/any/test_any.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <string>
 #include <type_traits>
 #include <vector>
diff --git a/tests/cxx/unit_tests/pluginplay/cache/database/database_api.cpp b/tests/cxx/unit_tests/pluginplay/cache/database/database_api.cpp
index 9634cdefd..c04f389e3 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/database/database_api.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/database/database_api.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <pluginplay/cache/database/database_api.hpp>
 #include <pluginplay/cache/database/native.hpp>
 
diff --git a/tests/cxx/unit_tests/pluginplay/cache/database/database_factory.cpp b/tests/cxx/unit_tests/pluginplay/cache/database/database_factory.cpp
index 6b38a9ed0..333219fb7 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/database/database_factory.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/database/database_factory.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <filesystem>
 #include <pluginplay/cache/database/database_factory.hpp>
 
diff --git a/tests/cxx/unit_tests/pluginplay/cache/database/db_value.cpp b/tests/cxx/unit_tests/pluginplay/cache/database/db_value.cpp
index d1e684cc7..f5448e036 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/database/db_value.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/database/db_value.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <pluginplay/cache/database/db_value.hpp>
 
 using namespace pluginplay::cache::database;
diff --git a/tests/cxx/unit_tests/pluginplay/cache/database/key_injector.cpp b/tests/cxx/unit_tests/pluginplay/cache/database/key_injector.cpp
index 5c729921e..e0c921a3c 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/database/key_injector.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/database/key_injector.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../../catch.hpp"
 #include "../lexical_cast.hpp"
-#include <catch2/catch.hpp>
 #include <map>
 #include <pluginplay/cache/database/key_injector.hpp>
 #include <pluginplay/cache/database/native.hpp>
diff --git a/tests/cxx/unit_tests/pluginplay/cache/database/make_any.cpp b/tests/cxx/unit_tests/pluginplay/cache/database/make_any.cpp
index 309eb46fb..22b2afd66 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/database/make_any.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/database/make_any.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../../catch.hpp"
 #include "../test_cache.hpp"
-#include <catch2/catch.hpp>
 #include <pluginplay/cache/database/make_any.hpp>
 #include <vector>
 
diff --git a/tests/cxx/unit_tests/pluginplay/cache/database/native.cpp b/tests/cxx/unit_tests/pluginplay/cache/database/native.cpp
index 06856e500..83e05c2d9 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/database/native.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/database/native.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <pluginplay/cache/database/native.hpp>
 
 using namespace pluginplay::cache::database;
diff --git a/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/detail_/rocksdb_pimpl.cpp b/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/detail_/rocksdb_pimpl.cpp
index e9447077c..b1cd7382f 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/detail_/rocksdb_pimpl.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/detail_/rocksdb_pimpl.cpp
@@ -15,7 +15,7 @@
  */
 
 #ifdef BUILD_ROCKS_DB
-#include <catch2/catch.hpp>
+#include "../../../../catch.hpp"
 #include <filesystem>
 #include <pluginplay/cache/database/rocksdb/detail_/rocksdb_pimpl.hpp>
 using namespace pluginplay::cache::database::detail_;
diff --git a/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/detail_/rocksdb_pimpl_stub.cpp b/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/detail_/rocksdb_pimpl_stub.cpp
index e96427c00..da162de6f 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/detail_/rocksdb_pimpl_stub.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/detail_/rocksdb_pimpl_stub.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../../../catch.hpp"
 
 /* This unit test ensures that attempting to create a RocksDBPIMPL fails when
  * RocksDB support has not been enabled.
diff --git a/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/rocksdb.cpp b/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/rocksdb.cpp
index 9a7766406..5abe3f6a2 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/rocksdb.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/database/rocksdb/rocksdb.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../../catch.hpp"
 #include <filesystem>
 #include <pluginplay/cache/database/rocksdb/rocksdb.hpp>
 using namespace pluginplay::cache::database;
diff --git a/tests/cxx/unit_tests/pluginplay/cache/database/serialized.cpp b/tests/cxx/unit_tests/pluginplay/cache/database/serialized.cpp
index c56485c18..6ee5fff65 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/database/serialized.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/database/serialized.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../../catch.hpp"
 #include "../lexical_cast.hpp"
-#include <catch2/catch.hpp>
 #include <pluginplay/cache/database/native.hpp>
 #include <pluginplay/cache/database/serialized.hpp>
 #include <sstream>
diff --git a/tests/cxx/unit_tests/pluginplay/cache/database/transposer.cpp b/tests/cxx/unit_tests/pluginplay/cache/database/transposer.cpp
index 02ceb98b5..03d361f4c 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/database/transposer.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/database/transposer.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../../catch.hpp"
 #include "../lexical_cast.hpp"
-#include <catch2/catch.hpp>
 #include <pluginplay/cache/database/native.hpp>
 #include <pluginplay/cache/database/transposer.hpp>
 
diff --git a/tests/cxx/unit_tests/pluginplay/cache/lexical_cast.cpp b/tests/cxx/unit_tests/pluginplay/cache/lexical_cast.cpp
index 2c702b8ee..71eef0048 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/lexical_cast.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/lexical_cast.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "lexical_cast.hpp"
-#include <catch2/catch.hpp>
 
 using namespace testing;
 
diff --git a/tests/cxx/unit_tests/pluginplay/cache/module_cache.cpp b/tests/cxx/unit_tests/pluginplay/cache/module_cache.cpp
index b85ff182e..f08a73e36 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/module_cache.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/module_cache.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "test_cache.hpp"
-#include <catch2/catch.hpp>
 #include <pluginplay/cache/module_cache.hpp>
 #include <pluginplay/cache/module_manager_cache.hpp>
 
diff --git a/tests/cxx/unit_tests/pluginplay/cache/module_manager_cache.cpp b/tests/cxx/unit_tests/pluginplay/cache/module_manager_cache.cpp
index 33e0c2afc..bc7ea7f9e 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/module_manager_cache.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/module_manager_cache.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <filesystem>
 #include <pluginplay/cache/module_manager_cache.hpp>
 #include <pluginplay/config/config.hpp>
diff --git a/tests/cxx/unit_tests/pluginplay/cache/test_cache.hpp b/tests/cxx/unit_tests/pluginplay/cache/test_cache.hpp
index aab6f51ff..381655ed5 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/test_cache.hpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/test_cache.hpp
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <pluginplay/cache/database/native.hpp>
 #include <pluginplay/cache/database/transposer.hpp>
 #include <pluginplay/cache/proxy_map_maker.hpp>
diff --git a/tests/cxx/unit_tests/pluginplay/cache/user_cache.cpp b/tests/cxx/unit_tests/pluginplay/cache/user_cache.cpp
index b7be24a29..82352decf 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/user_cache.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/user_cache.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <pluginplay/cache/module_manager_cache.hpp>
 #include <pluginplay/cache/user_cache.hpp>
 #include <vector>
diff --git a/tests/cxx/unit_tests/pluginplay/cache/uuid_mapper.cpp b/tests/cxx/unit_tests/pluginplay/cache/uuid_mapper.cpp
index d154e13ba..eb9d14c4c 100644
--- a/tests/cxx/unit_tests/pluginplay/cache/uuid_mapper.cpp
+++ b/tests/cxx/unit_tests/pluginplay/cache/uuid_mapper.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "lexical_cast.hpp"
 #include "test_cache.hpp"
-#include <catch2/catch.hpp>
 #include <iostream>
 #include <pluginplay/any/any.hpp>
 #include <pluginplay/cache/database/native.hpp>
diff --git a/tests/cxx/unit_tests/pluginplay/catch.hpp b/tests/cxx/unit_tests/pluginplay/catch.hpp
new file mode 100644
index 000000000..73d7d0e99
--- /dev/null
+++ b/tests/cxx/unit_tests/pluginplay/catch.hpp
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2024 NWChemEx-Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
\ No newline at end of file
diff --git a/tests/cxx/unit_tests/pluginplay/detail_/field_tuple_traits.cpp b/tests/cxx/unit_tests/pluginplay/detail_/field_tuple_traits.cpp
index 3e189ab20..ad1fffda8 100644
--- a/tests/cxx/unit_tests/pluginplay/detail_/field_tuple_traits.cpp
+++ b/tests/cxx/unit_tests/pluginplay/detail_/field_tuple_traits.cpp
@@ -26,7 +26,7 @@
  * sure we test cv-qualified reference types (ModuleResults are unqualified).
  */
 
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <pluginplay/detail_/field_tuple_traits.hpp>
 #include <pluginplay/fields/fields.hpp>
 
diff --git a/tests/cxx/unit_tests/pluginplay/detail_/submodule_request_pimpl.cpp b/tests/cxx/unit_tests/pluginplay/detail_/submodule_request_pimpl.cpp
index 73930b2c7..f2f545904 100644
--- a/tests/cxx/unit_tests/pluginplay/detail_/submodule_request_pimpl.cpp
+++ b/tests/cxx/unit_tests/pluginplay/detail_/submodule_request_pimpl.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "../test_common.hpp"
 #include "pluginplay/detail_/submodule_request_pimpl.hpp"
-#include <catch2/catch.hpp>
 
 using namespace pluginplay::detail_;
 using module_ptr = typename SubmoduleRequestPIMPL::module_ptr;
diff --git a/tests/cxx/unit_tests/pluginplay/examples/lambda_module.cpp b/tests/cxx/unit_tests/pluginplay/examples/lambda_module.cpp
index cdc527e6d..d5a71edd0 100644
--- a/tests/cxx/unit_tests/pluginplay/examples/lambda_module.cpp
+++ b/tests/cxx/unit_tests/pluginplay/examples/lambda_module.cpp
@@ -15,7 +15,7 @@
  */
 
 // TUTORIAL_START_SKIP
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 // TUTORIAL_STOP_SKIP
 
 // TUTORIAL
diff --git a/tests/cxx/unit_tests/pluginplay/examples/workflow.cpp b/tests/cxx/unit_tests/pluginplay/examples/workflow.cpp
index a62dabd56..d7ccc6374 100644
--- a/tests/cxx/unit_tests/pluginplay/examples/workflow.cpp
+++ b/tests/cxx/unit_tests/pluginplay/examples/workflow.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "workflow.hpp"
-#include <catch2/catch.hpp>
 #include <vector>
 
 TEST_CASE("load_modules") {
diff --git a/tests/cxx/unit_tests/pluginplay/examples/writing_a_module.cpp b/tests/cxx/unit_tests/pluginplay/examples/writing_a_module.cpp
index ea0d544cb..feba44eb5 100644
--- a/tests/cxx/unit_tests/pluginplay/examples/writing_a_module.cpp
+++ b/tests/cxx/unit_tests/pluginplay/examples/writing_a_module.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "pluginplay/module/detail_/module_pimpl.hpp"
 #include "writing_a_module.hpp"
-#include <catch2/catch.hpp>
 
 using namespace pluginplay;
 using namespace pluginplay::detail_;
@@ -73,8 +73,8 @@ TEST_CASE("Rectangle Class : run") {
     in.at("Dimension 2").change(4.56);
     in.at("Name").change("Test");
     auto out = r.run(in, r.submods());
-    REQUIRE(out.at("Area").value<double>() == Approx(5.6088));
-    REQUIRE(out.at("Perimeter").value<double>() == Approx(11.58));
+    REQUIRE(out.at("Area").value<double>() == Catch::Approx(5.6088));
+    REQUIRE(out.at("Perimeter").value<double>() == Catch::Approx(11.58));
     REQUIRE(out.at("Summary").value<std::string>() ==
             "Test has an area of 5.608800 and a perimeter of 11.580000");
 }
@@ -119,8 +119,8 @@ TEST_CASE("Prism Class : run") {
 
     auto out            = r.run(in, submods);
     auto [area, volume] = PrismVolume::unwrap_results(out);
-    REQUIRE(area == Approx(5.6088));
-    REQUIRE(volume == Approx(44.253432));
+    REQUIRE(area == Catch::Approx(5.6088));
+    REQUIRE(volume == Catch::Approx(44.253432));
 }
 
 template<size_t N>
diff --git a/tests/cxx/unit_tests/pluginplay/examples/writing_a_property_type.cpp b/tests/cxx/unit_tests/pluginplay/examples/writing_a_property_type.cpp
index 6199bab30..778bfaec8 100644
--- a/tests/cxx/unit_tests/pluginplay/examples/writing_a_property_type.cpp
+++ b/tests/cxx/unit_tests/pluginplay/examples/writing_a_property_type.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "writing_a_property_type.hpp"
-#include <catch2/catch.hpp>
 
 /* This test focuses on the property_type class. The property_type class can not
  * be directly tested as it is an abstract class relying on compile-time
diff --git a/tests/cxx/unit_tests/pluginplay/fields/bounds_checking/bounds_checking.cpp b/tests/cxx/unit_tests/pluginplay/fields/bounds_checking/bounds_checking.cpp
index e58a1879a..e3a4aea54 100644
--- a/tests/cxx/unit_tests/pluginplay/fields/bounds_checking/bounds_checking.cpp
+++ b/tests/cxx/unit_tests/pluginplay/fields/bounds_checking/bounds_checking.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <pluginplay/any/any.hpp>
 #include <pluginplay/fields/bounds_checking/bounds_checking.hpp>
 
diff --git a/tests/cxx/unit_tests/pluginplay/fields/detail_/module_input_pimpl.cpp b/tests/cxx/unit_tests/pluginplay/fields/detail_/module_input_pimpl.cpp
index 2197c667f..074fbecf0 100644
--- a/tests/cxx/unit_tests/pluginplay/fields/detail_/module_input_pimpl.cpp
+++ b/tests/cxx/unit_tests/pluginplay/fields/detail_/module_input_pimpl.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <pluginplay/fields/detail_/module_input_pimpl.hpp>
 
 using namespace pluginplay;
diff --git a/tests/cxx/unit_tests/pluginplay/fields/detail_/module_result_pimpl.cpp b/tests/cxx/unit_tests/pluginplay/fields/detail_/module_result_pimpl.cpp
index 5e6bd54a6..666e3c67f 100644
--- a/tests/cxx/unit_tests/pluginplay/fields/detail_/module_result_pimpl.cpp
+++ b/tests/cxx/unit_tests/pluginplay/fields/detail_/module_result_pimpl.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../../catch.hpp"
 #include <pluginplay/fields/detail_/module_result_pimpl.hpp>
 using namespace pluginplay;
 using namespace pluginplay::detail_;
diff --git a/tests/cxx/unit_tests/pluginplay/fields/module_input.cpp b/tests/cxx/unit_tests/pluginplay/fields/module_input.cpp
index 1a9c0e9cc..c9540f303 100644
--- a/tests/cxx/unit_tests/pluginplay/fields/module_input.cpp
+++ b/tests/cxx/unit_tests/pluginplay/fields/module_input.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <pluginplay/fields/module_input.hpp>
 
 #include <utilities/printing/demangler.hpp>
diff --git a/tests/cxx/unit_tests/pluginplay/fields/module_result.cpp b/tests/cxx/unit_tests/pluginplay/fields/module_result.cpp
index 9bb8028a6..292ecc3d8 100644
--- a/tests/cxx/unit_tests/pluginplay/fields/module_result.cpp
+++ b/tests/cxx/unit_tests/pluginplay/fields/module_result.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <pluginplay/fields/module_result.hpp>
 using namespace pluginplay;
 
diff --git a/tests/cxx/unit_tests/pluginplay/module/detail_/module_pimpl.cpp b/tests/cxx/unit_tests/pluginplay/module/detail_/module_pimpl.cpp
index 53daa3a2b..456181941 100644
--- a/tests/cxx/unit_tests/pluginplay/module/detail_/module_pimpl.cpp
+++ b/tests/cxx/unit_tests/pluginplay/module/detail_/module_pimpl.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "../../catch.hpp"
 #include "../../test_common.hpp"
 #include "pluginplay/module/detail_/module_pimpl.hpp"
-#include <catch2/catch.hpp>
 #include <regex>
 
 using namespace pluginplay;
diff --git a/tests/cxx/unit_tests/pluginplay/module/facade_module.cpp b/tests/cxx/unit_tests/pluginplay/module/facade_module.cpp
index aef679fdc..44fc01556 100644
--- a/tests/cxx/unit_tests/pluginplay/module/facade_module.cpp
+++ b/tests/cxx/unit_tests/pluginplay/module/facade_module.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "../test_common.hpp"
-#include <catch2/catch.hpp>
 #include <pluginplay/module/facade_module.hpp>
 
 TEST_CASE("FacadeModule : single return") {
diff --git a/tests/cxx/unit_tests/pluginplay/module/lambda_module.cpp b/tests/cxx/unit_tests/pluginplay/module/lambda_module.cpp
index c90ef0ac8..34c9125ef 100644
--- a/tests/cxx/unit_tests/pluginplay/module/lambda_module.cpp
+++ b/tests/cxx/unit_tests/pluginplay/module/lambda_module.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "../test_common.hpp"
-#include <catch2/catch.hpp>
 #include <pluginplay/module/lambda_module.hpp>
 
 /* Testing strategy.
diff --git a/tests/cxx/unit_tests/pluginplay/module/module_base.cpp b/tests/cxx/unit_tests/pluginplay/module/module_base.cpp
index 07d5e0867..4129de6fa 100644
--- a/tests/cxx/unit_tests/pluginplay/module/module_base.cpp
+++ b/tests/cxx/unit_tests/pluginplay/module/module_base.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "test_common.hpp"
-#include <catch2/catch.hpp>
 #include <parallelzone/runtime/runtime_view.hpp>
 #include <pluginplay/module/module_base.hpp>
 
diff --git a/tests/cxx/unit_tests/pluginplay/module/module_class.cpp b/tests/cxx/unit_tests/pluginplay/module/module_class.cpp
index c895d5998..fd0749c95 100644
--- a/tests/cxx/unit_tests/pluginplay/module/module_class.cpp
+++ b/tests/cxx/unit_tests/pluginplay/module/module_class.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "test_common.hpp"
-#include <catch2/catch.hpp>
 #include <pluginplay/module/module_class.hpp>
 #include <regex>
 
diff --git a/tests/cxx/unit_tests/pluginplay/module_manager/detail_/module_manager_pimpl.cpp b/tests/cxx/unit_tests/pluginplay/module_manager/detail_/module_manager_pimpl.cpp
index 5ce286a28..ae69fd447 100644
--- a/tests/cxx/unit_tests/pluginplay/module_manager/detail_/module_manager_pimpl.cpp
+++ b/tests/cxx/unit_tests/pluginplay/module_manager/detail_/module_manager_pimpl.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "../../catch.hpp"
 #include "../../examples/writing_a_module.hpp"
 #include "pluginplay/module_manager/detail_/module_manager_pimpl.hpp"
-#include <catch2/catch.hpp>
 
 using namespace pluginplay;
 using namespace pluginplay::detail_;
diff --git a/tests/cxx/unit_tests/pluginplay/module_manager/module_manager_class.cpp b/tests/cxx/unit_tests/pluginplay/module_manager/module_manager_class.cpp
index d1520703c..7b00c2d32 100644
--- a/tests/cxx/unit_tests/pluginplay/module_manager/module_manager_class.cpp
+++ b/tests/cxx/unit_tests/pluginplay/module_manager/module_manager_class.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "test_common.hpp"
-#include <catch2/catch.hpp>
 #include <pluginplay/module_manager/module_manager.hpp>
 
 TEST_CASE("ModuleManager") {
diff --git a/tests/cxx/unit_tests/pluginplay/printing/detail_/print_inputs.cpp b/tests/cxx/unit_tests/pluginplay/printing/detail_/print_inputs.cpp
index 7285166f8..b6be4bea8 100644
--- a/tests/cxx/unit_tests/pluginplay/printing/detail_/print_inputs.cpp
+++ b/tests/cxx/unit_tests/pluginplay/printing/detail_/print_inputs.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../../catch.hpp"
 #include "pluginplay/printing/detail_/print_inputs.hpp"
-#include <catch2/catch.hpp>
 #include <utilities/printing/word_wrap_stream.hpp>
 
 using namespace pluginplay::printing::detail_;
diff --git a/tests/cxx/unit_tests/pluginplay/printing/detail_/print_results.cpp b/tests/cxx/unit_tests/pluginplay/printing/detail_/print_results.cpp
index a8ecb8a66..93e0172ca 100644
--- a/tests/cxx/unit_tests/pluginplay/printing/detail_/print_results.cpp
+++ b/tests/cxx/unit_tests/pluginplay/printing/detail_/print_results.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "../../catch.hpp"
 #include "../../test_common.hpp"
 #include "pluginplay/printing/detail_/print_results.hpp"
-#include <catch2/catch.hpp>
 #include <utilities/printing/word_wrap_stream.hpp>
 
 using namespace pluginplay::printing::detail_;
diff --git a/tests/cxx/unit_tests/pluginplay/printing/detail_/print_submodules.cpp b/tests/cxx/unit_tests/pluginplay/printing/detail_/print_submodules.cpp
index 6abbd6e2c..13b4da7e9 100644
--- a/tests/cxx/unit_tests/pluginplay/printing/detail_/print_submodules.cpp
+++ b/tests/cxx/unit_tests/pluginplay/printing/detail_/print_submodules.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "../../catch.hpp"
 #include "../../test_common.hpp"
 #include "pluginplay/printing/detail_/print_submodules.hpp"
-#include <catch2/catch.hpp>
 #include <utilities/printing/word_wrap_stream.hpp>
 
 using namespace pluginplay::printing::detail_;
diff --git a/tests/cxx/unit_tests/pluginplay/printing/detail_/rest_printer.cpp b/tests/cxx/unit_tests/pluginplay/printing/detail_/rest_printer.cpp
index 48b91c0d5..491344739 100644
--- a/tests/cxx/unit_tests/pluginplay/printing/detail_/rest_printer.cpp
+++ b/tests/cxx/unit_tests/pluginplay/printing/detail_/rest_printer.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../../catch.hpp"
 #include "pluginplay/printing/detail_/rest_printer.hpp"
-#include <catch2/catch.hpp>
 #include <sstream>
 using namespace pluginplay::printing::detail_;
 
diff --git a/tests/cxx/unit_tests/pluginplay/printing/document_module.cpp b/tests/cxx/unit_tests/pluginplay/printing/document_module.cpp
index 4bb95c2d7..57c21ca5d 100644
--- a/tests/cxx/unit_tests/pluginplay/printing/document_module.cpp
+++ b/tests/cxx/unit_tests/pluginplay/printing/document_module.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "../test_common.hpp"
 #include "pluginplay/printing/document_module.hpp"
-#include <catch2/catch.hpp>
 
 using namespace pluginplay::printing;
 using namespace testing;
diff --git a/tests/cxx/unit_tests/pluginplay/printing/document_modules.cpp b/tests/cxx/unit_tests/pluginplay/printing/document_modules.cpp
index 579ce06c0..f58e69a5b 100644
--- a/tests/cxx/unit_tests/pluginplay/printing/document_modules.cpp
+++ b/tests/cxx/unit_tests/pluginplay/printing/document_modules.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <filesystem>
 #include <iterator>
 #include <pluginplay/printing/document_modules.hpp>
diff --git a/tests/cxx/unit_tests/pluginplay/printing/helpers.cpp b/tests/cxx/unit_tests/pluginplay/printing/helpers.cpp
index 551dc426d..cd279aac9 100644
--- a/tests/cxx/unit_tests/pluginplay/printing/helpers.cpp
+++ b/tests/cxx/unit_tests/pluginplay/printing/helpers.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <iostream>
 #include <sstream>
 
diff --git a/tests/cxx/unit_tests/pluginplay/property_type/field_tuple.cpp b/tests/cxx/unit_tests/pluginplay/property_type/field_tuple.cpp
index 42049aa96..e594d7481 100644
--- a/tests/cxx/unit_tests/pluginplay/property_type/field_tuple.cpp
+++ b/tests/cxx/unit_tests/pluginplay/property_type/field_tuple.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <pluginplay/fields/fields.hpp>
 #include <pluginplay/property_type/field_tuple.hpp>
 
diff --git a/tests/cxx/unit_tests/pluginplay/property_type/property_type.cpp b/tests/cxx/unit_tests/pluginplay/property_type/property_type.cpp
index 8411c4dcd..0459ab4ba 100644
--- a/tests/cxx/unit_tests/pluginplay/property_type/property_type.cpp
+++ b/tests/cxx/unit_tests/pluginplay/property_type/property_type.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "../test_common.hpp"
 #include "pluginplay/property_type/property_type.hpp"
-#include <catch2/catch.hpp>
 #include <type_traits>
 
 TEST_CASE("PropertyType<T> T = NullPT") {
diff --git a/tests/cxx/unit_tests/pluginplay/python/python_wrapper.cpp b/tests/cxx/unit_tests/pluginplay/python/python_wrapper.cpp
index c610629b5..d5b7b4ee2 100644
--- a/tests/cxx/unit_tests/pluginplay/python/python_wrapper.cpp
+++ b/tests/cxx/unit_tests/pluginplay/python/python_wrapper.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "../catch.hpp"
 #include <pluginplay/python/python_wrapper.hpp>
 
 using namespace pluginplay::python;
diff --git a/tests/cxx/unit_tests/pluginplay/submodule_request.cpp b/tests/cxx/unit_tests/pluginplay/submodule_request.cpp
index 758fc610f..00c7ad95a 100644
--- a/tests/cxx/unit_tests/pluginplay/submodule_request.cpp
+++ b/tests/cxx/unit_tests/pluginplay/submodule_request.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "catch.hpp"
 #include "test_common.hpp"
-#include <catch2/catch.hpp>
 #include <pluginplay/submodule_request.hpp>
 
 using namespace pluginplay;
diff --git a/tests/cxx/unit_tests/pluginplay/test_main.cpp b/tests/cxx/unit_tests/pluginplay/test_main.cpp
index b3e6d1471..857115b7d 100644
--- a/tests/cxx/unit_tests/pluginplay/test_main.cpp
+++ b/tests/cxx/unit_tests/pluginplay/test_main.cpp
@@ -15,7 +15,7 @@
  */
 
 #define CATCH_CONFIG_RUNNER
-#include <catch2/catch.hpp>
+#include <catch2/catch_session.hpp>
 #include <parallelzone/runtime/runtime_view.hpp>
 
 int main(int argc, char* argv[]) {
diff --git a/tests/cxx/unit_tests/pluginplay/type_traits/base_property_type.cpp b/tests/cxx/unit_tests/pluginplay/type_traits/base_property_type.cpp
index 66230935c..fb5261088 100644
--- a/tests/cxx/unit_tests/pluginplay/type_traits/base_property_type.cpp
+++ b/tests/cxx/unit_tests/pluginplay/type_traits/base_property_type.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "pluginplay/type_traits/base_property_type.hpp"
-#include <catch2/catch.hpp>
 #include <type_traits>
 
 // Declare some property types (they don't have to be instantiatable)
diff --git a/tests/cxx/unit_tests/pluginplay/type_traits/is_property_type.cpp b/tests/cxx/unit_tests/pluginplay/type_traits/is_property_type.cpp
index c694e74a5..b86bc8b8d 100644
--- a/tests/cxx/unit_tests/pluginplay/type_traits/is_property_type.cpp
+++ b/tests/cxx/unit_tests/pluginplay/type_traits/is_property_type.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "../catch.hpp"
 #include "pluginplay/property_type/property_type.hpp"
 #include "pluginplay/type_traits/is_property_type.hpp"
-#include <catch2/catch.hpp>
 #include <type_traits>
 
 // Declare some property types (they don't have to be instantiatable)
diff --git a/tests/cxx/unit_tests/pluginplay/utility.cpp b/tests/cxx/unit_tests/pluginplay/utility.cpp
index 17921fcec..f35568cb6 100644
--- a/tests/cxx/unit_tests/pluginplay/utility.cpp
+++ b/tests/cxx/unit_tests/pluginplay/utility.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include "catch.hpp"
 #include <memory>
 #include <pluginplay/utility.hpp>