diff --git a/.cproject b/.cproject
index 176d38a6e..e538a27cf 100644
--- a/.cproject
+++ b/.cproject
@@ -732,6 +732,14 @@
 						<useDefaultCommand>false</useDefaultCommand>
 						<runAllBuilders>true</runAllBuilders>
 					</target>
+					<target name="clean" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+						<buildCommand>make</buildCommand>
+						<buildArguments/>
+						<buildTarget>clean</buildTarget>
+						<stopOnError>true</stopOnError>
+						<useDefaultCommand>true</useDefaultCommand>
+						<runAllBuilders>true</runAllBuilders>
+					</target>
 					<target name="all" path="nonlinear" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 						<buildCommand>make</buildCommand>
 						<buildArguments/>
diff --git a/slam/Makefile.am b/slam/Makefile.am
index 2aebc2864..a67ce5895 100644
--- a/slam/Makefile.am
+++ b/slam/Makefile.am
@@ -10,7 +10,7 @@ check_PROGRAMS =
 headers += Simulated2DConfig.h 
 headers += Simulated2DPosePrior.h Simulated2DPointPrior.h 
 headers += Simulated2DOdometry.h Simulated2DMeasurement.h 
-sources += simulated2D.cpp  
+sources += simulated2D.cpp smallExample.cpp
 check_PROGRAMS += testSimulated2D 
 
 # simulated2DOriented example
@@ -46,6 +46,7 @@ check_PROGRAMS += testVSLAMFactor testVSLAMGraph testVSLAMConfig
 
 # GaussianISAM2 is fairly SLAM-specific
 sources += GaussianISAM2.cpp
+check_PROGRAMS += testGaussianISAM2
 
 #----------------------------------------------------------------------------------------------------
 # Create a libtool library that is not installed
diff --git a/tests/smallExample.cpp b/slam/smallExample.cpp
similarity index 100%
rename from tests/smallExample.cpp
rename to slam/smallExample.cpp
diff --git a/tests/smallExample.h b/slam/smallExample.h
similarity index 100%
rename from tests/smallExample.h
rename to slam/smallExample.h
diff --git a/slam/testGaussianISAM2 b/slam/testGaussianISAM2
new file mode 100755
index 000000000..254ee845f
Binary files /dev/null and b/slam/testGaussianISAM2 differ
diff --git a/tests/testGaussianISAM2.cpp b/slam/testGaussianISAM2.cpp
similarity index 100%
rename from tests/testGaussianISAM2.cpp
rename to slam/testGaussianISAM2.cpp
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3002e398a..caa4353d0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@
 
 check_PROGRAMS = testBayesNetPreconditioner testConstraintOptimizer 
 check_PROGRAMS += testGaussianBayesNet testGaussianFactor testGaussianFactorGraph 
-check_PROGRAMS += testGaussianISAM testGaussianISAM2 testGraph
+check_PROGRAMS += testGaussianISAM testGraph
 check_PROGRAMS += testInference testIterative testGaussianJunctionTree 
 check_PROGRAMS += testNonlinearEquality testNonlinearFactor testNonlinearFactorGraph
 check_PROGRAMS += testNonlinearOptimizer testSQP testSubgraphPreconditioner
@@ -14,21 +14,14 @@ check_PROGRAMS += testSymbolicBayesNet testSymbolicFactorGraph testTupleConfig
 # Timing tests
 noinst_PROGRAMS = timeGaussianFactorGraph
 
-#----------------------------------------------------------------------------------------------------
-# rules to build local library
-#----------------------------------------------------------------------------------------------------
-noinst_HEADERS = smallExample.h
-noinst_LIBRARIES = libtests.a
-libtests_a_SOURCES = smallExample.cpp
-AM_CPPFLAGS = -I$(boost) -I../colamd 
-AM_CPPFLAGS += -I../base -I../geometry -I../inference  -I../linear -I../nonlinear -I../slam 
-
 #----------------------------------------------------------------------------------------------------
 # rules to build unit tests
 #----------------------------------------------------------------------------------------------------
 TESTS = $(check_PROGRAMS)
+AM_CPPFLAGS = -I$(boost) -I../colamd 
+AM_CPPFLAGS += -I../base -I../geometry -I../inference  -I../linear -I../nonlinear -I../slam 
 AM_LDFLAGS = $(BOOST_LDFLAGS) $(boost_serialization) 
-LDADD = libtests.a ../libgtsam.la ../CppUnitLite/libCppUnitLite.a  
+LDADD = ../libgtsam.la ../CppUnitLite/libCppUnitLite.a  
 AM_DEFAULT_SOURCE_EXT = .cpp
 
 # rule to run an executable