diff --git a/test/test_list_properties.cpp b/test/test_list_properties.cpp
index 32f02e2fad8f46199d4240e86e9e1d31c86e936d..e4ce774ccbe529d5abe3a9da5d539ff7166ac1e8 100644
--- a/test/test_list_properties.cpp
+++ b/test/test_list_properties.cpp
@@ -105,13 +105,13 @@ TEST_F(test_list_properties, insert_list_of_text) {
   const auto &value = same_entity.GetProperties().at(0).GetValue();
 
   EXPECT_TRUE(data_type.IsList());
-  EXPECT_TRUE(data_type.AsList().IsListOfAtomic());
-  EXPECT_EQ(data_type.AsList().GetAtomicDataType(), AtomicDataType::TEXT);
+  EXPECT_TRUE(data_type.GetAsList().IsListOfAtomic());
+  EXPECT_EQ(data_type.GetAsList().GetAtomicDataType(), AtomicDataType::TEXT);
 
-  EXPECT_TRUE(value.IsList());
-  EXPECT_EQ(value.AsList().size(), 3);
-  EXPECT_TRUE(value.AsList().at(1).IsString());
-  EXPECT_EQ(value.AsList().at(1).AsString(), "item5");
+  EXPECT_TRUE(value.IsVector());
+  EXPECT_EQ(value.GetAsVector().size(), 3);
+  EXPECT_TRUE(value.GetAsVector().at(1).IsString());
+  EXPECT_EQ(value.GetAsVector().at(1).GetAsString(), "item5");
 }
 
 TEST_F(test_list_properties, insert_list_of_int) {
@@ -161,13 +161,13 @@ TEST_F(test_list_properties, insert_list_of_int) {
   const auto &value = same_entity.GetProperties().at(0).GetValue();
 
   EXPECT_TRUE(data_type.IsList());
-  EXPECT_TRUE(data_type.AsList().IsListOfAtomic());
-  EXPECT_EQ(data_type.AsList().GetAtomicDataType(), AtomicDataType::INTEGER);
+  EXPECT_TRUE(data_type.GetAsList().IsListOfAtomic());
+  EXPECT_EQ(data_type.GetAsList().GetAtomicDataType(), AtomicDataType::INTEGER);
 
-  EXPECT_TRUE(value.IsList());
-  EXPECT_EQ(value.AsList().size(), 3);
-  EXPECT_TRUE(value.AsList().at(1).IsInteger());
-  EXPECT_EQ(value.AsList().at(1).AsInteger(), 5);
+  EXPECT_TRUE(value.IsVector());
+  EXPECT_EQ(value.GetAsVector().size(), 3);
+  EXPECT_TRUE(value.GetAsVector().at(1).IsInt64());
+  EXPECT_EQ(value.GetAsVector().at(1).GetAsInt64(), 5);
 }
 
 TEST_F(test_list_properties, insert_list_of_bool) {
@@ -217,13 +217,13 @@ TEST_F(test_list_properties, insert_list_of_bool) {
   const auto &value = same_entity.GetProperties().at(0).GetValue();
 
   EXPECT_TRUE(data_type.IsList());
-  EXPECT_TRUE(data_type.AsList().IsListOfAtomic());
-  EXPECT_EQ(data_type.AsList().GetAtomicDataType(), AtomicDataType::BOOLEAN);
+  EXPECT_TRUE(data_type.GetAsList().IsListOfAtomic());
+  EXPECT_EQ(data_type.GetAsList().GetAtomicDataType(), AtomicDataType::BOOLEAN);
 
-  EXPECT_TRUE(value.IsList());
-  EXPECT_EQ(value.AsList().size(), 3);
-  EXPECT_TRUE(value.AsList().at(1).IsBool());
-  EXPECT_FALSE(value.AsList().at(1).AsBool());
+  EXPECT_TRUE(value.IsVector());
+  EXPECT_EQ(value.GetAsVector().size(), 3);
+  EXPECT_TRUE(value.GetAsVector().at(1).IsBool());
+  EXPECT_FALSE(value.GetAsVector().at(1).GetAsBool());
 }
 
 } // namespace caosdb::entity
diff --git a/test/test_properties.cpp b/test/test_properties.cpp
index 6137494905b5fe0e5c04aa256a45648f355a8b91..f810949f62cbe0d1b5644b5cbb12ee5b67241945 100644
--- a/test/test_properties.cpp
+++ b/test/test_properties.cpp
@@ -94,11 +94,11 @@ TEST_F(test_properties, retrieve_unit) {
   EXPECT_FALSE(retrieval->GetStatus().IsError());
 
   const auto &same_property = retrieval->GetResultSet().at(0);
-  EXPECT_EQ(same_property.GetDataType().AsAtomic(), AtomicDataType::DOUBLE);
+  EXPECT_EQ(same_property.GetDataType().GetAsAtomic(), AtomicDataType::DOUBLE);
   EXPECT_EQ(same_property.GetUnit(), "V");
 
   const auto &same_record_type = retrieval->GetResultSet().at(1);
-  EXPECT_EQ(same_record_type.GetProperties().at(0).GetDataType().AsAtomic(),
+  EXPECT_EQ(same_record_type.GetProperties().at(0).GetDataType().GetAsAtomic(),
             AtomicDataType::DOUBLE);
   EXPECT_EQ(same_record_type.GetProperties().at(0).GetUnit(), "V");
 }
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 13ffb647dbbc8eb152b1683309032459611927cb..70624decb063804732a1709476d9bdbae2390c8b 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -132,22 +132,22 @@ protected:
 
 template <>
 auto test_transaction::getValueAs<double>(const Value &value) -> double {
-  return value.AsDouble();
+  return value.GetAsDouble();
 }
 
 template <>
 auto test_transaction::getValueAs<int64_t>(const Value &value) -> int64_t {
-  return value.AsInteger();
+  return value.GetAsInt64();
 }
 
 template <>
 auto test_transaction::getValueAs<int32_t>(const Value &value) -> int32_t {
-  return static_cast<int32_t>(value.AsInteger());
+  return static_cast<int32_t>(value.GetAsInt64());
 }
 
 template <>
 auto test_transaction::getValueAs<bool>(const Value &value) -> bool {
-  return value.AsBool();
+  return value.GetAsBool();
 }
 
 /*