diff --git a/gtsam_unstable/linear/ActiveSetSolver-inl.h b/gtsam_unstable/linear/ActiveSetSolver-inl.h
index 602012090..12374ac76 100644
--- a/gtsam_unstable/linear/ActiveSetSolver-inl.h
+++ b/gtsam_unstable/linear/ActiveSetSolver-inl.h
@@ -149,7 +149,7 @@ Template JacobianFactor::shared_ptr This::createDualFactor(
     // to compute the least-square approximation of dual variables
     return boost::make_shared<JacobianFactor>(Aterms, b);
   } else {
-    return boost::make_shared<JacobianFactor>();
+    return nullptr;
   }
 }
 
@@ -165,14 +165,13 @@ Template JacobianFactor::shared_ptr This::createDualFactor(
  *  if lambda = 0  you are on the constraint
  *  if lambda > 0  you are violating the constraint.
  */
-Template GaussianFactorGraph::shared_ptr This::buildDualGraph(
+Template GaussianFactorGraph This::buildDualGraph(
     const InequalityFactorGraph& workingSet, const VectorValues& delta) const {
-  GaussianFactorGraph::shared_ptr dualGraph(new GaussianFactorGraph());
+  GaussianFactorGraph dualGraph;
   for (Key key : constrainedKeys_) {
     // Each constrained key becomes a factor in the dual graph
-    JacobianFactor::shared_ptr dualFactor =
-        createDualFactor(key, workingSet, delta);
-    if (!dualFactor->empty()) dualGraph->push_back(dualFactor);
+    auto dualFactor = createDualFactor(key, workingSet, delta);
+    if (dualFactor) dualGraph.push_back(dualFactor);
   }
   return dualGraph;
 }
@@ -193,19 +192,16 @@ This::buildWorkingGraph(const InequalityFactorGraph& workingSet,
 Template typename This::State This::iterate(
     const typename This::State& state) const {
   // Algorithm 16.3 from Nocedal06book.
-  // Solve with the current working set eqn 16.39, but instead of solving for p
-  // solve for x
-  GaussianFactorGraph workingGraph =
-      buildWorkingGraph(state.workingSet, state.values);
+  // Solve with the current working set eqn 16.39, but solve for x not p
+  auto workingGraph = buildWorkingGraph(state.workingSet, state.values);
   VectorValues newValues = workingGraph.optimize();
   // If we CAN'T move further
   // if p_k = 0 is the original condition, modified by Duy to say that the state
   // update is zero.
   if (newValues.equals(state.values, 1e-7)) {
     // Compute lambda from the dual graph
-    GaussianFactorGraph::shared_ptr dualGraph = buildDualGraph(state.workingSet,
-        newValues);
-    VectorValues duals = dualGraph->optimize();
+    auto dualGraph = buildDualGraph(state.workingSet, newValues);
+    VectorValues duals = dualGraph.optimize();
     int leavingFactor = identifyLeavingConstraint(state.workingSet, duals);
     // If all inequality constraints are satisfied: We have the solution!!
     if (leavingFactor < 0) {
diff --git a/gtsam_unstable/linear/ActiveSetSolver.h b/gtsam_unstable/linear/ActiveSetSolver.h
index 8c3c5a7e5..318912cf3 100644
--- a/gtsam_unstable/linear/ActiveSetSolver.h
+++ b/gtsam_unstable/linear/ActiveSetSolver.h
@@ -154,8 +154,8 @@ protected:
 public: /// Just for testing...
 
   /// Builds a dual graph from the current working set.
-  GaussianFactorGraph::shared_ptr buildDualGraph(
-      const InequalityFactorGraph& workingSet, const VectorValues& delta) const;
+  GaussianFactorGraph buildDualGraph(const InequalityFactorGraph &workingSet,
+                                     const VectorValues &delta) const;
 
   /**
    * Build a working graph of cost, equality and active inequality constraints
diff --git a/gtsam_unstable/linear/LPInitSolver.h b/gtsam_unstable/linear/LPInitSolver.h
index 4eb672fbc..14e5fb000 100644
--- a/gtsam_unstable/linear/LPInitSolver.h
+++ b/gtsam_unstable/linear/LPInitSolver.h
@@ -21,7 +21,6 @@
 
 #include <gtsam_unstable/linear/LP.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
-#include <CppUnitLite/Test.h>
 
 namespace gtsam {
 /**
@@ -83,7 +82,7 @@ private:
       const InequalityFactorGraph& inequalities) const;
 
   // friend class for unit-testing private methods
-  FRIEND_TEST(LPInitSolver, initialization);
+  friend class LPInitSolverInitializationTest;
 };
 
 }