diff --git a/test/caosdb_test_utility.h b/test/caosdb_test_utility.h
index cd1b47ce8f61a8d8d66ae2a7d76ffce46c2a3739..4c97c203a8ab55c9d239d824cd274fe3b99aa60b 100644
--- a/test/caosdb_test_utility.h
+++ b/test/caosdb_test_utility.h
@@ -32,15 +32,17 @@
  * @date 2021-07-07
  */
 #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)
+  EXPECT_THROW(                                                                \
+    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)
+  ASSERT_THROW(                                                                \
+    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 bf3baf91749e1509cc5e8ba8db3b671a9809a760..ff01b9ba95d8dcded153aa9f94260a98cf5b3c53 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -109,7 +109,7 @@ TEST_F(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);
@@ -120,12 +120,12 @@ TEST_F(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
@@ -139,7 +139,7 @@ TEST_F(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);
 
@@ -150,12 +150,12 @@ TEST_F(test_ccaosdb, test_count_query) {
 TEST_F(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,
@@ -167,7 +167,7 @@ TEST_F(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);
@@ -183,16 +183,16 @@ TEST_F(test_ccaosdb, test_query) {
 TEST_F(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);
@@ -200,7 +200,7 @@ TEST_F(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);
@@ -229,17 +229,17 @@ TEST_F(test_ccaosdb, test_single_id_retrieve) {
 TEST_F(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);
@@ -248,7 +248,7 @@ TEST_F(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);
@@ -361,7 +361,7 @@ TEST_F(test_ccaosdb, test_insert_update_delete) {
 
   // Change name and update
   return_code =
-      caosdb_entity_entity_set_name(&retrieved_entity_1, "TestNameNew");
+    caosdb_entity_entity_set_name(&retrieved_entity_1, "TestNameNew");
   EXPECT_EQ(return_code, 0);
   caosdb_transaction_transaction update_transaction;
   caosdb_connection_connection_create_transaction(&connection,
@@ -650,13 +650,13 @@ TEST_F(test_ccaosdb, test_up_n_download_file) {
   // return_code = caosdb_transaction_transaction_retrieve_by_id(
   //   &retrieve_transaction_1, rec_id);
   return_code = caosdb_transaction_transaction_retrieve_and_download_file_by_id(
-      &retrieve_transaction_1, rec_id, test_download_file_1.c_str());
+    &retrieve_transaction_1, rec_id, test_download_file_1.c_str());
   EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
   return_code = caosdb_transaction_transaction_execute(&retrieve_transaction_1);
   EXPECT_EQ(return_code, 0);
 
   caosdb_transaction_result_set result_set;
   return_code = caosdb_transaction_transaction_get_result_set(
-      &retrieve_transaction_1, &result_set);
+    &retrieve_transaction_1, &result_set);
   EXPECT_EQ(return_code, 0);
 }
diff --git a/test/test_connection.cpp b/test/test_connection.cpp
index 28c1660306454039cd5ed8ca140e9f0ca0bd50e7..169fc9df1a2bd5d3e71aabf9a7b563402f733895 100644
--- a/test/test_connection.cpp
+++ b/test/test_connection.cpp
@@ -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_fallback("CAOSDB_SERVER_GRPC_PORT_HTTP", "8080");
+    caosdb::utility::get_env_fallback("CAOSDB_SERVER_GRPC_PORT_HTTP", "8080");
   auto port = std::stoi(port_str);
   const auto *const host =
-      caosdb::utility::get_env_fallback("CAOSDB_SERVER_HOST", "localhost");
+    caosdb::utility::get_env_fallback("CAOSDB_SERVER_HOST", "localhost");
 
   auto config = InsecureConnectionConfiguration(host, port);
   auto connection = Connection(config);
@@ -74,13 +74,13 @@ TEST(test_connection, connection_insecure_authentication_error_anonymous) {
 }
 
 TEST(test_connection, connection_ssl_authentication_error_anonymous) {
-  const auto *port_str = caosdb::utility::get_env_fallback(
-      "CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
+  const auto *port_str =
+    caosdb::utility::get_env_fallback("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
   auto port = std::stoi(port_str);
   const auto *const host =
-      caosdb::utility::get_env_fallback("CAOSDB_SERVER_HOST", "localhost");
+    caosdb::utility::get_env_fallback("CAOSDB_SERVER_HOST", "localhost");
   const auto path =
-      caosdb::utility::get_env_fallback("CAOSDB_SERVER_CERT", std::string());
+    caosdb::utility::get_env_fallback("CAOSDB_SERVER_CERT", std::string());
 
   auto cert = PemFileCertificateProvider(path);
   auto config = TlsConnectionConfiguration(host, port, cert);
@@ -93,13 +93,13 @@ 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_fallback(
-      "CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
+  const auto *port_str =
+    caosdb::utility::get_env_fallback("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443");
   auto port = std::stoi(port_str);
   const auto *const host =
-      caosdb::utility::get_env_fallback("CAOSDB_SERVER_HOST", "localhost");
+    caosdb::utility::get_env_fallback("CAOSDB_SERVER_HOST", "localhost");
   const auto path =
-      caosdb::utility::get_env_fallback("CAOSDB_SERVER_CERT", std::string());
+    caosdb::utility::get_env_fallback("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_issues.cpp b/test/test_issues.cpp
index 4a2f67b742460750888aa6f6f172f5ddffb0a05c..f8d56d8744d118c9beec5602afab9632211648c8 100644
--- a/test/test_issues.cpp
+++ b/test/test_issues.cpp
@@ -46,7 +46,7 @@ public:
   static void DeleteEntities() {
     // delete all entities
     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();
@@ -75,7 +75,7 @@ protected:
  */
 TEST_F(test_issues, server_issue_170) {
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   // Insert original
   auto insert_transaction(connection->CreateTransaction());
@@ -105,16 +105,12 @@ TEST_F(test_issues, server_issue_170) {
   update_entity.SetDataType(AtomicDataType::INTEGER, true);
   update_entity.SetValue(std::vector<int32_t>{1, 1, 2, 3, 5, 8, 13});
 
-  EXPECT_NONFATAL_FAILURE(
-      {
-        update_transaction->UpdateEntity(&update_entity);
-        update_transaction->ExecuteAsynchronously();
+  update_transaction->UpdateEntity(&update_entity);
+  update_transaction->ExecuteAsynchronously();
 
-        auto update_status = update_transaction->WaitForIt();
-        EXPECT_TRUE(update_status.IsTerminated());
-        EXPECT_FALSE(update_status.IsError());
-      },
-      "update_status.IsError");
+  auto update_status = update_transaction->WaitForIt();
+  EXPECT_TRUE(update_status.IsTerminated());
+  EXPECT_FALSE(update_status.IsError());
 }
 
 /*
@@ -124,7 +120,7 @@ TEST_F(test_issues, server_issue_170) {
  */
 TEST_F(test_issues, server_issue_171) {
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -175,7 +171,7 @@ TEST_F(test_issues, server_issue_171) {
  */
 TEST_F(test_issues, server_issue_174) {
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -190,10 +186,7 @@ TEST_F(test_issues, server_issue_174) {
   auto insert_status = insert_transaction->WaitForIt();
   ASSERT_TRUE(insert_status.IsTerminated());
   // TODO(tf) Remove the EXPECT_NONFATAL_FAILURE after fixing #174.
-  EXPECT_NONFATAL_FAILURE(
-      EXPECT_FALSE(insert_status.IsError())
-      , "");
-
+  EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(insert_status.IsError()), "");
 }
 
 } // namespace caosdb::transaction
diff --git a/test/test_list_properties.cpp b/test/test_list_properties.cpp
index 89d3deae3e7c263a9cbce9c5f11e5f42b5979e03..b8fdb0d4deaf0788aec6e72deada5106af2dffae 100644
--- a/test/test_list_properties.cpp
+++ b/test/test_list_properties.cpp
@@ -27,10 +27,10 @@
 #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
+#include <iostream>                    // for cout
+#include <memory>                      // for unique_ptr, allocator, __shar...
+#include <string>                      // for string
+#include <vector>                      // for vector
 
 namespace caosdb::entity {
 
@@ -42,7 +42,7 @@ protected:
 
   static void DeleteEntities() {
     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();
@@ -58,7 +58,7 @@ protected:
 
 TEST_F(test_list_properties, insert_list_of_text) {
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insertion_prop(connection->CreateTransaction());
 
@@ -67,7 +67,7 @@ TEST_F(test_list_properties, insert_list_of_text) {
   abstract_list_property.SetName("TestProp");
   abstract_list_property.SetDataType(DataType::ListOf(AtomicDataType::TEXT));
   abstract_list_property.SetValue(
-      std::vector<std::string>{"item1", "item2", "item3"});
+    std::vector<std::string>{"item1", "item2", "item3"});
 
   insertion_prop->InsertEntity(&abstract_list_property);
   std::cout << "response " << insertion_prop->ResponseToString();
diff --git a/test/test_properties.cpp b/test/test_properties.cpp
index 4a6496a05c9bca0436ca1e15e47637cdf6d2b696..6137494905b5fe0e5c04aa256a45648f355a8b91 100644
--- a/test/test_properties.cpp
+++ b/test/test_properties.cpp
@@ -38,7 +38,7 @@ protected:
 
   static void DeleteEntities() {
     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();
@@ -54,7 +54,7 @@ protected:
 
 TEST_F(test_properties, retrieve_unit) {
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insertion_prop(connection->CreateTransaction());
 
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 522175937aacd65d2004cd40e20c2c9de5df977d..13ffb647dbbc8eb152b1683309032459611927cb 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -65,14 +65,14 @@ public:
    */
   template <typename T> static auto generateValues() -> std::vector<T> {
     std::vector<T> values = {
-        static_cast<T>(0),
-        static_cast<T>(1),
-        static_cast<T>(6.91629132943846e-310),
-        std::numeric_limits<T>::max(),
-        std::numeric_limits<T>::min(),
-        std::numeric_limits<T>::denorm_min(),
-        std::numeric_limits<T>::lowest(),
-        std::numeric_limits<T>::epsilon() // 0 for integers, but who cares?
+      static_cast<T>(0),
+      static_cast<T>(1),
+      static_cast<T>(6.91629132943846e-310),
+      std::numeric_limits<T>::max(),
+      std::numeric_limits<T>::min(),
+      std::numeric_limits<T>::denorm_min(),
+      std::numeric_limits<T>::lowest(),
+      std::numeric_limits<T>::epsilon() // 0 for integers, but who cares?
     };
 
     return values;
@@ -84,7 +84,7 @@ public:
   static void DeleteEntities() {
     // delete all entities
     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();
@@ -104,7 +104,7 @@ protected:
   fs::path test_upload_file_1;
   fs::path test_download_file_1;
   size_t test_file_size_kib =
-      20; // We should test at least something over 16kiB
+    20; // We should test at least something over 16kiB
 
   // Fixture methods //////////////////////////////////////////////////////////
 
@@ -158,7 +158,7 @@ auto test_transaction::getValueAs<bool>(const Value &value) -> bool {
  */
 TEST_F(test_transaction, retrieve_non_existing) {
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto transaction(connection->CreateTransaction());
 
@@ -188,7 +188,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());
 
@@ -223,7 +223,7 @@ TEST_F(test_transaction, insert_delete) {
   // same as in insert_without_delete
   // until marked  END SAME
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -268,7 +268,7 @@ TEST_F(test_transaction, insert_delete_with_parent) {
   // same as in insert_without_delete
   // until marked  END SAME
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -363,7 +363,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 Text property
   Entity prop_ent;
@@ -557,7 +557,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());
 
@@ -591,7 +591,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());
@@ -659,7 +659,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());
 
@@ -705,7 +705,7 @@ TEST_F(test_transaction, test_query) {
 template <typename T, typename S>
 auto test_numeric_values_impl(AtomicDataType a_type) -> void {
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   // Insert entities
   auto values_orig = test_transaction::generateValues<T>();
@@ -825,7 +825,7 @@ TEST_F(test_transaction, test_integer_out_of_range) {
  */
 TEST_F(test_transaction, test_query_with_retrieve) {
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   // rt1
   Entity rt1;
@@ -940,7 +940,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);
@@ -977,7 +977,7 @@ TEST_F(test_transaction, test_file_upload) {
  */
 TEST_F(test_transaction, test_file_up_n_download) {
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   Entity file;
   file.SetRole(Role::FILE);
@@ -996,7 +996,7 @@ TEST_F(test_transaction, test_file_up_n_download) {
 
   auto download_transaction(connection->CreateTransaction());
   download_transaction->RetrieveAndDownloadFileById(
-      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);
 
@@ -1029,7 +1029,7 @@ TEST_F(test_transaction, test_file_up_n_download) {
  */
 TEST_F(test_transaction, test_full_workflow) {
   const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   // ######  Create Data Model  ######
   Entity dataRT;