diff --git a/MooreOnlineConf/options/calib.py b/MooreOnlineConf/options/calib.py
index f9855c0c669a0fb10b9b4d39e54da7a4d8947162..cc2a2320082c453133c2f940cdf321cc4fb2d80c 100644
--- a/MooreOnlineConf/options/calib.py
+++ b/MooreOnlineConf/options/calib.py
@@ -35,5 +35,7 @@ public_tools = [
     stateProvider_with_simplified_geom()
 ]
 
+options.output_type = 'None'
+
 with config_pp_2025(), reconstruction.bind(from_file=False):
     run_moore(options, make_lines, public_tools)
diff --git a/MooreOnlineConf/options/online.py b/MooreOnlineConf/options/online.py
index ba74e00052dbd848d69ed0eadcda9d852d97b644..58c3f8d9740551dfa64dc79d856dc1d0057165de 100644
--- a/MooreOnlineConf/options/online.py
+++ b/MooreOnlineConf/options/online.py
@@ -61,7 +61,8 @@ application.monSvc.disableDeclareInfoHistos = True
 if task_type == "RecoMon":
     # intermediate saveset period in seconds, for RecoMon a bit more often than for the others
     application.updateAndReset.saverCycle = 300
-elif task_type == "CalibMon":
+elif task_type == "CalibMon" and not is_testbench:
+    ## note that contrary to the testbench Online CalibMon only produces histograms at the end of the run
     application.monSvc.HistUpdateOnStop = True
     application.updateAndReset.saveHistograms = 0
 elif task_type != "HLT2":
diff --git a/MooreScripts/scripts/testbench.py b/MooreScripts/scripts/testbench.py
index 1340570063df920771dffeaf6ef8bb66bf25a97e..adf99f38210ed21da2ffa0bdbbd4255b3ddf8bd4 100755
--- a/MooreScripts/scripts/testbench.py
+++ b/MooreScripts/scripts/testbench.py
@@ -32,6 +32,14 @@ def scenario(s):
     return importlib.import_module("." + s, scenarios.__package__)
 
 
+def non_negative_float(value):
+    ivalue = float(value)
+    if ivalue < 0:
+        raise argparse.ArgumentTypeError(
+            f"Invalid value: {ivalue}. Must be >= 0.")
+    return ivalue
+
+
 parser = argparse.ArgumentParser(allow_abbrev=False)
 parser.add_argument(
     "architecture",
@@ -107,8 +115,9 @@ parser.add_argument(
 parser.add_argument(
     "--measure-throughput",
     default=10,
-    type=float,
-    help="How long to measure throughput for.",
+    type=non_negative_float,
+    help=
+    "How long to measure throughput for. Has to be >=0. If specifying 0 will run over all files in the directory.",
 )
 parser.add_argument(
     "--delay-tp-measurement",