diff -r 5ec9a2ca6328 -r 1fa3f13f774c test/main.c
--- a/test/main.c	Thu Apr 17 14:33:06 2014 +0200
+++ b/test/main.c	Mon May 05 13:53:27 2014 +0200
@@ -33,6 +33,7 @@
 
 #include "main.h"
 
+#include "allocator_tests.h"
 #include "logging_tests.h"
 #include "list_tests.h"
 #include "string_tests.h"
@@ -112,6 +113,9 @@
 
         printf("\nLibrary function tests\n");
         suite = ucx_test_suite_new();
+        /* UcxAllocator Tests */
+        ucx_test_register(suite, test_ucx_default_allocator);
+        
         /* sstring Tests */
         ucx_test_register(suite, test_sstr);
         ucx_test_register(suite, test_sstr_len_cat);
@@ -173,9 +177,18 @@
         ucx_test_register(suite, test_ucx_properties_store);
         
         /* UcxBuffer Tests */
-        ucx_test_register(suite, test_ucx_buffer_seek);
+        ucx_test_register(suite, test_ucx_buffer_eof);
+        ucx_test_register(suite, test_ucx_buffer_seek_set);
+        ucx_test_register(suite, test_ucx_buffer_seek_cur);
+        ucx_test_register(suite, test_ucx_buffer_seek_end);
+        ucx_test_register(suite, test_ucx_buffer_seek_oob);
+        ucx_test_register(suite, test_ucx_buffer_seek_invalid);
+        ucx_test_register(suite, test_ucx_buffer_seek_overflow);
         ucx_test_register(suite, test_ucx_buffer_putc);
-        ucx_test_register(suite, test_ucx_buffer_putc_ax);
+        ucx_test_register(suite, test_ucx_buffer_putc_ae);
+        ucx_test_register(suite, test_ucx_buffer_putc_oob);
+        ucx_test_register(suite, test_ucx_buffer_putc_oobae);
+        ucx_test_register(suite, test_ucx_buffer_putc_size);
         ucx_test_register(suite, test_ucx_buffer_getc);
         ucx_test_register(suite, test_ucx_buffer_write);
         ucx_test_register(suite, test_ucx_buffer_write_ax);