diff --git a/slsDetectorSoftware/tests/CMakeLists.txt b/slsDetectorSoftware/tests/CMakeLists.txt
index 1622c48d9..4a7d7287d 100755
--- a/slsDetectorSoftware/tests/CMakeLists.txt
+++ b/slsDetectorSoftware/tests/CMakeLists.txt
@@ -7,6 +7,8 @@ target_sources(tests PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/test-CmdProxy-jungfrau.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test-CmdProxy-mythen3.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test-CmdProxy-gotthard2.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test-CmdProxy-gotthard.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/test-CmdProxy-chiptestboard.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test-CmdProxy-global.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test-Result.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test-CmdParser.cpp
diff --git a/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp b/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
new file mode 100644
index 000000000..31de04247
--- /dev/null
+++ b/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
@@ -0,0 +1,97 @@
+#include "CmdProxy.h"
+#include "Detector.h"
+#include "catch.hpp"
+#include "sls_detector_defs.h"
+#include <sstream>
+
+#include "Result.h"
+#include "ToString.h"
+#include "test-CmdProxy-global.h"
+#include "tests/globals.h"
+#include "versionAPI.h"
+
+using sls::CmdProxy;
+using sls::Detector;
+using test::GET;
+using test::PUT;
+
+TEST_CASE("Setting and reading back Chip test board dacs", "[.cmd][.dacs]") {
+    // dac 0 to dac 17
+
+    Detector det;
+    CmdProxy proxy(&det);
+    auto det_type = det.getDetectorType().squash();
+    if (det_type == defs::CHIPTESTBOARD) {
+        for (int i = 0; i < 18; ++i) {
+            SECTION("dac " + std::to_string(i)) { test_dac(static_cast<defs::dacIndex>(i), "dac " + std::to_string(i), 0); }
+        }
+        // eiger
+        REQUIRE_THROWS(proxy.Call("vthreshold", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vsvp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vsvn", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtr", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vrf", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vrs", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtgstv", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_ll", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_lr", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcal", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_rl", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_rr", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("rxb_rb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("rxb_lb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcn", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vis", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("iodelay", {}, -1, GET));
+        // jungfrau
+        REQUIRE_THROWS(proxy.Call("vb_comp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vdd_prot", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vin_com", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_prech", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_pixbuf", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_ds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_ds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_comp", {}, -1, GET));
+        // gotthard
+        REQUIRE_THROWS(proxy.Call("vref_ds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcascn_pb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcascp_pb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vout_cm", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcasc_out", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vin_cm", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_comp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("ib_test_c", {}, -1, GET));
+        // mythen3
+        REQUIRE_THROWS(proxy.Call("vpreamp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vshaper", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vshaperneg", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vipre", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("viinsh", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vdcsh", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth1", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth2", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth3", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vpl", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vph", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtrim", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcassh", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcas", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vicin", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vipre_out", {}, -1, GET));
+        // gotthard2
+        REQUIRE_THROWS(proxy.Call("vref_h_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_comp_fe", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_comp_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_cds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_rstore", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_opa_1st", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_comp_fe", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_adc1", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_l_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_cds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_cs", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_opa_fd", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_adc2", {}, -1, GET));  
+    }
+}
diff --git a/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp b/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp
index 8385f3fce..10bbb7cf6 100644
--- a/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp
@@ -280,7 +280,7 @@ TEST_CASE("quad", "[.cmd]") {
     }
 }
 
-TEST_CASE("Setting and reading back EIGER dacs", "[.cmd]") {
+TEST_CASE("Setting and reading back EIGER dacs", "[.cmd][.dacs]") {
     // vsvp, vtr, vrf, vrs, vsvn, vtgstv, vcmp_ll, vcmp_lr, vcal, vcmp_rl,
     // rxb_rb, rxb_lb, vcmp_rr, vcp, vcn, vis, vthreshold
     Detector det;
@@ -374,11 +374,14 @@ TEST_CASE("Setting and reading back EIGER dacs", "[.cmd]") {
         REQUIRE_THROWS(proxy.Call("vb_opa_fd", {}, -1, GET));
         REQUIRE_THROWS(proxy.Call("vcom_adc2", {}, -1, GET));
         // jungfrau
-        REQUIRE_THROWS(proxy.Call("vb_ds", {}, -1, GET));
         REQUIRE_THROWS(proxy.Call("vb_comp", {}, -1, GET));
-        REQUIRE_THROWS(proxy.Call("vb_pixbuf", {}, -1, GET));
-        REQUIRE_THROWS(proxy.Call("vin_com", {}, -1, GET));
         REQUIRE_THROWS(proxy.Call("vdd_prot", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vin_com", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_prech", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_pixbuf", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_ds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_ds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_comp", {}, -1, GET));
     }
 }
 
diff --git a/slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp b/slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp
new file mode 100644
index 000000000..b253eca03
--- /dev/null
+++ b/slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp
@@ -0,0 +1,93 @@
+#include "CmdProxy.h"
+#include "Detector.h"
+#include "catch.hpp"
+#include "sls_detector_defs.h"
+#include <sstream>
+
+#include "Result.h"
+#include "ToString.h"
+#include "test-CmdProxy-global.h"
+#include "tests/globals.h"
+#include "versionAPI.h"
+
+using sls::CmdProxy;
+using sls::Detector;
+using test::GET;
+using test::PUT;
+
+TEST_CASE("Setting and reading back GOTTHARD dacs", "[.cmd][.dacs]") {
+    // vref_ds, vcascn_pb, vcascp_pb, vout_cm, vcasc_out, vin_cm, vref_comp, ib_test_c
+
+    Detector det;
+    CmdProxy proxy(&det);
+    auto det_type = det.getDetectorType().squash();
+    if (det_type == defs::GOTTHARD) {
+        SECTION("vref_ds") { test_dac(defs::VREF_DS, "vref_ds", 660); }
+        SECTION("vcascn_pb") { test_dac(defs::VCASCN_PB, "vcascn_pb", 650); }
+        SECTION("vcascp_pb") { test_dac(defs::VCASCP_PB, "vcascp_pb", 1480); }
+        SECTION("vout_cm") { test_dac(defs::VOUT_CM, "vout_cm", 1520); }
+        SECTION("vcasc_out") { test_dac(defs::VCASC_OUT, "vcasc_out", 1320); }
+        SECTION("vin_cm") { test_dac(defs::VIN_CM, "vin_cm", 1350); }
+        SECTION("vref_comp") { test_dac(defs::VREF_COMP, "vref_comp", 350); }
+        SECTION("ib_test_c") { test_dac(defs::IB_TESTC, "ib_test_c", 2001); }
+        // eiger
+        REQUIRE_THROWS(proxy.Call("vthreshold", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vsvp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vsvn", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtr", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vrf", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vrs", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtgstv", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_ll", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_lr", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcal", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_rl", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_rr", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("rxb_rb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("rxb_lb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcn", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vis", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("iodelay", {}, -1, GET));
+        // jungfrau
+        REQUIRE_THROWS(proxy.Call("vb_comp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vdd_prot", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vin_com", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_prech", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_pixbuf", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_ds", {}, -1, GET));
+        // REQUIRE_THROWS(proxy.Call("vref_ds", {}, -1, GET));
+        // REQUIRE_THROWS(proxy.Call("vref_comp", {}, -1, GET));
+        // mythen3
+        REQUIRE_THROWS(proxy.Call("vpreamp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vshaper", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vshaperneg", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vipre", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("viinsh", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vdcsh", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth1", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth2", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth3", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vpl", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vph", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtrim", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcassh", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcas", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vicin", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vipre_out", {}, -1, GET));
+        // gotthard2
+        REQUIRE_THROWS(proxy.Call("vref_h_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_comp_fe", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_comp_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_cds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_rstore", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_opa_1st", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_comp_fe", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_adc1", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_l_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_cds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_cs", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_opa_fd", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_adc2", {}, -1, GET));  
+    }
+}
diff --git a/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp b/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
index 4bb1f72e5..688475aea 100644
--- a/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
@@ -68,11 +68,14 @@ TEST_CASE("Setting and reading back GOTTHARD2 dacs", "[.cmd][.dacs]") {
         REQUIRE_THROWS(proxy.Call("vref_comp", {}, -1, GET));
         REQUIRE_THROWS(proxy.Call("ib_test_c", {}, -1, GET));
         // jungfrau
-        REQUIRE_THROWS(proxy.Call("vb_ds", {}, -1, GET));
         REQUIRE_THROWS(proxy.Call("vb_comp", {}, -1, GET));
-        REQUIRE_THROWS(proxy.Call("vb_pixbuf", {}, -1, GET));
-        REQUIRE_THROWS(proxy.Call("vin_com", {}, -1, GET));
         REQUIRE_THROWS(proxy.Call("vdd_prot", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vin_com", {}, -1, GET));
+        // REQUIRE_THROWS(proxy.Call("vref_prech", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_pixbuf", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_ds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_ds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_comp", {}, -1, GET));
         // mythen3
         REQUIRE_THROWS(proxy.Call("vpreamp", {}, -1, GET));
         REQUIRE_THROWS(proxy.Call("vshaper", {}, -1, GET));
diff --git a/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp b/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
index fcec4f5e5..30dda3df2 100644
--- a/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
@@ -4,6 +4,7 @@
 #include "sls_detector_defs.h"
 #include <sstream>
 
+#include "test-CmdProxy-global.h"
 #include "tests/globals.h"
 #include "versionAPI.h"
 
@@ -157,76 +158,78 @@ TEST_CASE("resetfpga", "[.cmd]") {
 }
 
 
-
-// void test_dac(defs::dacIndex index, const std::string &dacname, int dacvalue)
-// {
-//     Detector det;
-//     CmdProxy proxy(&det);
-//     std::ostringstream oss_set, oss_get;
-//     auto dacstr = std::to_string(dacvalue);
-//     auto previous = det.getDAC(index, false);
-//     proxy.Call(dacname, {dacstr}, -1, PUT, oss_set);
-//     REQUIRE(oss_set.str() == dacname + " " + dacstr + "\n");
-//     proxy.Call(dacname, {}, -1, GET, oss_get);
-//     REQUIRE(oss_set.str() == dacname + " " + dacstr + "\n");
-//     // Reset all dacs to previous value
-//     for (int i = 0; i != det.size(); ++i) {
-//         det.setDAC(index, previous[i], false, {i});
-//     }
-// }
-
-// TEST_CASE("Setting and reading back EIGER dacs", "[.cmd]") {
-//     // vsvp, vtr, vrf, vrs, vsvn, vtgstv, vcmp_ll, vcmp_lr, vcal, vcmp_rl,
-//     // rxb_rb, rxb_lb, vcmp_rr, vcp, vcn, vis, vthreshold
-//     Detector det;
-//     CmdProxy proxy(&det);
-//     auto det_type = det.getDetectorType().squash();
-//     if (det_type == defs::EIGER) {
-//         SECTION("vsvp") { test_dac(defs::SVP, "vsvp", 5); }
-//         SECTION("vtr") { test_dac(defs::VRF, "vtr", 1200); }
-//         SECTION("vrf") { test_dac(defs::VRF, "vrf", 1500); }
-//         SECTION("vrs") { test_dac(defs::VRF, "vrs", 1510); }
-//         SECTION("vsvn") { test_dac(defs::SVN, "vsvn", 3800); }
-//         SECTION("vtgstv") { test_dac(defs::VTGSTV, "vtgstv", 2550); }
-//         SECTION("vcmp_ll") { test_dac(defs::VCMP_LL, "vcmp_ll", 1400); }
-//         SECTION("vcmp_lr") { test_dac(defs::VCMP_LR, "vcmp_lr", 1400); }
-//         SECTION("vcal") { test_dac(defs::CAL, "vcal", 1400); }
-//         SECTION("vcmp_rl") { test_dac(defs::VCMP_RL, "vcmp_rl", 1400); }
-//         SECTION("rxb_rb") { test_dac(defs::RXB_RB, "rxb_rb", 1400); }
-//         SECTION("rxb_lb") { test_dac(defs::RXB_LB, "rxb_lb", 1400); }
-//         SECTION("vcmp_rr") { test_dac(defs::VCMP_RR, "vcmp_rr", 1400); }
-//         SECTION("vcp") { test_dac(defs::VCP, "vcp", 1400); }
-//         SECTION("vcn") { test_dac(defs::VCN, "vcn", 1400); }
-//         SECTION("vis") { test_dac(defs::VIS, "vis", 1400); }
-//         SECTION("iodelay") { test_dac(defs::IO_DELAY, "iodelay", 1400); }
-//         SECTION("vthreshold") {
-//             // Read out individual vcmp to be able to reset after
-//             // the test is done
-//             auto vcmp_ll = det.getDAC(defs::VCMP_LL, false);
-//             auto vcmp_lr = det.getDAC(defs::VCMP_LR, false);
-//             auto vcmp_rl = det.getDAC(defs::VCMP_RL, false);
-//             auto vcmp_rr = det.getDAC(defs::VCMP_RR, false);
-//             auto vcp = det.getDAC(defs::VCP, false);
-
-//             {
-//                 std::ostringstream oss;
-//                 proxy.Call("vthreshold", {"1234"}, -1, PUT, oss);
-//                 REQUIRE(oss.str() == "vthreshold 1234\n");
-//             }
-//             {
-//                 std::ostringstream oss;
-//                 proxy.Call("vthreshold", {}, -1, GET, oss);
-//                 REQUIRE(oss.str() == "vthreshold 1234\n");
-//             }
-
-//             // Reset dacs after test
-//             for (int i = 0; i != det.size(); ++i) {
-//                 det.setDAC(defs::VCMP_LL, vcmp_ll[i], false, {i});
-//                 det.setDAC(defs::VCMP_LR, vcmp_ll[i], false, {i});
-//                 det.setDAC(defs::VCMP_RL, vcmp_ll[i], false, {i});
-//                 det.setDAC(defs::VCMP_RR, vcmp_ll[i], false, {i});
-//                 det.setDAC(defs::VCP, vcp[i], false, {i});
-//             }
-//         }
-//     }
-// }
+TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmd]") {
+    // vb_comp, vdd_prot, vin_com, vref_prech, vb_pixbuf, vb_ds, vref_ds, vref_comp
+    Detector det;
+    CmdProxy proxy(&det);
+    auto det_type = det.getDetectorType().squash();
+    if (det_type == defs::JUNGFRAU) {
+        SECTION("vb_comp") { test_dac(defs::VB_COMP, "vb_comp", 1220); }
+        SECTION("vdd_prot") { test_dac(defs::VDD_PROT, "vdd_prot", 3000); }
+        SECTION("vin_com") { test_dac(defs::VIN_COM, "vin_com", 1053); }
+        SECTION("vref_prech") { test_dac(defs::VREF_PRECH, "vref_prech", 1450); }
+        SECTION("vb_pixbuf") { test_dac(defs::VB_PIXBUF, "vb_pixbuf", 750); }
+        SECTION("vb_ds") { test_dac(defs::VB_DS, "vb_ds", 1000); }
+        SECTION("vref_ds") { test_dac(defs::VREF_DS, "vref_ds", 480); }
+        SECTION("vref_comp") { test_dac(defs::VREF_COMP, "vref_comp", 420); }
+        // eiger
+        REQUIRE_THROWS(proxy.Call("vthreshold", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vsvp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vsvn", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtr", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vrf", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vrs", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtgstv", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_ll", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_lr", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcal", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_rl", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcmp_rr", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("rxb_rb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("rxb_lb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcn", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vis", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("iodelay", {}, -1, GET));
+        // gotthard
+        // REQUIRE_THROWS(proxy.Call("vref_ds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcascn_pb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcascp_pb", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vout_cm", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcasc_out", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vin_cm", {}, -1, GET));
+        // REQUIRE_THROWS(proxy.Call("vref_comp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("ib_test_c", {}, -1, GET));
+        // mythen3
+        REQUIRE_THROWS(proxy.Call("vpreamp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vshaper", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vshaperneg", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vipre", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("viinsh", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vdcsh", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth1", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth2", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vth3", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vpl", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vph", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vtrim", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcassh", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcas", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vicin", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vipre_out", {}, -1, GET));
+        // gotthard2
+        REQUIRE_THROWS(proxy.Call("vref_h_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_comp_fe", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_comp_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_cds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_rstore", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_opa_1st", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_comp_fe", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_adc1", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_l_adc", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vref_cds", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_cs", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vb_opa_fd", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("vcom_adc2", {}, -1, GET));        
+    }
+}
diff --git a/slsDetectorSoftware/tests/test-CmdProxy.cpp b/slsDetectorSoftware/tests/test-CmdProxy.cpp
index 6e1718503..05837569a 100644
--- a/slsDetectorSoftware/tests/test-CmdProxy.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy.cpp
@@ -64,432 +64,6 @@ TEST_CASE("initialchecks", "[.cmd]") {
     det.setInitialChecks(check);
 }
 
-// TEST_CASE("dacs", "[.cmd]") {
-//     REQUIRE_NOTHROW(multiSlsDetectorClient("daclist", GET));
-//     REQUIRE_NOTHROW(multiSlsDetectorClient("dacvalues", GET));
-//     int prev_val = 0;
-//     if (test::type == slsDetectorDefs::JUNGFRAU) {
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vb_ds", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vb_ds "));
-//             prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vb_ds 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vb_ds", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vb_ds 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vb_ds " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vb_comp", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vb_comp "));
-//             prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vb_comp 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vb_comp", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vb_comp 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vb_comp " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vb_pixbuf", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vb_pixbuf
-//             ")); prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vb_pixbuf 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vb_pixbuf", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vb_pixbuf 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vb_pixbuf " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_ds", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vref_ds "));
-//             prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_ds 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_ds", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vref_ds 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vref_ds " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_comp", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vref_comp
-//             ")); prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_comp 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_comp", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vref_comp 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vref_comp " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_prech", GET,
-//             nullptr, oss)); std::string s = (oss.str()).erase (0,
-//             strlen("vref_prech ")); prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_prech 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_prech", GET,
-//             nullptr, oss)); REQUIRE(oss.str() == "vref_prech 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vref_prech " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vin_com", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vin_com "));
-//             prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vin_com 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vin_com", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vin_com 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vin_com " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vdd_prot", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vdd_prot
-//             ")); prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vdd_prot 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vdd_prot", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vdd_prot 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vdd_prot " +
-//         std::to_string(prev_val), PUT));
-
-//         REQUIRE_THROWS(multiSlsDetectorClient("vthreshold", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vsvp", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vsvn", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vtr", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vrf", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vrs", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vtgstv", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_ll", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_lr", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcal", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_rl", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_rr", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("rxb_rb", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("rxb_lb", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcp", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcn", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vis", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("iodelay", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcascn_pb", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcascp_pb", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vout_cm", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcasc_out", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vin_cm", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("ib_test_c", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vpreamp", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vshaper", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vshaperneg", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vipre", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("viinsh", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vdcsh", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vth1", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vth2", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vth3", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vpl", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vph", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vtrim", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcassh", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcas", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vicin", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vipre_out", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_h_adc", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_fe", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_adc", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcom_cds", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_rstore", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_1st", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_comp_fe", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc1", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_l_adc", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_cds", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_cs", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_fd", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc2", GET));
-//     }
-
-//     else if (test::type == slsDetectorDefs::GOTTHARD) {
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_ds", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vref_ds "));
-//             prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_ds 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_ds", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vref_ds 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vref_ds " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vcascn_pb", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vcascn_pb
-//             ")); prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vcascn_pb 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vcascn_pb", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vcascn_pb 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vcascn_pb " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vcascp_pb", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vcascp_pb
-//             ")); prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vcascp_pb 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vcascp_pb", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vcascp_pb 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vcascp_pb " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vout_cm", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vout_cm "));
-//             prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vout_cm 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vout_cm", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vout_cm 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vout_cm " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vcasc_out", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vcasc_out
-//             ")); prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vcasc_out 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vcasc_out", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vcasc_out 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vcasc_out " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vin_cm", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vin_cm "));
-//             prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vin_cm 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vin_cm", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vin_cm 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vin_cm " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_comp", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("vref_comp
-//             ")); prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_comp 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("vref_comp", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "vref_comp 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("vref_comp " +
-//         std::to_string(prev_val), PUT));
-//         {
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("ib_test_c", GET, nullptr,
-//             oss)); std::string s = (oss.str()).erase (0, strlen("ib_test_c
-//             ")); prev_val = std::stoi(s);
-//         }
-//         {
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("ib_test_c 1000", PUT));
-//             std::ostringstream oss;
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("ib_test_c", GET, nullptr,
-//             oss)); REQUIRE(oss.str() == "ib_test_c 1000\n");
-//         }
-//         REQUIRE_NOTHROW(multiSlsDetectorClient("ib_test_c " +
-//         std::to_string(prev_val), PUT));
-
-//         REQUIRE_THROWS(multiSlsDetectorClient("vthreshold", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vsvp", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vsvn", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vtr", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vrf", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vrs", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vtgstv", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_ll", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_lr", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcal", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_rl", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_rr", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("rxb_rb", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("rxb_lb", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcp", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcn", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vis", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("iodelay", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vpreamp", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vshaper", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vshaperneg", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vipre", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("viinsh", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vdcsh", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vth1", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vth2", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vth3", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vpl", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vph", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vtrim", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcassh", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcas", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vicin", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vipre_out", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_h_adc", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_fe", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_adc", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcom_cds", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_rstore", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_1st", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_comp_fe", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc1", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_prech", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_l_adc", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_cds", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_cs", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_fd", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc2", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_ds", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_comp", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_pixbuf", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vin_com", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vdd_prot", GET));
-//     }
-
-//     else if (test::type == slsDetectorDefs::CHIPTESTBOARD) {
-//         for (int i = 0; i < 18; ++i) {
-//             {
-//                 std::ostringstream oss;
-//                 REQUIRE_NOTHROW(multiSlsDetectorClient("dac " +
-//                 std::to_string(i), GET, nullptr, oss)); std::string s =
-//                 (oss.str()).erase (0, ("dac " + std::to_string(i)).length() +
-//                 1); prev_val = std::stoi(s);
-//             }
-//             {
-//                 REQUIRE_NOTHROW(multiSlsDetectorClient("dac " +
-//                 std::to_string(i) + " 1000", PUT)); std::ostringstream oss;
-//                 REQUIRE_NOTHROW(multiSlsDetectorClient("dac " +
-//                 std::to_string(i), GET, nullptr, oss)); REQUIRE(oss.str() ==
-//                 "dac "  + std::to_string(i) + " 1000\n");
-//             }
-//             REQUIRE_NOTHROW(multiSlsDetectorClient("dac " + std::to_string(i)
-//             + " " + std::to_string(prev_val), PUT));
-//         }
-
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vthreshold", GET)); dac 0
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vsvp", GET));
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vsvn", GET));
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vtr", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vrf", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vrs", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vtgstv", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_ll", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_lr", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcal", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_rl", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcmp_rr", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("rxb_rb", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("rxb_lb", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcp", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcn", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vis", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("iodelay", GET));
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vref_ds", GET));
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vcascn_pb", GET));
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vcascp_pb", GET));
-//        // REQUIRE_THROWS(multiSlsDetectorClient("vout_cm", GET));
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vcasc_out", GET));
-//        // REQUIRE_THROWS(multiSlsDetectorClient("vin_cm", GET));
-//        // REQUIRE_THROWS(multiSlsDetectorClient("vref_comp", GET));
-//        // REQUIRE_THROWS(multiSlsDetectorClient("ib_test_c", GET));
-//        //REQUIRE_THROWS(multiSlsDetectorClient("vpreamp", GET));
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vshaper", GET));
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vshaperneg", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vipre", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("viinsh", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vdcsh", GET));
-//        // REQUIRE_THROWS(multiSlsDetectorClient("vth1", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vth2", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vth3", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vpl", GET));
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vph", GET));
-//         //REQUIRE_THROWS(multiSlsDetectorClient("vtrim", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcassh", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcas", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vicin", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vipre_out", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_h_adc", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_fe", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_comp_adc", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcom_cds", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_rstore", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_1st", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_comp_fe", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc1", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_prech", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_l_adc", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vref_cds", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_cs", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_opa_fd", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vcom_adc2", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_ds", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_comp", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vb_pixbuf", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vin_com", GET));
-//         REQUIRE_THROWS(multiSlsDetectorClient("vdd_prot", GET));
-//     }
-
-// }
 
 TEST_CASE("user", "[.cmd]") {
     Detector det;