diff -r 22644e2572bc -r 1666cbeb1db8 test/main.c
--- a/test/main.c	Sat Feb 18 18:36:30 2012 +0100
+++ b/test/main.c	Mon Feb 20 15:30:45 2012 +0100
@@ -64,7 +64,7 @@
 int main(int argc, char **argv) {
     printf("UCX Tests\n---------\n");
 
-    printf("\nUcxTestSuite Tests (1 failure is intended!)\n");
+    printf("\nUcxTestSuite tests (1 failure is intended!)\n");
     UcxTestSuite* suite = ucx_test_suite_new();
     ucx_test_register(suite, testTestSuitePositive);
     ucx_test_register(suite, testTestSuiteNegative);
@@ -72,6 +72,7 @@
     if (suite->failure == 1 && suite->success == 1) {
         ucx_test_suite_free(suite);
 
+        printf("\nLibrary function tests\n");
         suite = ucx_test_suite_new();
         /* UcxList Tests */
         ucx_test_register(suite, test_ucx_list_append);
@@ -96,11 +97,14 @@
         ucx_test_register(suite, test_ucx_dlist_remove);
         ucx_test_register(suite, test_ucx_dlist_clone);
 
-        /* TODO: replace these tests with "real" tests */
-        printf("\nUcxMemPool Tests\n");
-        if(mpool_tests()) {
-            fprintf(stderr, "mpool_tests failed\n");
-        }
+        /* UcxMemPool Tests */
+        ucx_test_register(suite, test_ucx_mempool_new);
+        ucx_test_register(suite, test_ucx_mempool_malloc);
+        ucx_test_register(suite, test_ucx_mempool_malloc_with_chcap);
+        ucx_test_register(suite, test_ucx_mempool_calloc);
+        ucx_test_register(suite, test_ucx_mempool_set_destr);
+        ucx_test_register(suite, test_ucx_mempool_reg_destr);
+        ucx_test_register(suite, test_ucx_mempool_realloc);
 
         printf("\nUcxMap Tests\n");
         if(map_tests()) {