diff -r ff3dd1ee7dee -r 02f38adea013 test/map_tests.c
--- a/test/map_tests.c	Thu Oct 04 16:03:18 2012 +0200
+++ b/test/map_tests.c	Thu Oct 04 18:23:32 2012 +0200
@@ -150,9 +150,9 @@
     FILE *f = fopen("test_ucx_map_store", "w");
     int r;
 
-    fwrite(" # comment test", 1, 15, f);
+    fwrite(" # comment test\n", 1, 16, f);
     r = ucx_map_store(map, f);
-    fwrite("#discard this", 1, 13, f);
+    fwrite("!discard this", 1, 13, f);
 
     fclose(f);
     ucx_map_free(map);
@@ -165,20 +165,26 @@
     UCX_TEST_ASSERT(r == 0, "IO errors, test cannot be performed");
 
     value = ucx_map_cstr_get(map, "test");
+    UCX_TEST_ASSERT(value != NULL, "value not found for key: test");
     UCX_TEST_ASSERT(strcmp(value, "test") == 0, "value error for key: test");
 
     value = ucx_map_cstr_get(map, "key");
+    UCX_TEST_ASSERT(value != NULL, "value not found for key: key");
     UCX_TEST_ASSERT(strcmp(value, "value") == 0, "value error for key: key");
 
     value = ucx_map_cstr_get(map, "other.very.long.key");
+    UCX_TEST_ASSERT(value != NULL,
+            "value not found for key: other.very.long.key");
     UCX_TEST_ASSERT(strcmp(value, "value") == 0,
             "value error for key: other.very.long.key");
 
     value = ucx_map_cstr_get(map, "testkey");
+    UCX_TEST_ASSERT(value != NULL, "value not found for key: testkey");
     UCX_TEST_ASSERT(strcmp(value, "testvalue") == 0,
             "value error for key: testkey");
 
     value = ucx_map_cstr_get(map, "simple");
+    UCX_TEST_ASSERT(value != NULL, "value not found for key: simple");
     UCX_TEST_ASSERT(strcmp(value, "not a key but an extremely long value "
             "to test if the buffer extension works as designed") == 0,
             "value error for key: simple");