diff --git a/src/test/cunit.c b/src/test/cunit.c
index d64c05a..84381bc 100644
--- a/src/test/cunit.c
+++ b/src/test/cunit.c
@@ -104,6 +104,8 @@ int main(void)
 							 test_parse_obj4)) ||
 		(NULL == CU_add_test(pSuite, "test5 parsing .obj",
 							 test_parse_obj5)) ||
+		(NULL == CU_add_test(pSuite, "test6 parsing .obj",
+							 test_parse_obj6)) ||
 		(NULL == CU_add_test(pSuite, "test1 finding center ob obj",
 							 test_find_center1)) ||
 		(NULL == CU_add_test(pSuite, "test2 finding center ob obj",
diff --git a/src/test/cunit.h b/src/test/cunit.h
index ed77d88..07fb616 100644
--- a/src/test/cunit.h
+++ b/src/test/cunit.h
@@ -43,6 +43,7 @@ void test_parse_obj2(void);
 void test_parse_obj3(void);
 void test_parse_obj4(void);
 void test_parse_obj5(void);
+void test_parse_obj6(void);
 
 void test_find_center1(void);
 void test_find_center2(void);
diff --git a/src/test/cunit_half_edge.c b/src/test/cunit_half_edge.c
index e176ea5..6cc1572 100644
--- a/src/test/cunit_half_edge.c
+++ b/src/test/cunit_half_edge.c
@@ -469,13 +469,66 @@ void test_parse_obj5(void)
 		while(next_edge != start_edge) {
 			CU_ASSERT_PTR_NOT_NULL(next_edge);
 			CU_ASSERT_PTR_NOT_NULL(next_edge->pair->pair);
+			/* check if edges have all the same face */
 			CU_ASSERT_EQUAL(next_edge->face, &(obj->faces[i]));
+			/* check if pairs are consistently set */
 			CU_ASSERT_EQUAL(next_edge->pair->pair, next_edge);
+			CU_ASSERT_NOT_EQUAL(next_edge->pair, next_edge);
+			/* check if vertices are consistent with edges */
+			CU_ASSERT_PTR_NOT_NULL(next_edge->vert->edge);
+			CU_ASSERT_EQUAL(next_edge->vert->edge->vert, next_edge->vert);
 			next_edge = next_edge->next;
 		}
 	}
 }
 
+/**
+ * Test the whole object for consistency by walking
+ * through all vertices and checking them for consistency.
+ */
+void test_parse_obj6(void)
+{
+	char const * const string = ""
+		"v 9.0 10.0 11.0\n"
+		"v 11.0 10.0 11.0\n"
+		"v 9.0 11.0 11.0\n"
+		"v 11.0 11.0 11.0\n"
+		"v 9.0 11.0 9.0\n"
+		"v 11.0 11.0 9.0\n"
+		"v 9.0 10.0 9.0\n"
+		"v 11.0 10.0 9.0\n"
+		"f 1 2 4 3\n"
+		"f 3 4 6 5\n"
+		"f 5 6 8 7\n"
+		"f 7 8 2 1\n"
+		"f 2 8 6 4\n"
+		"f 7 1 3 5\n";
+
+	HE_obj *obj = parse_obj(string);
+
+	CU_ASSERT_PTR_NOT_NULL(obj);
+
+
+	for (uint32_t i = 0; i < obj->vc; i++) {
+		HE_edge *edge = obj->vertices[i].edge;
+
+		do {
+			/* check if pairs are consistently set */
+			CU_ASSERT_EQUAL(edge->pair->pair, edge);
+			CU_ASSERT_NOT_EQUAL(edge->pair, edge);
+			/* check if neighbor vertex is consistently connected
+			 * to half-edge */
+			CU_ASSERT_NOT_EQUAL(edge->pair->vert, edge->vert);
+			CU_ASSERT_PTR_NOT_NULL(edge->pair->vert->edge);
+			CU_ASSERT_EQUAL(edge->pair->next->vert, edge->vert);
+			CU_ASSERT_EQUAL(edge->vert->edge->vert, edge->vert);
+
+			edge = edge->pair->next;
+
+		} while (edge && edge != obj->vertices[i].edge);
+	}
+}
+
 /**
  * Test finding the center of an object.
  */