diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c1b45b87585feac2197aef1af18b98bd84617149..09d2a1f370f60212b0f394086d402c5169b19757 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,31 +11,47 @@ FetchContent_MakeAvailable(Catch2)
 file(GLOB tests_src "*.cpp")
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/tests_data DESTINATION .)
 
-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/*
+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."
     )
-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()
+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)
+#target_link_libraries(test_mlip PRIVATE Catch2::Catch2 tadah.mlip ${tadah.core} ${tadah.models})
 
 if(TADAH_ENABLE_OPENMP) 
     find_package(OpenMP REQUIRED)