diff --git a/gtsam_unstable/discrete/CMakeLists.txt b/gtsam_unstable/discrete/CMakeLists.txt
index 707a67d84..5d61db848 100644
--- a/gtsam_unstable/discrete/CMakeLists.txt
+++ b/gtsam_unstable/discrete/CMakeLists.txt
@@ -16,10 +16,9 @@ set (discrete_full_libs
     gtsam_unstable-static)
 
 # Exclude tests that don't work
-set (discrete_excluded_tests 
-"${CMAKE_CURRENT_SOURCE_DIR}/tests/testScheduler.cpp"
-#"${CMAKE_CURRENT_SOURCE_DIR}/tests/testCSP.cpp"
-)
+#set (discrete_excluded_tests 
+#"${CMAKE_CURRENT_SOURCE_DIR}/tests/testScheduler.cpp"
+#)
 
 
 # Add all tests
@@ -27,8 +26,8 @@ gtsam_add_subdir_tests(discrete_unstable "${discrete_local_libs}" "${discrete_fu
 
 # List examples to build - comment out here to exclude from compilation
 set(discrete_unstable_examples
-#schedulingExample
-#schedulingQuals12
+schedulingExample
+schedulingQuals12
 )
 
 if (GTSAM_BUILD_EXAMPLES)
diff --git a/gtsam_unstable/discrete/Scheduler.cpp b/gtsam_unstable/discrete/Scheduler.cpp
index 678ba1580..d551b1f0b 100644
--- a/gtsam_unstable/discrete/Scheduler.cpp
+++ b/gtsam_unstable/discrete/Scheduler.cpp
@@ -105,7 +105,6 @@ namespace gtsam {
 
 	/** Add student-specific constraints to the graph */
 	void Scheduler::addStudentSpecificConstraints(size_t i, boost::optional<size_t> slot) {
-#ifdef BROKEN
 		bool debug = ISDEBUG("Scheduler::buildGraph");
 
 		assert(i<nrStudents());
@@ -134,7 +133,7 @@ namespace gtsam {
 				DiscreteKey dummy(0, nrTimeSlots());
 				Potentials::ADT p(dummy & areaKey, available_);
 				Potentials::ADT q = p.choose(0, *slot);
-				Constraint::shared_ptr f(new DecisionTreeFactor(areaKey, q));
+				DiscreteFactor::shared_ptr f(new DecisionTreeFactor(areaKey, q));
 				CSP::push_back(f);
 			} else {
 				CSP::add(s.key_, areaKey, available_);
@@ -144,15 +143,11 @@ namespace gtsam {
 		// add mutex
 		if (debug) cout << "Mutex for faculty" << endl;
 		addAllDiff(s.keys_[0] & s.keys_[1] & s.keys_[2]);
-#else
-				throw runtime_error("addStudentSpecificConstraints is broken");
-#endif
 	}
 
 
 	/** Main routine that builds factor graph */
 	void Scheduler::buildGraph(size_t mutexBound) {
-#ifdef BROKEN
 		bool debug = ISDEBUG("Scheduler::buildGraph");
 
 		if (debug) cout << "Adding student-specific constraints" << endl;
@@ -178,10 +173,6 @@ namespace gtsam {
 				}
 			}
 		}
-#else
-				throw runtime_error("buildGraph is broken");
-#endif
-
 	} // buildGraph
 
 	/** print */