diff --git a/gtsam/inference/graph.h b/gtsam/inference/graph.h
index 98d41940b..88ab5d0e8 100644
--- a/gtsam/inference/graph.h
+++ b/gtsam/inference/graph.h
@@ -108,3 +108,5 @@ namespace gtsam {
 
 
 } // namespace gtsam
+
+#include <gtsam/inference/graph-inl.h>
diff --git a/tests/testGraph.cpp b/tests/testGraph.cpp
index 5f99d60c6..93ecd6dbe 100644
--- a/tests/testGraph.cpp
+++ b/tests/testGraph.cpp
@@ -16,8 +16,10 @@
  * @brief unit test for graph-inl.h
  */
 
-#include <gtsam/slam/pose2SLAM.h>
-#include <gtsam/inference/graph-inl.h>
+#include <gtsam/slam/BetweenFactor.h>
+#include <gtsam/nonlinear/NonlinearFactorGraph.h>
+#include <gtsam/inference/graph.h>
+#include <gtsam/geometry/Pose2.h>
 
 #include <CppUnitLite/TestHarness.h>
 
@@ -75,13 +77,13 @@ TEST( Graph, predecessorMap2Graph )
 /* ************************************************************************* */
 TEST( Graph, composePoses )
 {
-	pose2SLAM::Graph graph;
+	NonlinearFactorGraph graph;
 	SharedNoiseModel cov = noiseModel::Unit::Create(3);
 	Pose2 p1(1.0, 2.0, 0.3), p2(4.0, 5.0, 0.6), p3(7.0, 8.0, 0.9), p4(2.0, 2.0, 2.9);
 	Pose2 p12=p1.between(p2), p23=p2.between(p3), p43=p4.between(p3);
-	graph.addRelativePose(1,2, p12, cov);
-	graph.addRelativePose(2,3, p23, cov);
-	graph.addRelativePose(4,3, p43, cov);
+	graph.add(BetweenFactor<Pose2>(1,2, p12, cov));
+	graph.add(BetweenFactor<Pose2>(2,3, p23, cov));
+	graph.add(BetweenFactor<Pose2>(4,3, p43, cov));
 
 	PredecessorMap<Key> tree;
 	tree.insert(1,2);
@@ -91,8 +93,7 @@ TEST( Graph, composePoses )
 
 	Pose2 rootPose = p2;
 
-	boost::shared_ptr<Values> actual = composePoses<pose2SLAM::Graph, pose2SLAM::Odometry,
-			Pose2, Key> (graph, tree, rootPose);
+	boost::shared_ptr<Values> actual = composePoses<NonlinearFactorGraph, BetweenFactor<Pose2>, Pose2, Key> (graph, tree, rootPose);
 
 	Values expected;
 	expected.insert(1, p1);