diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-acquire.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-acquire.cpp
index 38a4c3460..5406e9e07 100644
--- a/slsDetectorSoftware/tests/Caller/test-Caller-acquire.cpp
+++ b/slsDetectorSoftware/tests/Caller/test-Caller-acquire.cpp
@@ -156,7 +156,7 @@ void test_ctb_file_size_with_acquire(Detector &det, Caller &caller,
                                                   expected_image_size));
 }
 
-// disable for jungfrau as it requires higher maximum receive buffer size
+// disable for xilinx_ctb as it requires higher maximum receive buffer size
 //  sysctl net.core.rmem_max=$((100*1024*1024))
 //  sysctl net.core.rmem_default=$((100*1024*1024))
 TEST_CASE("ctb_acquire_check_file_size",
diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp
index 0456f171d..dc3b72075 100644
--- a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp
+++ b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp
@@ -1055,10 +1055,8 @@ TEST_CASE("v_abcd", "[.detectorintegration]") {
                 caller.call(cmds[i], {}, -1, GET, oss2);
                 REQUIRE(oss2.str() == cmds[i] + " 1200\n");
             }
-            for (int i = 0; i != det.size(); ++i) {
-                // TODO: indices should be independant of detector size? is i
-                // the correct index?
-                det.setPower(indices[i], prev_val[i], {i});
+            for (int nmodules = 0; nmodules != det.size(); ++i) {
+                det.setPower(indices[i], prev_val[i], {nmodules});
             }
         } else {
             REQUIRE_THROWS(caller.call(cmds[i], {}, -1, GET));
diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp
index 83ec95cff..13c2bfb93 100644
--- a/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp
+++ b/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp
@@ -1042,12 +1042,14 @@ TEST_CASE("check_master_file_attributes",
 
     int64_t num_frames = 1;
     switch (det_type) {
-    case defs::EIGER:
     case defs::JUNGFRAU:
+        create_files_for_acquire(det, caller, num_frames, std::nullopt, false);
+        break;
+    case defs::EIGER:
     case defs::MOENCH:
     case defs::MYTHEN3:
     case defs::GOTTHARD2:
-        create_files_for_acquire(det, caller, num_frames, std::nullopt, false);
+        create_files_for_acquire(det, caller, num_frames, std::nullopt);
         break;
     case defs::CHIPTESTBOARD:
     case defs::XILINX_CHIPTESTBOARD: {