diff -r 1cf71e56f01e -r c8c59d7f4536 test/map_tests.c
--- a/test/map_tests.c	Mon Jul 15 13:53:51 2013 +0200
+++ b/test/map_tests.c	Mon Jul 15 14:25:50 2013 +0200
@@ -179,7 +179,7 @@
     int hit = 0;
 
     int* v;
-    UCX_MAP_FOREACH(v, i) {
+    UCX_MAP_FOREACH(key, v, i) {
         check += *v;
         hit++;
     }
@@ -274,7 +274,7 @@
 
     void *d;
     UcxMapIterator iter = ucx_map_iterator(map);
-    UCX_MAP_FOREACH(d, iter) {
+    UCX_MAP_FOREACH(key, d, iter) {
         free(d);
     }
     ucx_map_free(map);
@@ -308,7 +308,7 @@
     UCX_TEST_ASSERT(r == 0, "IO errors, test cannot be performed");
     UcxMapIterator iter = ucx_map_iterator(map);
     const char *value; size_t n;
-    UCX_MAP_FOREACH(value, iter) {
+    UCX_MAP_FOREACH(key, value, iter) {
         n = strlen(value);
         UCX_TEST_ASSERT(strncmp((const char*) pool->data[iter.index], value, n),
                 "values of map does not match pooled values");