diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4074d6b0549e8ef54036c9a17f137bd042fb08d3..8183e24afdd89c68853404c7da3d2d0a0c911a97 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -82,7 +82,7 @@ if(LINTING)
             "--warnings-as-errors=*"
             "--fix")
         set(_CMAKE_CXX_CLANG_TIDY_CHECKS
-          "--checks=*,-fuchsia-*,-llvmlibc-*,-cert-err58-cpp,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-modernize-use-trailing-return-type,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-cppcoreguidelines-avoid-goto,-hicpp-avoid-goto,-readability-function-cognitive-complexity,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes")
+          "--checks=*,-fuchsia-*,-llvmlibc-*,-cert-err58-cpp,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-modernize-use-trailing-return-type,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-cppcoreguidelines-avoid-goto,-hicpp-avoid-goto,-readability-function-cognitive-complexity,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes")
     endif()
 else()
     message(STATUS "LINTING is OFF")
diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index 1bf33420edef2b62f4dbfa395ffd2b401b43ea68..dbd5c48b5962c8b8e0cfc1eedc84be84b03ac920 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -2,6 +2,7 @@
  * This file is a part of the CaosDB Project.
  *
  * Copyright (C) 2021 Timm Fitschen <t.fitschen@indiscale.com>
+ * Copyright (C) 2021 Florian Spreckelsen <f.spreckelsen@indiscale.com>
  * Copyright (C) 2021 IndiScale GmbH <info@indiscale.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,6 +18,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
+#include "caosdb/message_code.h"   // for MessageCode
+#include "caosdb/status_code.h"    // for StatusCode
 #include "ccaosdb.h"               // for caosdb_info_version_info, caosdb_...
 #include "gtest/gtest-message.h"   // for Message
 #include "gtest/gtest-test-part.h" // for TestPartResult
@@ -40,3 +43,176 @@ TEST(test_ccaosdb, connection_ssl_authentication_success) {
   EXPECT_EQ(minor, version_info.minor);
   EXPECT_STREQ(pre_release, version_info.pre_release);
 }
