diff -r 0a70e0d36949 -r 4d320dc3a7af test/list_tests.c
--- a/test/list_tests.c	Fri Aug 09 10:24:02 2013 +0200
+++ b/test/list_tests.c	Fri Aug 09 11:32:10 2013 +0200
@@ -29,7 +29,7 @@
 #include "list_tests.h"
 #include "ucx/utils.h"
 
-UCX_TEST_IMPLEMENT(test_ucx_list_append) {
+UCX_TEST(test_ucx_list_append) {
     UcxList *list = ucx_list_append(NULL, (void*)"Hello");
     UCX_TEST_BEGIN
     
@@ -46,7 +46,7 @@
     ucx_list_free(list);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_prepend) {
+UCX_TEST(test_ucx_list_prepend) {
     UcxList *list = ucx_list_prepend(NULL, (void*)" World!");
     UCX_TEST_BEGIN
 
@@ -62,7 +62,7 @@
     ucx_list_free(list);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_equals) {
+UCX_TEST(test_ucx_list_equals) {
     UcxList *list = ucx_list_append(NULL, (void*)"Hello");
     list = ucx_list_append(list, (void*)" World!");
     UcxList *list2 = ucx_list_prepend(NULL, (void*)" World!");
@@ -80,7 +80,7 @@
     ucx_list_free(list);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_concat) {
+UCX_TEST(test_ucx_list_concat) {
     UcxList *list = ucx_list_append(NULL, (void*)"Hello");
     UcxList *list2 = ucx_list_prepend(NULL, (void*)" World!");
     UCX_TEST_BEGIN
@@ -97,7 +97,7 @@
     ucx_list_free(list);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_size) {
+UCX_TEST(test_ucx_list_size) {
     UcxList *list = ucx_list_append(NULL, (void*)"This ");
     list = ucx_list_append(list, (void*)"list ");
     list = ucx_list_append(list, (void*)"has ");
@@ -112,7 +112,7 @@
     ucx_list_free(list);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_first) {
+UCX_TEST(test_ucx_list_first) {
     UcxList *list = ucx_list_append(NULL, (void*)"Find ");
     list = ucx_list_append(list, (void*)"the ");
     list = ucx_list_append(list, (void*)"first!");
@@ -127,7 +127,7 @@
     ucx_list_free(list);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_last) {
+UCX_TEST(test_ucx_list_last) {
     UcxList *list = ucx_list_append(NULL, (void*)"Find ");
     list = ucx_list_append(list, (void*)"the ");
     list = ucx_list_append(list, (void*)"last!");
@@ -142,7 +142,7 @@
     ucx_list_free(list);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_get) {
+UCX_TEST(test_ucx_list_get) {
     UcxList *list = ucx_list_append(NULL, (void*)"Find ");
     list = ucx_list_append(list, (void*)"the ");
     list = ucx_list_append(list, (void*)"mid!");
@@ -157,7 +157,7 @@
     ucx_list_free(list);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_indexof) {
+UCX_TEST(test_ucx_list_indexof) {
     UcxList *list = ucx_list_append(NULL, (void*)"Find ");
     list = ucx_list_append(list, (void*)"the ");
     list = ucx_list_append(list, (void*)"mid!");
@@ -177,7 +177,7 @@
     ucx_list_free(list);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_find) {
+UCX_TEST(test_ucx_list_find) {
     UcxList *l = ucx_list_append(NULL, (void*)"find ");
     l = ucx_list_append(l, (void*)"some ");
     l = ucx_list_append(l, (void*)"string!");
@@ -193,7 +193,7 @@
     ucx_list_free(l);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_contains) {
+UCX_TEST(test_ucx_list_contains) {
     UcxList *l = ucx_list_append(NULL, (void*)"Contains ");
     l = ucx_list_append(l, (void*)"a ");
     l = ucx_list_append(l, (void*)"string!");
@@ -209,7 +209,7 @@
     ucx_list_free(l);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_remove) {
+UCX_TEST(test_ucx_list_remove) {
     UcxList *list = ucx_list_append(NULL, (void*)"Hello");
     list = ucx_list_append(list, (void*)" fucking");
     list = ucx_list_append(list, (void*)" World!");
@@ -228,7 +228,7 @@
     ucx_list_free(list);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_clone) {
+UCX_TEST(test_ucx_list_clone) {
    
     char *hello = (char*)malloc(6);
     char *world = (char*)malloc(8);
@@ -256,7 +256,7 @@
     ucx_list_free(copy);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_list_sort) {
+UCX_TEST(test_ucx_list_sort) {
     UcxList *list = ucx_list_append(NULL, (void*)"this");
     list = ucx_list_append(list, (void*)"is");
     list = ucx_list_append(list, (void*)"a");