diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed74303c48e3cb753c2049559f59186bf58457bf..1b442de15e600d8ed1e08e10cf13a8f55196572d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ project(BornAgain)
 
 # --- General project settings ---
 if(NOT BORNAGAIN_PYTHON)
-#    set(BORNAGAIN_PYTHON ON)
+    set(BORNAGAIN_PYTHON ON)
 endif()
 
 if(NOT BORNAGAIN_APP)
diff --git a/Tests/FunctionalTests/TestCore/CMakeLists.txt b/Tests/FunctionalTests/TestCore/CMakeLists.txt
index d8e1013294bc1a7378131a9f9a88a5988fb9ca31..90d2e2e1dcfa1fc5d91a77259985de8744d843c6 100644
--- a/Tests/FunctionalTests/TestCore/CMakeLists.txt
+++ b/Tests/FunctionalTests/TestCore/CMakeLists.txt
@@ -25,20 +25,15 @@ if(MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /EHsc ")
 endif()
 
-include_directories(${Boost_INCLUDE_DIRS})
+include_directories(
+    ${Boost_INCLUDE_DIRS}
+    ${BornAgainCore_INCLUDE_DIRS}
+    ${EIGEN3_INCLUDE_DIR}
+)
+
 foreach(_test ${list_of_tests})
-#     file(GLOB source_files ${_test}/*.cpp)
-#     add_executable(${_test} EXCLUDE_FROM_ALL ${source_files})
-#     include_directories(${BornAgainCore_INCLUDE_DIRS})
-#     include_directories(${Boost_INCLUDE_DIRS})
-#     target_link_libraries(${_test} ${BornAgainCore_LIBRARY}) 
-#     add_test( ${_test} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_test} "${CMAKE_BINARY_DIR}/Tests/ReferenceData/BornAgain/") # TestName ExeName Arguments
-#     add_dependencies(check ${_test})
    BORNAGAIN_EXECUTABLE(${_test} LOCATIONS ${_test} EXCLUDE_FROM_ALL LIBRARIES ${BornAgainCore_LIBRARY})
    BORNAGAIN_ADD_TEST(${_test} INPUT_DIR ${CMAKE_BINARY_DIR}/Tests/ReferenceData/BornAgain/)
 endforeach()
 
 
-#set_property(TARGET ${_test} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
-#set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-
diff --git a/Tests/FunctionalTests/TestFit/CMakeLists.txt b/Tests/FunctionalTests/TestFit/CMakeLists.txt
index 8e2e02c6f6b3be7ca85bada3351f9b1a563d9c38..98a44bc1c8de9559f0cdc5cb6dc3a7070842d734 100644
--- a/Tests/FunctionalTests/TestFit/CMakeLists.txt
+++ b/Tests/FunctionalTests/TestFit/CMakeLists.txt
@@ -15,20 +15,16 @@ if(MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /EHsc ")
 endif()
 
-include_directories(${Boost_INCLUDE_DIRS})
-include_directories(${BornAgainCore_INCLUDE_DIRS})
-include_directories(${BornAgainFit_INCLUDE_DIRS})
+include_directories(
+    ${Boost_INCLUDE_DIRS}
+    ${BornAgainCore_INCLUDE_DIRS}
+    ${BornAgainFit_INCLUDE_DIRS}
+    ${EIGEN3_INCLUDE_DIR}
+)
 
 foreach(_test ${list_of_tests})
     BORNAGAIN_EXECUTABLE(${_test} LOCATIONS ${_test} EXCLUDE_FROM_ALL LIBRARIES ${BornAgainFit_LIBRARY} ${BornAgainCore_LIBRARY})
     BORNAGAIN_ADD_TEST(${_test})
 endforeach()
 
-#foreach(_test ${list_of_tests})
-#    file(GLOB source_files ${_test}/*.cpp)
-#    add_executable(${_test} ${source_files})
-#    target_link_libraries(${_test} ${BornAgainFit_LIBRARY} ${BornAgainCore_LIBRARY}) 
-#    install (TARGETS ${_test} DESTINATION bin COMPONENT Applications)
-#endforeach()
-