diff --git a/alib2data/test-src/graph/GraphTest.cpp b/alib2data/test-src/graph/GraphTest.cpp
index 9ae3f19f625d60e9e4721bffa6cb244de8304e91..5e1830cd97817f2d5f959641351cc4bbde6ef472 100644
--- a/alib2data/test-src/graph/GraphTest.cpp
+++ b/alib2data/test-src/graph/GraphTest.cpp
@@ -8,66 +8,62 @@
 
 #define CPPUNIT_ASSERT_EQUAL_INT(a, b) CPPUNIT_ASSERT_EQUAL(a, (int)b)
 
+#define RUN_TEST(t) \
+	std::cout << "ADJACENCY_LIST" << std::endl; \
+	t(graph::REPRESENTATION::ADJACENCY_LIST); \
+	std::cout << "ADJACENCY_MATRIX" << std::endl; \
+	t(graph::REPRESENTATION::ADJACENCY_MATRIX)
+
 CPPUNIT_TEST_SUITE_REGISTRATION(GraphTest);
 
 void GraphTest::testCopyConstruct()
 {
-	testCopyConstruct_impl(graph::REPRESENTATION::ADJACENCY_LIST);
-	testCopyConstruct_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+	RUN_TEST(testCopyConstruct_impl);
 }
 
 void GraphTest::testEqual()
 {
-	testEqual_impl(graph::REPRESENTATION::ADJACENCY_LIST);
-	testEqual_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+	RUN_TEST(testEqual_impl);
 }
 
 void GraphTest::testXMLParser()
 {
-	testXMLParser_impl(graph::REPRESENTATION::ADJACENCY_LIST);
-	testXMLParser_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+	RUN_TEST(testXMLParser_impl);
 }
 
 void GraphTest::testStringParser()
 {
-	testStringParser_impl(graph::REPRESENTATION::ADJACENCY_LIST);
-	testStringParser_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+	RUN_TEST(testStringParser_impl);
 }
 
 void GraphTest::testAddEdge()
 {
-	testAddEdge_impl(graph::REPRESENTATION::ADJACENCY_LIST);
-	testAddEdge_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+	RUN_TEST(testAddEdge_impl);
 }
 
 void GraphTest::testRemoveEdge()
 {
-	testRemoveEdge_impl(graph::REPRESENTATION::ADJACENCY_LIST);
-	testRemoveEdge_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+	RUN_TEST(testRemoveEdge_impl);
 }
 
 void GraphTest::testAddNode()
 {
-	testAddNode_impl(graph::REPRESENTATION::ADJACENCY_LIST);
-	testAddNode_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+	RUN_TEST(testAddNode_impl);
 }
 
 void GraphTest::testRemoveNode()
 {
-	testRemoveNode_impl(graph::REPRESENTATION::ADJACENCY_LIST);
-	testRemoveNode_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+	RUN_TEST(testRemoveNode_impl);
 }
 
 void GraphTest::testNeighborEdges()
 {
-	testNeighborEdges_impl(graph::REPRESENTATION::ADJACENCY_LIST);
-	testNeighborEdges_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+	RUN_TEST(testNeighborEdges_impl);
 }
 
 void GraphTest::testHasEdge()
 {
-	testHasEdge_impl(graph::REPRESENTATION::ADJACENCY_LIST);
-	testHasEdge_impl(graph::REPRESENTATION::ADJACENCY_MATRIX);
+	RUN_TEST(testHasEdge_impl);
 }
 
 void GraphTest::testCopyConstruct_impl(graph::REPRESENTATION representation)