diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6d6ee546c113f483d9e5f61b2ab5aeddc661652..4127919eb1b37c68f8ea560ae44980d876aa8ec8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,15 @@ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../MODELS")
     message(FATAL_ERROR "MODELS module not found.")
 endif()
 
+include(ExternalProject)
+ExternalProject_Add(Tadah.MODELS
+    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../MODELS
+    BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../MODELS/build
+    INSTALL_COMMAND cmake -E echo "Skipping install step."
+    )
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../MODELS/build)
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../CORE/build)
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 09d2a1f370f60212b0f394086d402c5169b19757..80247ff6b3b3537a8a326805a09b02cad13d373a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,47 +11,8 @@ FetchContent_MakeAvailable(Catch2)
 file(GLOB tests_src "*.cpp")
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/tests_data DESTINATION .)
 
-include(ExternalProject)
-#ExternalProject_Add(Tadah.CORE
-#    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../CORE
-#    BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../CORE/build
-#    INSTALL_COMMAND cmake -E echo "Skipping install step."
-#    )
-link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../CORE/build)
-
-ExternalProject_Add(Tadah.MODELS
-    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../MODELS
-    BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../MODELS/build
-    INSTALL_COMMAND cmake -E echo "Skipping install step."
-    )
-link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../MODELS/build)
-
-#find_library(tadah.core NAMES tadah.core
-#    PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../CORE/*
-#    )
-#if(tadah.core)
-#    message(STATUS "Found ${tadah.core}") 
-#else()
-#    message(FATAL_ERROR "
-#    Could not find ltadah.core in the CORE module. 
-#    Hint: Recompile CORE.
-#    ")
-#endif()
-#find_library(tadah.models NAMES tadah.models
-#    PATHS ${CMAKE_CURRENT_SOURCE_DIR}/../../MODELS/*
-#    )
-#if(tadah.models)
-#    message(STATUS "Found ${tadah.models}") 
-#else()
-#    message(FATAL_ERROR "
-#    Could not find ltadah.models in the MODELS module. 
-#    Hint: Recompile MODELS.
-#    ")
-#endif()
-
 add_executable(test_mlip ${tests_src})
 target_link_libraries(test_mlip PRIVATE Catch2::Catch2 tadah.mlip tadah.core tadah.models)
-#target_link_libraries(test_mlip PRIVATE Catch2::Catch2 tadah.mlip ${tadah.core} ${tadah.models})
 
 if(TADAH_ENABLE_OPENMP) 
     find_package(OpenMP REQUIRED)