diff --git a/CMakeLists.txt b/CMakeLists.txt
index d15dc6a79549afa2c0ca3b3f8d29ab7c9e161f40..7cb7d660b4252019c68c083ad7d8d206a41ba513 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,7 @@ message("UPPER_NAME ${UPPER_NAME}")
 
 
 #find dependencies.
-FIND_PACKAGE(wolfcore REQUIRED)
+#FIND_PACKAGE(wolfcore REQUIRED)
 FIND_PACKAGE(wolfimu REQUIRED)
 
 # Define the directory where will be the configured config.h
@@ -115,7 +115,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/internal/config.h.in "${WOLF_CONFIG_D
 include_directories("${PROJECT_BINARY_DIR}/conf")
 
 include_directories("include")
-include_directories(${wolfcore_INCLUDE_DIRS})
+#include_directories(${wolfcore_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${wolfimu_INCLUDE_DIRS})
 
 #HEADERS
@@ -207,10 +207,10 @@ endif()
 
 
 
-TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolfcore_LIBRARIES})
 # Link the library with the required dependencies
-# TARGET_LINK_LIBRARIES(${PLUGIN_NAME} wolfimu_INCLUDE_DIRS)
+TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolfimu_LIBRARIES})
 
+# Build demos
 IF(BUILD_DEMOS)
   #Build examples
   MESSAGE("Building demos.")
@@ -218,7 +218,6 @@ IF(BUILD_DEMOS)
 ENDIF(BUILD_DEMOS)
 
 #Build tests
-#===============EXAMPLE=========================
 IF(BUILD_TESTS)
   MESSAGE("Building tests.")
   add_subdirectory(test)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e3cae6955696d1c1662956f25a6fa7d8ec13dcc4..53f86f843d7508eeb518e68fcaef00938559e09e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -22,7 +22,7 @@ add_subdirectory(gtest)
 
 
 # Include gtest directory.
-include_directories(${GTEST_INCLUDE_DIRS} ${wolfimu_INCLUDE_DIRS})
+include_directories(${GTEST_INCLUDE_DIRS})
 
 ################# ADD YOUR TESTS BELOW ####################
 #                                                         #
@@ -38,10 +38,10 @@ wolf_add_gtest(gtest_feature_inertial_kinematics gtest_feature_inertial_kinemati
 target_link_libraries(gtest_feature_inertial_kinematics ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_factor_inertial_kinematics gtest_factor_inertial_kinematics.cpp)
-target_link_libraries(gtest_factor_inertial_kinematics ${PLUGIN_NAME} ${wolfimu_LIBRARIES})
+target_link_libraries(gtest_factor_inertial_kinematics ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_factor_force_torque gtest_factor_force_torque.cpp)
-target_link_libraries(gtest_factor_force_torque ${PLUGIN_NAME} ${wolfimu_LIBRARIES})
+target_link_libraries(gtest_factor_force_torque ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_force_torque_delta_tools gtest_force_torque_delta_tools.cpp)
 target_link_libraries(gtest_force_torque_delta_tools ${PLUGIN_NAME})
@@ -50,10 +50,10 @@ target_link_libraries(gtest_force_torque_delta_tools ${PLUGIN_NAME})
 # target_link_libraries(gtest_feature_force_torque_preint ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_processor_inertial_kinematics gtest_processor_inertial_kinematics.cpp)
-target_link_libraries(gtest_processor_inertial_kinematics ${PLUGIN_NAME} ${wolfimu_LIBRARIES})
+target_link_libraries(gtest_processor_inertial_kinematics ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_processor_force_torque_preint gtest_processor_force_torque_preint.cpp)
-target_link_libraries(gtest_processor_force_torque_preint ${PLUGIN_NAME} ${wolfimu_LIBRARIES})
+target_link_libraries(gtest_processor_force_torque_preint ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_processor_point_feet_nomove gtest_processor_point_feet_nomove.cpp)
 target_link_libraries(gtest_processor_point_feet_nomove ${PLUGIN_NAME})