diff --git a/.cproject b/.cproject
index 1501cc6af..5fc567cfb 100644
--- a/.cproject
+++ b/.cproject
@@ -1592,22 +1592,6 @@
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="slam_testSimulated2D.run" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>make</buildCommand>
-				<buildArguments>-j2</buildArguments>
-				<buildTarget>slam_testSimulated2D.run</buildTarget>
-				<stopOnError>true</stopOnError>
-				<useDefaultCommand>true</useDefaultCommand>
-				<runAllBuilders>true</runAllBuilders>
-			</target>
-			<target name="wrap_testWrap.run" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>make</buildCommand>
-				<buildArguments>-j2</buildArguments>
-				<buildTarget>wrap_testWrap.run</buildTarget>
-				<stopOnError>true</stopOnError>
-				<useDefaultCommand>true</useDefaultCommand>
-				<runAllBuilders>true</runAllBuilders>
-			</target>
 			<target name="check" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments>-j2</buildArguments>
@@ -1648,10 +1632,10 @@
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="base_testMatrix.run" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+			<target name="base.testMatrix.run" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments>-j2</buildArguments>
-				<buildTarget>base_testMatrix.run</buildTarget>
+				<buildTarget>base.testMatrix.run</buildTarget>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
@@ -1680,6 +1664,22 @@
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
+			<target name="base.testVector.run" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-j2</buildArguments>
+				<buildTarget>base.testVector.run</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="base.timeMatrix.run" path="build_cmake" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-j2</buildArguments>
+				<buildTarget>base.timeMatrix.run</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
 			<target name="tests/testDSFVector.run" path="build/gtsam/base" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments>-j2</buildArguments>
diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt
index 76e027806..5c5247425 100644
--- a/gtsam/CMakeLists.txt
+++ b/gtsam/CMakeLists.txt
@@ -12,6 +12,7 @@ set (gtsam_subdirs
 
 foreach(subdir ${gtsam_subdirs})
     # Build local library and tests
+    message(STATUS "Building ${subdir}") 
     add_subdirectory(${subdir})
     
     # link subfolder check to main check
diff --git a/gtsam/base/CMakeLists.txt b/gtsam/base/CMakeLists.txt
index 8a316543e..8c16f5989 100644
--- a/gtsam/base/CMakeLists.txt
+++ b/gtsam/base/CMakeLists.txt
@@ -6,29 +6,37 @@ add_library(base STATIC ${base_srcs})
 file(GLOB base_headers "*.h")
 install(FILES ${base_headers} DESTINATION include/gtsam/base)
 
-add_custom_target(check.base)
+add_custom_target(check.base COMMAND ${CMAKE_CTEST_COMMAND})
 add_custom_target(timing.base)
 
+# Components to link tests in this subfolder against
+set(base_local_libs
+    CppUnitLite
+    base
+)
+
 # Build tests
 file(GLOB base_tests_srcs "tests/test*.cpp")
 foreach(test_src ${base_tests_srcs})
     get_filename_component(test_base ${test_src} NAME_WE)
-    set( test_bin base_${test_base} )
+    set( test_bin base.${test_base} )
+    message(STATUS "Adding Test ${test_bin}") 
     add_executable(${test_bin} EXCLUDE_FROM_ALL ${test_src})
     add_dependencies(check.base ${test_bin})
     add_test(${test_base} ${EXECUTABLE_OUTPUT_PATH}${test_bin})
-    target_link_libraries(${test_bin} CppUnitLite base)
+    target_link_libraries(${test_bin} ${base_local_libs})
     add_custom_target(${test_bin}.run ${EXECUTABLE_OUTPUT_PATH}${test_bin} ${ARGN})
 endforeach(test_src)
 
 # Build timing scripts
-file(GLOB base_tests_srcs "tests/time*.cpp") 
-foreach(time_src ${time_srcs})
+file(GLOB base_timing_srcs "tests/time*.cpp") 
+foreach(time_src ${base_timing_srcs})
     get_filename_component(time_base ${time_src} NAME_WE)
-    set( time_bin ${time_base} )
+    set( time_bin base.${time_base} )
+    message(STATUS "Adding Timing Benchmark ${time_bin}")
     add_executable(${time_bin} EXCLUDE_FROM_ALL ${time_src})
     add_dependencies(timing.base ${time_bin})
-    target_link_libraries(${time_bin} CppUnitLite base)
-    add_custom_target(${time_base}.run ${EXECUTABLE_OUTPUT_PATH}${time_bin} ${ARGN})
+    target_link_libraries(${time_bin} ${base_local_libs})
+    add_custom_target(${time_bin}.run ${EXECUTABLE_OUTPUT_PATH}${time_bin} ${ARGN})
 endforeach(time_src)