diff -r 1666cbeb1db8 -r bce0d7f2912b test/main.c
--- a/test/main.c	Mon Feb 20 15:30:45 2012 +0100
+++ b/test/main.c	Tue Feb 21 01:13:17 2012 +0100
@@ -106,10 +106,11 @@
         ucx_test_register(suite, test_ucx_mempool_reg_destr);
         ucx_test_register(suite, test_ucx_mempool_realloc);
 
-        printf("\nUcxMap Tests\n");
-        if(map_tests()) {
-            fprintf(stderr, "map_tests failed\n");
-        }
+        /* UcxMap Tests */
+        ucx_test_register(suite, test_ucx_map_new);
+        ucx_test_register(suite, test_ucx_key);
+        ucx_test_register(suite, test_ucx_map_put);
+        ucx_test_register(suite, test_ucx_map_get);
         
         ucx_test_run(suite, stdout);
         ucx_test_suite_free(suite);