diff --git a/common/cpp/include/database/database.h b/common/cpp/include/database/database.h
index 38e29503074048bdc10acb3b495b8353c457d5b6..04979a76123644b4df0266c3ca0f35eee0eaaff3 100644
--- a/common/cpp/include/database/database.h
+++ b/common/cpp/include/database/database.h
@@ -18,9 +18,10 @@ class Database {
                           const std::string& collection ) = 0;
     virtual Error Insert(const FileInfo& file, bool ignore_duplicates) const = 0;
     virtual Error Upsert(uint64_t id, const uint8_t* data, uint64_t size) const = 0;
-    virtual Error InsertAsSubset(const FileInfo& file, uint64_t subset_id,uint64_t subset_size, bool ignore_duplicates) const = 0;
+    virtual Error InsertAsSubset(const FileInfo& file, uint64_t subset_id, uint64_t subset_size,
+                                 bool ignore_duplicates) const = 0;
 
-        virtual ~Database() = default;
+    virtual ~Database() = default;
 };
 
 class DatabaseFactory {
diff --git a/common/cpp/include/unittests/MockDatabase.h b/common/cpp/include/unittests/MockDatabase.h
index c8e740dda2166b4802c345d33b0e0e8d7732a93d..94c611d5f70240dae80cb61be336dba9ed8bdab2 100644
--- a/common/cpp/include/unittests/MockDatabase.h
+++ b/common/cpp/include/unittests/MockDatabase.h
@@ -21,8 +21,8 @@ class MockDatabase : public Database {
     }
 
     Error InsertAsSubset(const FileInfo& file, uint64_t subset_id,
-        uint64_t subset_size, bool ignore_duplicates) const override {
-        return Error{Insert_t(file, ignore_duplicates)};
+                         uint64_t subset_size, bool ignore_duplicates) const override {
+        return Error{InsertAsSubset_t(file, subset_id, subset_size, ignore_duplicates)};
     }
 
 
@@ -30,7 +30,7 @@ class MockDatabase : public Database {
     MOCK_CONST_METHOD2(Insert_t, ErrorInterface * (const FileInfo&, bool));
 
 
-    MOCK_CONST_METHOD4(InsertAsSubset_t, ErrorInterface * (const FileInfo&,uint64_t,uint64_t, bool));
+    MOCK_CONST_METHOD4(InsertAsSubset_t, ErrorInterface * (const FileInfo&, uint64_t, uint64_t, bool));
 
 
     Error Upsert(uint64_t id, const uint8_t* data, uint64_t size) const override {
diff --git a/common/cpp/src/database/mongodb_client.h b/common/cpp/src/database/mongodb_client.h
index 69720778e8c835483ae787d8cf2dd012dfbd3a0d..82266de6ee99bd5a09edd76dcf01fd5e294872fb 100644
--- a/common/cpp/src/database/mongodb_client.h
+++ b/common/cpp/src/database/mongodb_client.h
@@ -39,7 +39,8 @@ class MongoDBClient final : public Database {
     Error Connect(const std::string& address, const std::string& database,
                   const std::string& collection) override;
     Error Insert(const FileInfo& file, bool ignore_duplicates) const override;
-    Error InsertAsSubset(const FileInfo& file, uint64_t subset_id,uint64_t subset_size, bool ignore_duplicates) const override;
+    Error InsertAsSubset(const FileInfo& file, uint64_t subset_id, uint64_t subset_size,
+                         bool ignore_duplicates) const override;
     Error Upsert(uint64_t id, const uint8_t* data, uint64_t size) const override;
     ~MongoDBClient() override;
   private:
diff --git a/receiver/src/request_handler_db_write.cpp b/receiver/src/request_handler_db_write.cpp
index aaeee6b005c6a60c6c20c838632fb6b505fe86d5..697f0af8a12d58b372b4c4e8e100767982fbcfea 100644
--- a/receiver/src/request_handler_db_write.cpp
+++ b/receiver/src/request_handler_db_write.cpp
@@ -34,7 +34,7 @@ Error RequestHandlerDbWrite::InsertRecordToDb(const Request* request) const {
     } else {
         auto subset_id = request->GetCustomData()[0];
         auto subset_size = request->GetCustomData()[1];
-        err =  db_client__->InsertAsSubset(file_info,subset_id,subset_size,true);
+        err =  db_client__->InsertAsSubset(file_info, subset_id, subset_size, true);
     }
 
     if (!err) {
diff --git a/receiver/unittests/receiver_mocking.h b/receiver/unittests/receiver_mocking.h
index 8c1c6476bafefbe8e0a70b1f22be95584e5e419b..ffcdf213a773a33dab09e3add11f36103483e21a 100644
--- a/receiver/unittests/receiver_mocking.h
+++ b/receiver/unittests/receiver_mocking.h
@@ -54,7 +54,7 @@ class MockRequest: public Request {
     MOCK_CONST_METHOD0(GetMetaData, const std::string & ());
     MOCK_CONST_METHOD0(GetBeamline, const std::string & ());
     MOCK_CONST_METHOD0(GetOpCode, asapo::Opcode ());
-    MOCK_CONST_METHOD0(GetCustomData, const asapo::CustomRequestData& ());
+    MOCK_CONST_METHOD0(GetCustomData, const asapo::CustomRequestData & ());
     MOCK_CONST_METHOD0(GetMessage, const char* ());
     MOCK_METHOD1(SetBeamtimeId, void (std::string));
     MOCK_METHOD1(SetBeamline, void (std::string));
diff --git a/receiver/unittests/test_request_handler_db_writer.cpp b/receiver/unittests/test_request_handler_db_writer.cpp
index d6374f2a4e00b5b840531c18e601a63b7a572c3c..2bba51d3e22fcc9e7ec1a212b4017652e401d97a 100644
--- a/receiver/unittests/test_request_handler_db_writer.cpp
+++ b/receiver/unittests/test_request_handler_db_writer.cpp
@@ -71,7 +71,7 @@ class DbWriterHandlerTests : public Test {
     uint64_t expected_id = 15;
     uint64_t expected_subset_id = 15;
     uint64_t expected_subset_size = 2;
-    asapo:: CustomRequestData expected_custom_data{expected_subset_id,expected_subset_size};
+    asapo:: CustomRequestData expected_custom_data{expected_subset_id, expected_subset_size};
     void SetUp() override {
         GenericRequestHeader request_header;
         request_header.data_id = 2;
@@ -140,8 +140,8 @@ void DbWriterHandlerTests::ExpectRequestParams(asapo::Opcode op_code) {
     ;
 
     if (op_code == asapo::Opcode::kOpcodeTransferSubsetData) {
-        EXPECT_CALL(*mock_request, GetCustomData())
-        .WillOnce(ReturnRef(expected_custom_data))
+        EXPECT_CALL(*mock_request, GetCustomData()).Times(2).
+        WillRepeatedly(ReturnRef(expected_custom_data))
         ;
     }
 }