diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0104e4f3be4ca7de3413de19ca4ccbf6f28f127a..b286229fe005c528692de7f7432494e261eff89c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,9 +164,9 @@ message(DEBUG "gRPC_INCLUDE_DIRS: ${gRPC_INCLUDE_DIRS}")
 # ---------
 
 
-add_library(caosdb
-    SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
-target_link_libraries(caosdb
+add_library(caosdb SHARED
+     ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
+target_link_libraries(caosdb PUBLIC
     gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
 )
 set(LIBCAOSDB caosdb)
@@ -180,10 +180,10 @@ target_include_directories(caosdb PUBLIC
 
 # libccaosdb
 # ----------
-add_library(ccaosdb SHARED src/ccaosdb.cpp)
-target_link_libraries(ccaosdb
+add_library(ccaosdb SHARED src/ccaosdb.cpp ${GRPC_GENERATED})
+target_link_libraries(ccaosdb PUBLIC
+    caosdb
     gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
-    ${LIBCAOSDB}
 )
 target_include_directories(ccaosdb PUBLIC
     $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
@@ -200,13 +200,11 @@ target_include_directories(ccaosdbcli PUBLIC
     $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
     $<INSTALL_INTERFACE:include>
 )
-target_include_directories(ccaosdbcli SYSTEM PUBLIC
-    ${CONAN_INCLUDE_DIRS}
-)
+# target_include_directories(ccaosdbcli SYSTEM PUBLIC    
+# )
 
-target_link_libraries(ccaosdbcli
-    gRPC::grpc protobuf::libprotobuf ${Boost_LIBRARIES}
-    ${LIBCAOSDB}
+target_link_libraries(ccaosdbcli PRIVATE
+    gRPC::grpc protobuf::libprotobuf ${Boost_LIBRARIES}    
     ccaosdb
 )
 
@@ -218,12 +216,9 @@ target_include_directories(cxxcaosdbcli PUBLIC
     $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
     $<INSTALL_INTERFACE:include>
 )
-target_include_directories(cxxcaosdbcli SYSTEM PUBLIC
-    ${CONAN_INCLUDE_DIRS}
-)
-target_link_libraries(cxxcaosdbcli
-    ${LIBCAOSDB}
-    gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
+
+target_link_libraries(cxxcaosdbcli PRIVATE
+    caosdb gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
 )
 
 
@@ -350,10 +345,9 @@ endif()
 ### UNIT TEST
 #######################################################
 
-if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-    enable_testing()
-    add_subdirectory(test)
-endif()
+enable_testing()
+add_subdirectory(test)
+
 
 # ###############################################
 # ############ INSTALLATION #####################
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 931c9d69a919bd0f2695ae2a6a5fe45bb4b89aa3..dc15a2ab07c4138e960367c3676af4694f0b9676 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -65,7 +65,7 @@ foreach (i RANGE "${len_test_cases}")
     set(libcaosdb_TEST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/${test_case_name}.cpp
         ${libcaosdb_TEST_SRC}")
     target_link_libraries(${test_case_name}
-        PRIVATE GTest::gtest_main ${LIBCAOSDB} ccaosdb  gtest::gtest)
+        PRIVATE GTest::gtest_main caosdb ccaosdb gtest::gtest)
     target_include_directories(${test_case_name}
       PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
     if(_LINTING)