diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31887a2e83ced1be3c875fcca9d9d90bd99355be..14dfb9a114bfa54e08a1a154358657843b7a10ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -261,10 +261,6 @@ endif()
 
 
 #Link the created libraries
-#===============EXAMPLE=========================
-# IF (Ceres_FOUND)
-#     TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${CERES_LIBRARIES})
-# ENDIF(Ceres_FOUND)
 TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolfcore_LIBRARIES})
 
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 715b11aa464d8db46a596d80b36e312cc4f51c46..893aaadb8400712867b4f3df2e223b2c3fb0e4a9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,48 +14,48 @@ target_link_libraries(gtest_example ${PLUGIN_NAME})      #
 ###########################################################
 
 wolf_add_gtest(gtest_processor_imu gtest_processor_imu.cpp)
-target_link_libraries(gtest_processor_imu ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_processor_imu ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_processor_imu2d gtest_processor_imu2d.cpp)
-target_link_libraries(gtest_processor_imu2d ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_processor_imu2d ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_imu gtest_imu.cpp)
-target_link_libraries(gtest_imu ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_imu ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_imu_tools gtest_imu_tools.cpp)
-target_link_libraries(gtest_imu_tools ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_imu_tools ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_imu2d_tools gtest_imu2d_tools.cpp)
-target_link_libraries(gtest_imu2d_tools ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_imu2d_tools ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_processor_imu_jacobians gtest_processor_imu_jacobians.cpp)
-target_link_libraries(gtest_processor_imu_jacobians ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_processor_imu_jacobians ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_feature_imu gtest_feature_imu.cpp)
-target_link_libraries(gtest_feature_imu ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_feature_imu ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_factor_imu2d gtest_factor_imu2d.cpp)
-target_link_libraries(gtest_factor_imu2d ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_factor_imu2d ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_imu_static_init gtest_imu_static_init.cpp)
-target_link_libraries(gtest_imu_static_init ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_imu_static_init ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_imu2d_static_init gtest_imu2d_static_init.cpp)
-target_link_libraries(gtest_imu2d_static_init ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_imu2d_static_init ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_imu_mocap_fusion gtest_imu_mocap_fusion.cpp)
-target_link_libraries(gtest_imu_mocap_fusion ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_imu_mocap_fusion ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_factor_compass_3d gtest_factor_compass_3d.cpp)
-target_link_libraries(gtest_factor_compass_3d ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_factor_compass_3d ${PLUGIN_NAME})
 
 # Has been excluded from tests for god knows how long, so thing is broken.
 # Maybe call an archeologist to fix this thing?
 # wolf_add_gtest(gtest_factor_imu gtest_factor_imu.cpp)
-# target_link_libraries(gtest_factor_imu ${PLUGIN_NAME} ${wolf_LIBRARY})
+# target_link_libraries(gtest_factor_imu ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_processor_motion_intrinsics_update gtest_processor_motion_intrinsics_update.cpp)
-target_link_libraries(gtest_processor_motion_intrinsics_update ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_processor_motion_intrinsics_update ${PLUGIN_NAME})
 
 wolf_add_gtest(gtest_sensor_compass gtest_sensor_compass.cpp)
-target_link_libraries(gtest_sensor_compass ${PLUGIN_NAME} ${wolf_LIBRARY})
+target_link_libraries(gtest_sensor_compass ${PLUGIN_NAME})