diff --git a/test/caosdb_test_utility.h b/test/caosdb_test_utility.h
index 4c97c203a8ab55c9d239d824cd274fe3b99aa60b..4cde3dc5059acf60a04b071154b44a59b67e9833 100644
--- a/test/caosdb_test_utility.h
+++ b/test/caosdb_test_utility.h
@@ -33,16 +33,16 @@
  */
 #define EXPECT_THROW_MESSAGE(statement, exeption_type, message)                \
   EXPECT_THROW(                                                                \
-    try { statement; } catch (const exeption_type &e) {                        \
-      EXPECT_EQ(std::string(e.what()), message);                               \
-      throw;                                                                   \
-    },                                                                         \
-    exeption_type)
+      try { statement; } catch (const exeption_type &e) {                      \
+        EXPECT_EQ(std::string(e.what()), message);                             \
+        throw;                                                                 \
+      },                                                                       \
+      exeption_type)
 #define ASSERT_THROW_MESSAGE(statement, exeption_type, message)                \
   ASSERT_THROW(                                                                \
-    try { statement; } catch (const exeption_type &e) {                        \
-      ASSERT_EQ(std::string(e.what()), message);                               \
-      throw;                                                                   \
-    },                                                                         \
-    exeption_type)
+      try { statement; } catch (const exeption_type &e) {                      \
+        ASSERT_EQ(std::string(e.what()), message);                             \
+        throw;                                                                 \
+      },                                                                       \
+      exeption_type)
 #endif
diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index dbd5c48b5962c8b8e0cfc1eedc84be84b03ac920..6f8eb10d78561f0eb493ff01f592f6a1fcfed3c6 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -37,7 +37,7 @@ TEST(test_ccaosdb, connection_ssl_authentication_success) {
   auto major = caosdb_constants_COMPATIBLE_SERVER_VERSION_MAJOR();
   auto minor = caosdb_constants_COMPATIBLE_SERVER_VERSION_MINOR();
   const auto *const pre_release =
-    caosdb_constants_COMPATIBLE_SERVER_VERSION_PRE_RELEASE();
+      caosdb_constants_COMPATIBLE_SERVER_VERSION_PRE_RELEASE();
 
   EXPECT_EQ(major, version_info.major);
   EXPECT_EQ(minor, version_info.minor);
@@ -48,12 +48,12 @@ TEST(test_ccaosdb, test_count_query) {
 
   caosdb_connection_connection connection;
   int return_code(
-    caosdb_connection_connection_manager_get_default_connection(&connection));
+      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);
+  return_code = caosdb_connection_connection_create_transaction(&connection,
+                                                                &transaction);
   EXPECT_EQ(return_code, 0);
 
   // COUNT query with an empty result
@@ -67,7 +67,7 @@ TEST(test_ccaosdb, test_count_query) {
   long dummy(-1);       // NOLINT
   long *count = &dummy; // NOLINT
   return_code =
-    caosdb_transaction_transaction_get_count_result(&transaction, count);
+      caosdb_transaction_transaction_get_count_result(&transaction, count);
   EXPECT_EQ(return_code, 0);
   EXPECT_EQ(*count, 0);
 
@@ -78,12 +78,12 @@ TEST(test_ccaosdb, test_count_query) {
 TEST(test_ccaosdb, test_query) {
   caosdb_connection_connection connection;
   int return_code(
-    caosdb_connection_connection_manager_get_default_connection(&connection));
+      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);
+  return_code = caosdb_connection_connection_create_transaction(&connection,
+                                                                &transaction);
   EXPECT_EQ(return_code, 0);
 
   return_code = caosdb_transaction_transaction_query(&transaction,
@@ -95,7 +95,7 @@ TEST(test_ccaosdb, test_query) {
 
   caosdb_transaction_result_set result_set;
   return_code =
-    caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+      caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
   EXPECT_EQ(return_code, 0);
 
   int dummy(-1);
@@ -111,16 +111,16 @@ TEST(test_ccaosdb, test_query) {
 TEST(test_ccaosdb, test_single_id_retrieve) {
   caosdb_connection_connection connection;
   int return_code(
-    caosdb_connection_connection_manager_get_default_connection(&connection));
+      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);
+  return_code = caosdb_connection_connection_create_transaction(&connection,
+                                                                &transaction);
   EXPECT_EQ(return_code, 0);
 
   return_code =
-    caosdb_transaction_transaction_retrieve_by_id(&transaction, "21");
+      caosdb_transaction_transaction_retrieve_by_id(&transaction, "21");
   EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
 
   return_code = caosdb_transaction_transaction_execute(&transaction);
@@ -128,7 +128,7 @@ TEST(test_ccaosdb, test_single_id_retrieve) {
 
   caosdb_transaction_result_set result_set;
   return_code =
-    caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+      caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
   EXPECT_EQ(return_code, 0);
 
   int dummy(-1);
@@ -157,17 +157,17 @@ TEST(test_ccaosdb, test_single_id_retrieve) {
 TEST(test_ccaosdb, test_multi_id_retrieve) {
   caosdb_connection_connection connection;
   int return_code(
-    caosdb_connection_connection_manager_get_default_connection(&connection));
+      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);
+  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);
+      caosdb_transaction_transaction_retrieve_by_ids(&transaction, ids, 3);
   EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
 
   return_code = caosdb_transaction_transaction_execute(&transaction);
@@ -176,7 +176,7 @@ TEST(test_ccaosdb, test_multi_id_retrieve) {
 
   caosdb_transaction_result_set result_set;
   return_code =
-    caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+      caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
   EXPECT_EQ(return_code, 0);
 
   int dummy(-1);
diff --git a/test/test_connection.cpp b/test/test_connection.cpp
index ed1ca1faa5186105c87edb5068916f76ab850882..6f27f23f40da242a47ac4b818783ad04aeaf72bf 100644
--- a/test/test_connection.cpp
+++ b/test/test_connection.cpp
@@ -28,11 +28,11 @@
 #include "caosdb/info.h"                 // for VersionInfo
 #include "caosdb/utility.h"              // for get_env_var
 #include "caosdb_test_utility.h"         // for EXPECT_THROW_MESSAGE
-#include <gtest/gtest-message.h>         // for Message
-#include <gtest/gtest-test-part.h>       // for SuiteApiResolver, TestPartR...
-#include "gtest/gtest_pred_impl.h"       // for Test, TestInfo, TEST, EXPEC...
-#include <memory>                        // for allocator, unique_ptr, __sh...
-#include <string>                        // for stoi, string
+#include "gtest/gtest_pred_impl.h" // NOLINT TODO how to fix this? for Test, TestInfo, TEST, EXPEC...
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestPartR...
+#include <memory>                  // for allocator, unique_ptr, __sh...
+#include <string>                  // for stoi, string
 
 namespace caosdb::connection {
 using caosdb::authentication::PlainPasswordAuthenticator;
@@ -62,10 +62,10 @@ TEST(test_connection, connect_somehost_42347_fails) {
 
 TEST(test_connection, connection_insecure_authentication_error_anonymous) {
   const auto *port_str =
-    caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTP", "8080");
+      caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTP", "8080");
   auto port = std::stoi(port_str);
   const auto *const host =
-    caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost");
+      caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost");
 
   auto config = InsecureConnectionConfiguration(host, port);
   auto connection = Connection(config);
@@ -75,12 +75,12 @@ TEST(test_connection, connection_insecure_authentication_error_anonymous) {
 
 TEST(test_connection, connection_ssl_authentication_error_anonymous) {
   const auto *port_str =
-    caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
+      caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
   auto port = std::stoi(port_str);
   const auto *const host =
-    caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost");
+      caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost");
   const auto path =
-    caosdb::utility::get_env_var("CAOSDB_SERVER_CERT", std::string());
+      caosdb::utility::get_env_var("CAOSDB_SERVER_CERT", std::string());
 
   auto cert = PemFileCertificateProvider(path);
   auto config = TlsConnectionConfiguration(host, port, cert);
@@ -94,12 +94,12 @@ TEST(test_connection, connection_ssl_authentication_error_anonymous) {
 
 TEST(test_connection, connection_ssl_authentication_error_wrong_credentials) {
   const auto *port_str =
-    caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
+      caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
   auto port = std::stoi(port_str);
   const auto *const host =
-    caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost");
+      caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost");
   const auto path =
-    caosdb::utility::get_env_var("CAOSDB_SERVER_CERT", std::string());
+      caosdb::utility::get_env_var("CAOSDB_SERVER_CERT", std::string());
   const auto *const user = "not-a-user-23461237";
   const auto *const password = "very-c-cred";
 
@@ -109,10 +109,10 @@ TEST(test_connection, connection_ssl_authentication_error_wrong_credentials) {
   auto connection = Connection(config);
 
   EXPECT_THROW_MESSAGE(
-    connection.RetrieveVersionInfo(), AuthenticationError,
-    "The attempt to execute this transaction has not been executed at all "
-    "because the authentication did not succeed. Original error: "
-    "Authentication failed. Username or password wrong.");
+      connection.RetrieveVersionInfo(), AuthenticationError,
+      "The attempt to execute this transaction has not been executed at all "
+      "because the authentication did not succeed. Original error: "
+      "Authentication failed. Username or password wrong.");
 }
 
 TEST(test_connection, connection_ssl_authentication_success) {
@@ -121,7 +121,7 @@ TEST(test_connection, connection_ssl_authentication_success) {
   auto major = caosdb::COMPATIBLE_SERVER_VERSION_MAJOR;
   auto minor = caosdb::COMPATIBLE_SERVER_VERSION_MINOR;
   const auto pre_release =
-    std::string(caosdb::COMPATIBLE_SERVER_VERSION_PRE_RELEASE);
+      std::string(caosdb::COMPATIBLE_SERVER_VERSION_PRE_RELEASE);
 
   const auto &v_info = connection->RetrieveVersionInfo();
   EXPECT_EQ(major, v_info.GetMajor());
diff --git a/test/test_file_transmission.cpp b/test/test_file_transmission.cpp
index 7c6a72d0b4d52ecd76d01d253e377473ce7954cf..42911bc520191a0880b6d80d8d122134413a5201 100644
--- a/test/test_file_transmission.cpp
+++ b/test/test_file_transmission.cpp
@@ -47,7 +47,7 @@ protected:
 
 TEST_F(test_file_transmission, register_file_upload) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto transaction(connection->CreateTransaction());
   RegisterFileUploadResponse response;
@@ -63,7 +63,7 @@ TEST_F(test_file_transmission, register_file_upload) {
 
 TEST_F(test_file_transmission, file_upload) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto transaction(connection->CreateTransaction());
   RegisterFileUploadResponse registration_response;
@@ -82,7 +82,7 @@ TEST_F(test_file_transmission, file_upload) {
 
 TEST_F(test_file_transmission, file_insertion) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto transaction(connection->CreateTransaction());
   RegisterFileUploadResponse registration_response;
@@ -110,7 +110,7 @@ TEST_F(test_file_transmission, file_insertion) {
 
 TEST_F(test_file_transmission, file_download) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto upload_transaction(connection->CreateTransaction());
   RegisterFileUploadResponse upload_registration_response;
@@ -136,7 +136,7 @@ TEST_F(test_file_transmission, file_download) {
   RegisterFileDownloadResponse download_registration_response;
   RegisterFileDownloadRequest download_registration_request;
   download_registration_request.add_files()->set_entity_id(
-    upload_transaction->GetResultSet().At(0).GetId());
+      upload_transaction->GetResultSet().At(0).GetId());
   download_transaction->RegisterDownloadFile(download_registration_request,
                                              &download_registration_response);
   ASSERT_EQ(download_registration_response.status(),
@@ -151,7 +151,7 @@ TEST_F(test_file_transmission, file_download) {
   // CLEANUP
   auto cleanup_transaction(connection->CreateTransaction());
   cleanup_transaction->DeleteById(
-    upload_transaction->GetResultSet().At(0).GetId());
+      upload_transaction->GetResultSet().At(0).GetId());
   cleanup_transaction->Execute();
 }
 
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 48b187a6528d123e7957e683daba09979b397555..b6d2876e4792bc6fce738a25bc494861a9453680 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -68,7 +68,7 @@ protected:
     fs::remove(test_download_file_1);
 
     const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+        caosdb::connection::ConnectionManager::GetDefaultConnection();
     auto query_transaction(connection->CreateTransaction());
     query_transaction->Query("FIND ENTITY WITH id > 99");
     query_transaction->Execute();
@@ -84,7 +84,7 @@ protected:
 
 TEST_F(test_transaction, retrieve_non_existing) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto transaction(connection->CreateTransaction());
 
@@ -108,7 +108,7 @@ TEST_F(test_transaction, retrieve_non_existing) {
 
 TEST_F(test_transaction, insert_without_delete) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -137,7 +137,7 @@ TEST_F(test_transaction, insert_without_delete) {
 
 TEST_F(test_transaction, insert_delete) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -182,7 +182,7 @@ TEST_F(test_transaction, insert_delete) {
 
 TEST_F(test_transaction, insert_delete_with_parent) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -266,7 +266,7 @@ TEST_F(test_transaction, insert_delete_with_parent) {
 
 TEST_F(test_transaction, insert_delete_with_property) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   // Create and insert property
   Entity prop_ent;
@@ -399,7 +399,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
 
 TEST_F(test_transaction, test_multi_retrieve) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto transaction(connection->CreateTransaction());
 
@@ -430,7 +430,7 @@ TEST_F(test_transaction, test_multi_retrieve) {
 
 TEST_F(test_transaction, insert_update_delete) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   // INSERT
   auto insert_transaction(connection->CreateTransaction());
@@ -495,7 +495,7 @@ TEST_F(test_transaction, insert_update_delete) {
 
 TEST_F(test_transaction, test_query) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -537,7 +537,7 @@ TEST_F(test_transaction, test_query) {
 
 TEST_F(test_transaction, test_query_with_retrieve) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   // rt1
   Entity rt1;
@@ -649,7 +649,7 @@ TEST_F(test_transaction, test_query_with_retrieve) {
 
 TEST_F(test_transaction, test_file_upload) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   Entity file;
   file.SetRole(Role::FILE);
@@ -674,7 +674,7 @@ TEST_F(test_transaction, test_file_upload) {
 
 TEST_F(test_transaction, test_file_download) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   Entity file;
   file.SetRole(Role::FILE);
@@ -693,7 +693,7 @@ TEST_F(test_transaction, test_file_download) {
 
   auto download_transaction(connection->CreateTransaction());
   download_transaction->RetrieveAndDownloadFilesById(
-    inserted_file.GetId(), test_download_file_1.string());
+      inserted_file.GetId(), test_download_file_1.string());
   download_transaction->ExecuteAsynchronously();
   ASSERT_EQ(download_transaction->WaitForIt().GetCode(), StatusCode::SUCCESS);