diff --git a/consumer/api/cpp/src/server_data_broker.cpp b/consumer/api/cpp/src/server_data_broker.cpp
index 7891a5ad1efcc9612516c814e40fbdc106713ef9..9cfbf694db3c96a1788cdf37df7f270d1626fd1f 100644
--- a/consumer/api/cpp/src/server_data_broker.cpp
+++ b/consumer/api/cpp/src/server_data_broker.cpp
@@ -27,7 +27,6 @@ Error ErrorFromNoDataResponse(const std::string& response) {
     if (response.find("get_record_by_id") != std::string::npos) {
         ConsumerErrorData data;
         auto parse_error = GetNoDataResponseFromJson(response, &data);
-        std::cout<<response<<std::endl;
         if (parse_error) {
             return ConsumerErrorTemplates::kInterruptedTransaction.Generate("malformed response - " + response);
         }
@@ -336,7 +335,6 @@ Error ServerDataBroker::SetLastReadMarker(uint64_t value, std::string group_id,
     Error err;
     BrokerRequestWithTimeout(ri, &err);
     return err;
-    asapo::Error();
 }
 
 uint64_t ServerDataBroker::GetCurrentSize(std::string substream, Error* err) {
diff --git a/consumer/api/cpp/unittests/test_server_broker.cpp b/consumer/api/cpp/unittests/test_server_broker.cpp
index 753f9c042e0db3dd27cdc425a3971aa558f2af71..26db9117a6ae3bff3aaec2f435ab6c7267b0a2ce 100644
--- a/consumer/api/cpp/unittests/test_server_broker.cpp
+++ b/consumer/api/cpp/unittests/test_server_broker.cpp
@@ -415,9 +415,9 @@ TEST_F(ServerDataBrokerTests, GetNextImageReturnsImmediatelyOnFinshedSubstream)
     MockGetBrokerUri();
 
     EXPECT_CALL(mock_http_client, Get_t(HasSubstr("next"), _, _)).WillOnce(DoAll(
-        SetArgPointee<1>(HttpCode::Conflict),
-        SetArgPointee<2>(nullptr),
-        Return("{\"op\":\"get_record_by_id\",\"id\":2,\"id_max\":2,\"next_substream\":\"next\"}")));
+                SetArgPointee<1>(HttpCode::Conflict),
+                SetArgPointee<2>(nullptr),
+                Return("{\"op\":\"get_record_by_id\",\"id\":2,\"id_max\":2,\"next_substream\":\"next\"}")));
 
     data_broker->SetTimeout(300);
     auto err = data_broker->GetNext(&info, expected_group_id, nullptr);
diff --git a/tests/automatic/consumer/consumer_api_python/check_linux.sh b/tests/automatic/consumer/consumer_api_python/check_linux.sh
index 2832a9e890783a6c92c2f120fbe186170d82a76a..8f514d0755a00d3c4bb194cd33002cda5d3ab45e 100644
--- a/tests/automatic/consumer/consumer_api_python/check_linux.sh
+++ b/tests/automatic/consumer/consumer_api_python/check_linux.sh
@@ -28,7 +28,7 @@ echo hello1 > 1_1
 
 for i in `seq 1 5`;
 do
-	echo 'db.data.insert({"_id":'$i',"size":6,"name":"'$i'","lastchange":1,"source":"none","buf_id":0,"meta":{"test":10}})' | mongo ${database_name} >/dev/null
+	echo 'db.data_default.insert({"_id":'$i',"size":6,"name":"'$i'","lastchange":1,"source":"none","buf_id":0,"meta":{"test":10}})' | mongo ${database_name} >/dev/null
 done
 
 sleep 1
@@ -51,7 +51,7 @@ do
 		images="$images,{"_id":$j,"size":6,"name":'${i}_${j}',"lastchange":1,"source":'none',"buf_id":0,"meta":{"test":10}}"
 	done
 	images=${images#?}
-	echo 'db.data.insert({"_id":'$i',"size":3,"images":['$images']})' | mongo ${database_name} >/dev/null
+	echo 'db.data_default.insert({"_id":'$i',"size":3,"images":['$images']})' | mongo ${database_name} >/dev/null
 done
 
 
diff --git a/tests/automatic/full_chain/send_recv_substreams/check_windows.bat b/tests/automatic/full_chain/send_recv_substreams/check_windows.bat
index c4c583cef01d322b6675931661795d3b21cfd12b..aa79cf59d7dff753f5127ebbe37b6fc81fd09af5 100644
--- a/tests/automatic/full_chain/send_recv_substreams/check_windows.bat
+++ b/tests/automatic/full_chain/send_recv_substreams/check_windows.bat
@@ -8,7 +8,7 @@ SET token=IEfwsWa0GXky2S3MkxJSUHJT1sI8DD5teRdjBUXVRxk=
 
 SET beamline=test
 
-SET mongo_exe="c:\Program Files\MongoDB\Server\3.6\bin\mongo.exe"
+SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe"
 
 
 c:\opt\consul\nomad run discovery.nmd