diff --git a/src/graphviz_digraph_parser.cpp b/src/graphviz_digraph_parser.cpp
index 615724ef..615d1997 100644
--- a/src/graphviz_digraph_parser.cpp
+++ b/src/graphviz_digraph_parser.cpp
@@ -62,7 +62,9 @@
 #include <sstream>
 #endif
 
-#define GRAPHVIZ_GRAPH boost::GraphvizDigraph
+#ifndef GRAPHVIZ_GRAPH
+#error Need to define the GRAPHVIZ_GRAPH macro to either GraphvizGraph or GraphvizDigraph.
+#endif 
 
 #define YYPARSE_PARAM g
 
diff --git a/src/graphviz_graph_parser.cpp b/src/graphviz_graph_parser.cpp
index a4c4b3a0..bda3a1a7 100644
--- a/src/graphviz_graph_parser.cpp
+++ b/src/graphviz_graph_parser.cpp
@@ -62,7 +62,9 @@
 #include <sstream>
 #endif
 
-#define GRAPHVIZ_GRAPH boost::GraphvizGraph
+#ifndef GRAPHVIZ_GRAPH
+#error Need to define the GRAPHVIZ_GRAPH macro to either GraphvizGraph or GraphvizDigraph.
+#endif 
 
 #define YYPARSE_PARAM g
 
diff --git a/test/Jamfile b/test/Jamfile
index 49c1e9f5..ee12bd8a 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -8,9 +8,9 @@ exe transitive_closure_test : transitive_closure_test.cpp : <sysinclude>$(BOOST_
 exe adj_list_cc : adj_list_cc.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
 exe adj_list_test : adj_list_test.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
 exe adj_matrix_cc : adj_matrix_cc.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
-exe bfs : bfs.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
+exe bfs : bfs.cpp <lib>../../test/build/test_exec_monitor : <sysinclude>$(BOOST_ROOT) : debug ;
 exe bfs_cc : bfs_cc.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
-exe dfs : dfs.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
+exe dfs : dfs.cpp <lib>../../test/build/test_exec_monitor : <sysinclude>$(BOOST_ROOT) : debug ;
 exe dfs_cc : dfs_cc.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
 exe dijkstra_cc : dijkstra_cc.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
 exe edge_list_cc : edge_list_cc.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
@@ -22,5 +22,6 @@ exe leda_graph_cc : leda_graph_cc.cpp : <sysinclude>$(BOOST_ROOT) :
 exe reverse_graph_cc : reverse_graph_cc.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
 exe stanford_graph_cc : stanford_graph_cc.cpp : <sysinclude>$(BOOST_ROOT) 
    <include>$(SGB) <library-file>$(SGB)/libgb.a : debug ;
-exe subgraph : subgraph.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
+exe subgraph : subgraph.cpp <lib>../../test/build/test_exec_monitor : <sysinclude>$(BOOST_ROOT) : debug ;
+exe isomorphism : isomorphism.cpp <lib>../../test/build/test_exec_monitor : <sysinclude>$(BOOST_ROOT) : debug ;
 exe vector_graph_cc : vector_graph_cc.cpp : <sysinclude>$(BOOST_ROOT) : debug ;
diff --git a/test/adj_list_test.cpp b/test/adj_list_test.cpp
index 72156ccb..4c4434bb 100644
--- a/test/adj_list_test.cpp
+++ b/test/adj_list_test.cpp
@@ -41,7 +41,8 @@ main()
         system("rm -f graph.exe graph.o graph.obj");
         // the following system call should be replaced by a
         // portable "compile" command.
-        const char* compile = "g++ -I.. -O2 -Wall -Wno-long-long -ftemplate-depth-30 ../libs/graph/test/graph.cpp -o graph.exe";
+        //const char* compile = "g++ -I.. -O2 -Wall -Wno-long-long -ftemplate-depth-30 ../libs/graph/test/graph.cpp -o graph.exe";
+	const char* compile = "g++ -I/u/jsiek/STLport-4.5.3/stlport -L/u/jsiek/STLport-4.5.3/lib -lstlport_gcc_stldebug -lpthread -I/u/jsiek/boost -D_STLP_DEBUG ../libs/graph/test/graph.cpp -o graph.exe";
         std::cout << compile << std::endl;
         rc = system(compile);
         if (rc != 0) {
diff --git a/test/graph_type.hpp b/test/graph_type.hpp
index c65b28a6..e938943e 100644
--- a/test/graph_type.hpp
+++ b/test/graph_type.hpp
@@ -1,6 +1,4 @@
 #include <boost/graph/adjacency_list.hpp>
-typedef boost::adjacency_list<boost::setS, boost::setS, boost::undirectedS, 
-  boost::property<vertex_id_t, std::size_t>, 
-  boost::property<edge_id_t, std::size_t> > Graph;
+typedef boost::adjacency_list<boost::setS, boost::setS, boost::undirectedS, boost::property<vertex_id_t, std::size_t>, boost::property<edge_id_t, std::size_t> > Graph;
 typedef boost::property<vertex_id_t, std::size_t> VertexId;
 typedef boost::property<edge_id_t, std::size_t> EdgeID;
diff --git a/test/isomorphism.cpp b/test/isomorphism.cpp
index e9d8a779..568a370e 100644
--- a/test/isomorphism.cpp
+++ b/test/isomorphism.cpp
@@ -23,7 +23,10 @@
 #define BOOST_INCLUDE_MAIN
 #include <boost/test/test_tools.hpp>
 #include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/isomorphism.hpp>
+//#include <boost/graph/isomorphism.hpp>
+//#include <boost/graph/ddl_isomorphism.hpp>
+#include "../doc/isomorphism.hpp"
+//#include "../doc/isomorphism-v2.hpp"
 #include <boost/property_map.hpp>
 #include <boost/random/uniform_real.hpp>
 #include <boost/random/mersenne_twister.hpp>