diff -r 380bd45bc94a -r 2dd841e364af tests/test_map.cpp
--- a/tests/test_map.cpp	Mon Apr 17 21:47:34 2023 +0200
+++ b/tests/test_map.cpp	Tue Apr 18 18:01:41 2023 +0200
@@ -124,12 +124,16 @@
     EXPECT_EQ(map->item_size, 1);
     EXPECT_EQ(map->size, 0);
     EXPECT_EQ(map->allocator, &allocator);
-    EXPECT_FALSE(map->store_pointers);
+    EXPECT_FALSE(map->store_pointer);
+    EXPECT_EQ(map->cmpfunc, nullptr);
+    EXPECT_EQ(map->simple_destructor, nullptr);
+    EXPECT_EQ(map->advanced_destructor, nullptr);
+    EXPECT_EQ(map->destructor_data, nullptr);
     cxMapStorePointers(map);
-    EXPECT_TRUE(map->store_pointers);
+    EXPECT_TRUE(map->store_pointer);
     EXPECT_EQ(map->item_size, sizeof(void *));
     cxMapStoreObjects(map);
-    EXPECT_FALSE(map->store_pointers);
+    EXPECT_FALSE(map->store_pointer);
 
     cxMapDestroy(map);
     EXPECT_TRUE(allocator.verify());
@@ -145,7 +149,7 @@
     }
     EXPECT_EQ(map->size, 0);
     EXPECT_EQ(map->allocator, &allocator);
-    EXPECT_TRUE(map->store_pointers);
+    EXPECT_TRUE(map->store_pointer);
     EXPECT_EQ(map->item_size, sizeof(void *));
 
     cxMapDestroy(map);
@@ -302,11 +306,11 @@
     auto map = cxHashMapCreate(&allocator, sizeof(cxstring), 8);
 
     // define some strings
-    cxstring s1 = CX_STR("this");
-    cxstring s2 = CX_STR("is");
-    cxstring s3 = CX_STR("a");
-    cxstring s4 = CX_STR("test");
-    cxstring s5 = CX_STR("setup");
+    auto s1 = CX_STR("this");
+    auto s2 = CX_STR("is");
+    auto s3 = CX_STR("a");
+    auto s4 = CX_STR("test");
+    auto s5 = CX_STR("setup");
 
     // put them into the map
     cxMapPut(map, cx_hash_key_str("s1"), &s1);
@@ -339,3 +343,4 @@
     cxMapDestroy(map);
     EXPECT_TRUE(allocator.verify());
 }
+