+
+TEST(test_ccaosdb, test_count_query) {
+
+  caosdb_connection_connection connection;
+  int return_code(
+    caosdb_connection_connection_manager_get_default_connection(&connection));
+  EXPECT_EQ(return_code, 0);
+
+  caosdb_transaction_transaction transaction;
+  return_code =
+    caosdb_connection_connection_create_transaction(&connection, &transaction);
+  EXPECT_EQ(return_code, 0);
+
+  // COUNT query with an empty result
+  return_code = caosdb_transaction_transaction_query(&transaction,
+                                                     "COUNT ENTITY WITH id=-1");
+  EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
+
+  return_code = caosdb_transaction_transaction_execute(&transaction);
+  EXPECT_EQ(return_code, 0);
+
+  long dummy(-1);       // NOLINT
+  long *count = &dummy; // NOLINT
+  return_code =
+    caosdb_transaction_transaction_get_count_result(&transaction, count);
+  EXPECT_EQ(return_code, 0);
+  EXPECT_EQ(*count, 0);
+
+  return_code = caosdb_transaction_delete_transaction(&transaction);
+  EXPECT_EQ(return_code, 0);
+}
+
+TEST(test_ccaosdb, test_query) {
+  caosdb_connection_connection connection;
+  int return_code(
+    caosdb_connection_connection_manager_get_default_connection(&connection));
+  EXPECT_EQ(return_code, 0);
+
+  caosdb_transaction_transaction transaction;
+  return_code =
+    caosdb_connection_connection_create_transaction(&connection, &transaction);
+  EXPECT_EQ(return_code, 0);
+
+  return_code = caosdb_transaction_transaction_query(&transaction,
+                                                     "FIND ENTITY WITH id=-1");
+  EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
+
+  return_code = caosdb_transaction_transaction_execute(&transaction);
+  EXPECT_EQ(return_code, 0);
+
+  caosdb_transaction_result_set result_set;
+  return_code =
+    caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+  EXPECT_EQ(return_code, 0);
+
+  int dummy(-1);
+  int *count = &dummy; // NOLINT
+  return_code = caosdb_transaction_result_set_size(&result_set, count);
+  EXPECT_EQ(return_code, 0);
+  EXPECT_EQ(*count, 0);
+
+  return_code = caosdb_transaction_delete_transaction(&transaction);
+  EXPECT_EQ(return_code, 0);
+}
+
+TEST(test_ccaosdb, test_single_id_retrieve) {
+  caosdb_connection_connection connection;
+  int return_code(
+    caosdb_connection_connection_manager_get_default_connection(&connection));
+  EXPECT_EQ(return_code, 0);
+
+  caosdb_transaction_transaction transaction;
+  return_code =
+    caosdb_connection_connection_create_transaction(&connection, &transaction);
+  EXPECT_EQ(return_code, 0);
+
+  return_code =
+    caosdb_transaction_transaction_retrieve_by_id(&transaction, "21");
+  EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
+
+  return_code = caosdb_transaction_transaction_execute(&transaction);
+  EXPECT_EQ(return_code, 0);
+
+  caosdb_transaction_result_set result_set;
+  return_code =
+    caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+  EXPECT_EQ(return_code, 0);
+
+  int dummy(-1);
+  int *count = &dummy; // NOLINT
+  return_code = caosdb_transaction_result_set_size(&result_set, count);
+  EXPECT_EQ(return_code, 0);
+  EXPECT_EQ(*count, 1);
+
+  caosdb_entity_entity entity;
+  return_code = caosdb_transaction_result_set_at(&result_set, &entity, 0);
+  EXPECT_EQ(return_code, 0);
+
+  return_code = caosdb_entity_entity_get_errors_size(&entity, count);
+  EXPECT_EQ(return_code, 0);
+  EXPECT_EQ(*count, 0);
+
+  char out[255] = {"255"}; // NOLINT
+  return_code = caosdb_entity_entity_get_name(&entity, out);
+  EXPECT_EQ(return_code, 0);
+  EXPECT_STREQ(out, "unit");
+
+  return_code = caosdb_transaction_delete_transaction(&transaction);
+  EXPECT_EQ(return_code, 0);
+}
+
+TEST(test_ccaosdb, test_multi_id_retrieve) {
+  caosdb_connection_connection connection;
+  int return_code(
+    caosdb_connection_connection_manager_get_default_connection(&connection));
+  EXPECT_EQ(return_code, 0);
+
+  caosdb_transaction_transaction transaction;
+  return_code =
+    caosdb_connection_connection_create_transaction(&connection, &transaction);
+  EXPECT_EQ(return_code, 0);
+
+  const char *ids[] = {"20", "21", "22"}; // NOLINT
+  return_code =
+    caosdb_transaction_transaction_retrieve_by_ids(&transaction, ids, 3);
+  EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
+
+  return_code = caosdb_transaction_transaction_execute(&transaction);
+  // Should have an error since entity 22 doesn't exist
+  EXPECT_TRUE((return_code > 0));
+
+  caosdb_transaction_result_set result_set;
+  return_code =
+    caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+  EXPECT_EQ(return_code, 0);
+
+  int dummy(-1);
+  int *count = &dummy; // NOLINT
+  return_code = caosdb_transaction_result_set_size(&result_set, count);
+  EXPECT_EQ(return_code, 0);
+  EXPECT_EQ(*count, 3);
+
+  caosdb_entity_entity entity;
+  return_code = caosdb_transaction_result_set_at(&result_set, &entity, 1);
+  EXPECT_EQ(return_code, 0);
+
+  return_code = caosdb_entity_entity_get_errors_size(&entity, count);
+  EXPECT_EQ(return_code, 0);
+  EXPECT_EQ(*count, 0);
+
+  char out[255] = {"255"}; // NOLINT
+  return_code = caosdb_entity_entity_get_name(&entity, out);
+  EXPECT_EQ(return_code, 0);
+  EXPECT_STREQ(out, "unit");
+
+  caosdb_entity_entity other_entity;
+  return_code = caosdb_transaction_result_set_at(&result_set, &other_entity, 2);
+  EXPECT_EQ(return_code, 0);
+  return_code = caosdb_entity_entity_get_errors_size(&other_entity, count);
+  EXPECT_EQ(return_code, 0);
+  EXPECT_EQ(*count, 1);
+
+  caosdb_entity_message err_msg;
+  return_code = caosdb_entity_entity_get_error(&other_entity, &err_msg, 0);
+  EXPECT_EQ(return_code, 0);
+
+  return_code = caosdb_entity_message_get_code(&err_msg, count);
+  EXPECT_EQ(return_code, 0);
+  EXPECT_EQ(*count, caosdb::entity::MessageCode::ENTITY_DOES_NOT_EXIST);
+
+  return_code = caosdb_transaction_delete_transaction(&transaction);
+  EXPECT_EQ(return_code, 0);
+}
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 88904518ec5d9b8208d59f6993557c7a098be579..e8eaf55f1f994b623c755942c2efcb97a289c6a0 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -32,6 +32,7 @@
 #include <gtest/gtest-message.h>            // for Message
 #include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver
 #include <gtest/gtest_pred_impl.h> // for Test, EXPECT_EQ, AssertionResult
