diff -r 0a70e0d36949 -r 4d320dc3a7af test/buffer_tests.c
--- a/test/buffer_tests.c	Fri Aug 09 10:24:02 2013 +0200
+++ b/test/buffer_tests.c	Fri Aug 09 11:32:10 2013 +0200
@@ -28,7 +28,7 @@
 
 #include "buffer_tests.h"
 
-UCX_TEST_IMPLEMENT(test_ucx_buffer_seektell) {
+UCX_TEST(test_ucx_buffer_seektell) {
     UcxBuffer *b = ucx_buffer_new(NULL, 32, UCX_BUFFER_DEFAULT);
     b->size = 16; // less than capacity
     int r;
@@ -67,7 +67,7 @@
     ucx_buffer_free(b);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_buffer_putc) {
+UCX_TEST(test_ucx_buffer_putc) {
     char *buffer = (char*) malloc(16);
     memset(buffer, 32, 16);
 
@@ -107,7 +107,7 @@
     free(buffer);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_buffer_putc_ax) {
+UCX_TEST(test_ucx_buffer_putc_ax) {
     UcxBuffer *b = ucx_buffer_new(NULL, 2, UCX_BUFFER_AUTOEXTEND);
     
     UCX_TEST_BEGIN
@@ -131,7 +131,7 @@
     
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_buffer_getc) {
+UCX_TEST(test_ucx_buffer_getc) {
     char *buffer = (char*) malloc(16);
     memset(buffer, 32, 8);
     for (int i = 8; i < 16 ; i++) {
@@ -161,7 +161,7 @@
     free(buffer);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_buffer_write) {
+UCX_TEST(test_ucx_buffer_write) {
     char *buffer = (char*) malloc(16);
     memset(buffer, 32, 8);
     for (int i = 8; i < 16 ; i++) {
@@ -203,7 +203,7 @@
     free(buffer);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_buffer_write_ax) {
+UCX_TEST(test_ucx_buffer_write_ax) {
     char *buffer = (char*) malloc(16);
 
     UcxBuffer *b = ucx_buffer_new(buffer, 16,
@@ -227,7 +227,7 @@
     ucx_buffer_free(b);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_buffer_read) {
+UCX_TEST(test_ucx_buffer_read) {
     UcxBuffer *b = ucx_buffer_new(NULL, 8, UCX_BUFFER_AUTOFREE);
     
     char buf[32];
@@ -264,7 +264,7 @@
     
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_buffer_extract) {
+UCX_TEST(test_ucx_buffer_extract) {
     char *buffer = (char*) malloc(16);
     strcpy(buffer, "this is a test!");
 
@@ -292,7 +292,7 @@
     ucx_buffer_free(src);
 }
 
-UCX_TEST_IMPLEMENT(test_ucx_buffer_generic_copy) {
+UCX_TEST(test_ucx_buffer_generic_copy) {
     UcxBuffer *b1 = ucx_buffer_new(NULL, 64, UCX_BUFFER_DEFAULT);
     UcxBuffer *b2 = ucx_buffer_new(NULL, 2, UCX_BUFFER_AUTOEXTEND);