diff -r c7af4ec56e19 -r 9c219a62070d test/list_tests.c
--- a/test/list_tests.c	Thu May 31 09:18:26 2012 +0200
+++ b/test/list_tests.c	Thu May 31 12:51:22 2012 +0200
@@ -4,35 +4,34 @@
 
 #include "list_tests.h"
 
-UCX_TEST_BEGIN(test_ucx_list_append) {
+UCX_TEST_IMPLEMENT(test_ucx_list_append) {
     UcxList *list = ucx_list_append(NULL, "Hello");
-    
+    UCX_TEST_BEGIN
     UCX_TEST_ASSERT(strncmp(list->data, "Hello", 5) == 0, "failed")
     
     list = ucx_list_append(list, " World!");
     
     UCX_TEST_ASSERT(strncmp(list->next->data, " World!", 7) == 0, "failed")
     UCX_TEST_ASSERT(list->next->next == NULL, "failed")
-    
+
+    UCX_TEST_END
     ucx_list_free(list);
-    
-    UCX_TEST_END
 }
 
-UCX_TEST_BEGIN(test_ucx_list_prepend) {
+UCX_TEST_IMPLEMENT(test_ucx_list_prepend) {
     UcxList *list = ucx_list_prepend(NULL, " World!");
+    UCX_TEST_BEGIN
     list = ucx_list_prepend(list, "Hello");
     
     UCX_TEST_ASSERT(strncmp(list->data, "Hello", 5) == 0, "failed")
     UCX_TEST_ASSERT(strncmp(list->next->data, " World!", 7) == 0, "failed")
     UCX_TEST_ASSERT(list->next->next == NULL, "failed")
     
+    UCX_TEST_END
     ucx_list_free(list);
-    
-    UCX_TEST_END
 }
 
-UCX_TEST_BEGIN(test_ucx_list_equals) {
+UCX_TEST_IMPLEMENT(test_ucx_list_equals) {
     UcxList *list = ucx_list_append(NULL, "Hello");
     list = ucx_list_append(list, " World!");
     UcxList *list2 = ucx_list_prepend(NULL, " World!");
@@ -40,33 +39,37 @@
     UcxList *list3 = ucx_list_prepend(NULL, " Welt!");
     list3 = ucx_list_prepend(list3, "Hallo");
     
+    UCX_TEST_BEGIN
     UCX_TEST_ASSERT(ucx_list_equals(list, list2, cmp_string, NULL), "failed")
     UCX_TEST_ASSERT(!ucx_list_equals(list, list3, cmp_string, NULL), "failed")
+    UCX_TEST_END
     
     ucx_list_free(list3);
     ucx_list_free(list2);
     ucx_list_free(list);
-    
-    UCX_TEST_END
 }
 
-UCX_TEST_BEGIN(test_ucx_list_concat) {
+UCX_TEST_IMPLEMENT(test_ucx_list_concat) {
     UcxList *list = ucx_list_append(NULL, "Hello");
     UcxList *list2 = ucx_list_prepend(NULL, " World!");
     
     list = ucx_list_concat(list, list2);
+    UCX_TEST_BEGIN
     
     UCX_TEST_ASSERT(strncmp(list->data, "Hello", 5) == 0, "failed")
     UCX_TEST_ASSERT(strncmp(list->next->data, " World!", 7) == 0, "failed")
     UCX_TEST_ASSERT(list->next->next == NULL, "failed")
     
+    UCX_TEST_END
+    if (list->next == NULL) {
+        ucx_list_free(list2);
+    }
     ucx_list_free(list);
-    
-    UCX_TEST_END
 }
 
-UCX_TEST_BEGIN(test_ucx_list_size) {
+UCX_TEST_IMPLEMENT(test_ucx_list_size) {
     UcxList *list = ucx_list_append(NULL, "This ");
+    UCX_TEST_BEGIN
     list = ucx_list_append(list, "list ");
     list = ucx_list_append(list, "has ");
     list = ucx_list_append(list, "size ");
@@ -74,13 +77,13 @@
     
     UCX_TEST_ASSERT(ucx_list_size(list) == 5, "failed");
     
+    UCX_TEST_END
     ucx_list_free(list);
-    
-    UCX_TEST_END
 }
 
-UCX_TEST_BEGIN(test_ucx_list_last) {
+UCX_TEST_IMPLEMENT(test_ucx_list_last) {
     UcxList *list = ucx_list_append(NULL, "Find ");
+    UCX_TEST_BEGIN
     list = ucx_list_append(list, "the ");
     list = ucx_list_append(list, "last!");
     
@@ -88,13 +91,14 @@
     
     UCX_TEST_ASSERT(strncmp(last, "last!", 5) == 0, "failed");
     
+    UCX_TEST_END
     ucx_list_free(list);
     
-    UCX_TEST_END
 }
 
-UCX_TEST_BEGIN(test_ucx_list_get) {
+UCX_TEST_IMPLEMENT(test_ucx_list_get) {
     UcxList *list = ucx_list_append(NULL, "Find ");
+    UCX_TEST_BEGIN
     list = ucx_list_append(list, "the ");
     list = ucx_list_append(list, "mid!");
     
@@ -102,13 +106,13 @@
     
     UCX_TEST_ASSERT(strncmp(mid, "the ", 4) == 0, "failed");
     
+    UCX_TEST_END
     ucx_list_free(list);
-    
-    UCX_TEST_END
 }
 
-UCX_TEST_BEGIN(test_ucx_list_remove) {
+UCX_TEST_IMPLEMENT(test_ucx_list_remove) {
     UcxList *list = ucx_list_append(NULL, "Hello");
+    UCX_TEST_BEGIN
     list = ucx_list_append(list, " fucking");
     list = ucx_list_append(list, " World!");
     
@@ -117,13 +121,12 @@
     UCX_TEST_ASSERT(strncmp(list->data, "Hello", 5) == 0, "failed")
     UCX_TEST_ASSERT(strncmp(list->next->data, " World!", 7) == 0, "failed")
     UCX_TEST_ASSERT(list->next->next == NULL, "failed")
+    UCX_TEST_END
     
     ucx_list_free(list);
-    
-    UCX_TEST_END
 }
 
-UCX_TEST_BEGIN(test_ucx_list_clone) {
+UCX_TEST_IMPLEMENT(test_ucx_list_clone) {
    
     char *hello = (char*)malloc(6);
     char *world = (char*)malloc(8);
@@ -135,11 +138,13 @@
     list = ucx_list_append(list, world);
     
     UcxList *copy = ucx_list_clone(list, copy_string, NULL);
+    UCX_TEST_BEGIN
 
     UCX_TEST_ASSERT(ucx_list_equals(list, copy, cmp_string, NULL), "failed")
     UCX_TEST_ASSERT(hello != copy->data, "first element is no copy")
     UCX_TEST_ASSERT(world != copy->next->data, "second element is no copy")
-            
+
+    UCX_TEST_END
     free(copy->next->data);
     free(copy->data);
 
@@ -147,6 +152,4 @@
     free(hello);
     ucx_list_free(list);
     ucx_list_free(copy);
-    
-    UCX_TEST_END
 }