+#include <iostream>
 #include <memory>                  // for unique_ptr, allocator, __shar...
 #include <string>                  // for string
 #include <vector>                  // for vector
@@ -81,6 +82,32 @@ protected:
   }
 };
 
+TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) {
+  const auto &connection =
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
+
+  const auto *id = "107";
+  const auto *role = "RecordType";
+  const auto *name = "Manufacturer";
+  const auto *description = "A generic manufacturer of all kinds of products";
+  const auto *version = "0bea8f7b17f0130fa5701a6c3849b9f8bfa0651b";
+
+  auto transaction(connection->CreateTransaction());
+  transaction->RetrieveById(id);
+  transaction->Execute();
+
+  const auto &result_set =
+    dynamic_cast<const MultiResultSet &>(transaction->GetResultSet());
+
+  const auto &entity = result_set.at(0);
+  EXPECT_EQ(id, entity.GetId());
+  EXPECT_EQ(name, entity.GetName());
+  EXPECT_EQ(role, entity.GetRole());
+  EXPECT_EQ(description, entity.GetDescription());
+  EXPECT_EQ(version, entity.GetVersionId());
+}
+
+>>>>>>> origin/f-extended-c
 TEST_F(test_transaction, retrieve_non_existing) {
   const auto &connection =
     caosdb::connection::ConnectionManager::GetDefaultConnection();
@@ -296,6 +323,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
   Entity rt;
   rt.SetRole(Role::RECORD_TYPE);
   rt.SetName("TestRT");
+  rt.SetDescription("Some description");
   rt.AppendProperty(prop_rt);
 
   auto rt_insertion(connection->CreateTransaction());
@@ -385,6 +413,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
   const auto &retrieved_parent_rec = retrieved_rec.GetParents().at(0);
   EXPECT_EQ(retrieved_parent_rec.GetName(), rt.GetName());
   EXPECT_EQ(retrieved_parent_rec.GetId(), inserted_rt.GetId());
+  EXPECT_EQ(retrieved_parent_rec.GetDescription(), rt.GetDescription());
 
   const auto &retrieved_prop_rec = retrieved_rec.GetProperties().at(0);
   EXPECT_EQ(retrieved_prop_rec.GetName(), prop_ent.GetName());
@@ -406,6 +435,7 @@ TEST_F(test_transaction, test_multi_retrieve) {
   auto status = transaction->WaitForIt();
 
   ASSERT_TRUE(status.IsTerminated());
+  // Should have an error since entity 22 doesn't exist
   ASSERT_TRUE(status.IsError());
 
   const auto &result_set = transaction->GetResultSet();
@@ -413,6 +443,7 @@ TEST_F(test_transaction, test_multi_retrieve) {
   EXPECT_EQ(result_set.size(), 3);
   EXPECT_EQ(result_set.at(1).GetId(), "21");
   EXPECT_EQ(result_set.at(1).GetName(), "unit");
+  // Exists so should be fine ...
   EXPECT_FALSE(result_set.at(1).HasErrors());
 
   EXPECT_EQ(result_set.at(2).GetId(), "22");
@@ -519,10 +550,14 @@ TEST_F(test_transaction, test_query) {
   EXPECT_TRUE((query_transaction->GetCountResult() < 0));
 
   auto count_query_trans(connection->CreateTransaction());
+  std::cout << "Creating count query ..." << std::endl;
   count_query_trans->Query("COUNT ENTITY WITH id = " + new_entity.GetId());
+  std::cout << "Executing count query ..." << std::endl;
   count_query_trans->Execute();
   // No result set in a count query
+  std::cout << "Checking count query result set..." << std::endl;
   EXPECT_EQ(count_query_trans->GetResultSet().size(), 0);
+  std::cout << "Checking count query result ..." << std::endl;
   EXPECT_EQ(count_query_trans->GetCountResult(), 1);
 }