diff --git a/CMakeLists.txt b/CMakeLists.txt
index 029bf76..b2020d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,10 @@ set(JSON_BuildTests_INIT OFF CACHE INTERNAL "")
   add_subdirectory(libs/nlohmannJSON EXCLUDE_FROM_ALL)
 ENDIF()
 
-
+IF(NOT TARGET kubecontrol)
+set(TEST_KUBECONTROL_LIBRARY OFF CACHE INTERNAL "")
+  add_subdirectory(libs/KubeControl EXCLUDE_FROM_ALL)
+ENDIF()
 
  protobuf_generate_cpp(PROTO_PATH  include/Orders/protos CPP_PATH include/Orders/protos HPP_PATH include/Orders/protos)
 
@@ -80,6 +83,7 @@ eigen
 loguru
 nlohmann_json
 OrderLibrary
+kubecontrol
 )
 # add_dependencies(SimCore protoc)
 
@@ -125,12 +129,12 @@ IF (${TEST_ENTITIY_LIBRARY})
   target_link_libraries(test_EntityClass Catch2::Catch2 EntityLibrary loguru)
   catch_discover_tests(test_EntityClass)
   
-  add_executable(test_MovementClass tests/test_MovementClass.cpp)
-  target_link_libraries(test_MovementClass Catch2::Catch2 EntityLibrary SimCore loguru)
-  catch_discover_tests(test_MovementClass)
+  # add_executable(test_MovementClass tests/test_MovementClass.cpp)
+  # target_link_libraries(test_MovementClass Catch2::Catch2 EntityLibrary SimCore loguru)
+  # catch_discover_tests(test_MovementClass)
 
-  add_executable(test_EntityImplementation tests/test_EntityImplementation.cpp)
-  target_link_libraries(test_EntityImplementation EntityLibrary loguru)
+  # add_executable(test_EntityImplementation tests/test_EntityImplementation.cpp)
+  # target_link_libraries(test_EntityImplementation EntityLibrary loguru)
 
   add_executable(test_Tracklist tests/test_Tracklist.cpp)
   target_link_libraries(test_Tracklist Catch2::Catch2 EntityLibrary loguru)