diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index 5aaaa3227f10c0e19e815a863fcacb72995f8c08..64ac275402aec06e1ef5b80f9c3e1b93bac8e485 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -184,8 +184,7 @@ TEST_F(test_ccaosdb, test_entity) {
   return_code = caosdb_entity_entity_get_double_value(&entity, value);
   std::cout << *value << std::endl;
   EXPECT_EQ(return_code, 0);
-  // TODO(fspreck) Re-enable once role and datatype are set
-  // EXPECT_EQ(*value, 5.0);
+  EXPECT_EQ(*value, 5.0);
 
   return_code = caosdb_entity_delete_entity(&entity);
   EXPECT_EQ(return_code, 0);
@@ -242,16 +241,13 @@ TEST_F(test_ccaosdb, test_property) {
   caosdb_entity_property_get_unit(&property, &out);
   EXPECT_EQ(strcmp(out, "some_unit"), 0);
 
-  // TODO(fspreck)
-  // caosdb_entity_property_get_string_value(&property, out);
-  // EXPECT_EQ(strcmp(out, "some_value"), 0);
+  caosdb_entity_property_get_string_value(&property, &out);
+  EXPECT_EQ(strcmp(out, "some_value"), 0);
 
   return_code = caosdb_entity_delete_property(&property);
   EXPECT_EQ(return_code, 0);
 }
 
-// TODO(fspreck) Test a property with datatype LIST<Something> and a
-// list value.
 TEST_F(test_ccaosdb, test_list_property) {
 
   caosdb_entity_property property;