diff --git a/test/runtests.jl b/test/runtests.jl
index 33786c1ee848941477ed648c5d1a386004b1fb6b..d6c998d19dafcb620178c7cb60eec5634bff34dc 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -141,10 +141,10 @@ end
     @testset "Test entity insertion, update and deletion" begin
         # 1. Insert
         ent_with_name = CaosDB.Entity.create_recordtype("TestEnt")
-        single_insert_transaction = create_transaction()
-        add_insert_entity(single_insert_transaction, ent_with_name)
-        execute(single_insert_transaction)
-        results = get_results(single_insert_transaction)
+        insert_rt_transaction = create_transaction()
+        add_insert_entity(insert_rt_transaction, ent_with_name)
+        execute(insert_rt_transaction)
+        results = get_results(insert_rt_transaction)
 
         @test length(results) == 1
         @test has_errors(results[1]) == false
@@ -160,30 +160,39 @@ end
             is_list = false,
         )
 
-        single_insert_transaction1 = create_transaction()
-        add_insert_entity(single_insert_transaction1, prop)
-        execute(single_insert_transaction1)
-        results = get_results(single_insert_transaction1)
+        insert_prop_transaction = create_transaction()
+        add_insert_entity(insert_prop_transaction, prop)
+        execute(insert_prop_transaction)
+        results = get_results(insert_prop_transaction)
 
         prop2 = CaosDB.Entity.create_property(id = get_id(results[1]))
         CaosDB.Entity.append_property(ent_with_name[1], prop2)
 
-        single_insert_transaction = create_transaction()
+        update_transaction = create_transaction()
+        add_update_entity(update_transaction, ent_with_name[1])
+        execute(update_transaction)
+        results = get_results(update_transaction)
+        @test length(results) == 1
 
-        add_update_entity(single_insert_transaction, ent_with_name[1])
-        execute(single_insert_transaction)
-        results = get_results(single_insert_transaction)
+
+        retrieve_transaction = create_transaction()
+        add_update_entity(retrieve_transaction, get_id(results[1]))
+        execute(retrieve_transaction)
+        results = get_results(retrieve_transaction)
 
         @test length(results) == 1
         @test has_errors(results[1]) == false
-        @test get_id(results[1]) != ""
+        @test length(CaosDB.Entity.get_properties(results[1])) == 1
+        prop = CaosDB.Entity.get_property(results[1], 1)
+        @test get_name(prop) == "TestProperty"
+        @test get_unit(prop) == "cm"
 
         # 3. delete
         ent_with_name = execute_query("FIND TestEnt")
-        single_insert_transaction = create_transaction()
-        add_delete_by_id(single_insert_transaction, get_id(ent_with_name[1]))
-        execute(single_insert_transaction)
-        results = get_results(single_insert_transaction)
+        delete_transaction = create_transaction()
+        add_delete_by_id(delete_transaction, get_id(ent_with_name[1]))
+        execute(delete_transaction)
+        results = get_results(delete_transaction)
 
         @test length(results) == 1
         @test has_errors(results[1]) == false
@@ -191,9 +200,9 @@ end
 
         # 4. Cleanup
         ent_with_name = execute_query("FIND TestProperty")
-        single_insert_transaction = create_transaction()
-        add_delete_by_id(single_insert_transaction, get_id(ent_with_name[1]))
-        execute(single_insert_transaction)
+        cleanup_transaction = create_transaction()
+        add_delete_by_id(cleanup_transaction, get_id(ent_with_name[1]))
+        execute(cleanup_transaction)
 
     end