diff --git a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
index f2e88c59d..4cb66bdbf 100644
--- a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
@@ -163,6 +163,7 @@ TEST_CASE("rx_missingpackets", "[.cmd][.rx]") {
     for (int i = 0; i != det.size(); ++i) {
         det.setFileWrite(prev_val[i], {i});
     }
+    det.setNumberOfFrames(prev_frames);
 }
 
 TEST_CASE("rx_frameindex", "[.cmd][.rx]") {
@@ -797,7 +798,7 @@ TEST_CASE("rx_zmqport", "[.cmd][.rx]") {
     Detector det;
     CmdProxy proxy(&det);
     auto prev_val_zmqport = det.getRxZmqPort();
-    auto prev_val_numinterfaces = det.getNumberofUDPInterfaces();
+    auto prev_val_numinterfaces = det.getNumberofUDPInterfaces().tsquash("inconsistent number of udp interfaces to test");
 
     int socketsperdetector = 1;
     auto det_type = det.getDetectorType().squash();
@@ -827,9 +828,9 @@ TEST_CASE("rx_zmqport", "[.cmd][.rx]") {
     }
     for (int i = 0; i != det.size(); ++i) {
         det.setRxZmqPort(prev_val_zmqport[i], i);
-        if (det_type == defs::JUNGFRAU) {
-            det.setNumberofUDPInterfaces(prev_val_numinterfaces[i], {i});
-        }
+    }
+    if (det_type == defs::JUNGFRAU) {
+        det.setNumberofUDPInterfaces(prev_val_numinterfaces);
     }
 }
 
diff --git a/slsDetectorSoftware/tests/test-CmdProxy.cpp b/slsDetectorSoftware/tests/test-CmdProxy.cpp
index 8e5fc1b87..d668b6eaf 100644
--- a/slsDetectorSoftware/tests/test-CmdProxy.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy.cpp
@@ -28,7 +28,6 @@ TEST_CASE("Calling help doesn't throw or cause segfault") {
 }
 
 TEST_CASE("Unknown command", "[.cmd]") {
-
     Detector det;
     CmdProxy proxy(&det);
     REQUIRE_THROWS(proxy.Call("vsaevrreavv", {}, -1, PUT));
@@ -572,7 +571,7 @@ TEST_CASE("fliprows", "[.cmd]") {
     }
     if (det_type == defs::EIGER || jungfrauhw2) {
         auto previous = det.getFlipRows();
-        auto previous_numudp = det.getNumberofUDPInterfaces();
+        auto previous_numudp = det.getNumberofUDPInterfaces().tsquash("inconsistent number of udp interfaces to test");
         if (det_type == defs::JUNGFRAU) {
             det.setNumberofUDPInterfaces(2);
         }
@@ -585,9 +584,9 @@ TEST_CASE("fliprows", "[.cmd]") {
         REQUIRE(oss3.str() == "fliprows 0\n");
         for (int i = 0; i != det.size(); ++i) {
             det.setFlipRows(previous[i], {i});
-            if (det_type == defs::JUNGFRAU) {
-                det.setNumberofUDPInterfaces(previous_numudp[i], {i});
-            }
+        }
+        if (det_type == defs::JUNGFRAU) {
+            det.setNumberofUDPInterfaces(previous_numudp);
         }
     } else {
         REQUIRE_THROWS(proxy.Call("fliprows", {}, -1, GET));