diff --git a/integtest/insufficient_disk_space_test.py b/integtest/insufficient_disk_space_test.py
index a444881..80df384 100644
--- a/integtest/insufficient_disk_space_test.py
+++ b/integtest/insufficient_disk_space_test.py
@@ -105,19 +105,15 @@
 conf_dict.config_substitutions.append(
     data_classes.attribute_substitution(
         obj_class="RandomTCMakerConf",
-        updates={"trigger_rate_hz": trigger_rate},
-    )
-)
-conf_dict.config_substitutions.append(
-    data_classes.attribute_substitution(
-        obj_class="TCReadoutMap",
-        obj_id = "def-random-readout",
         updates={
-            "time_before": readout_window_time_before,
-            "time_after": readout_window_time_after,
+            "trigger_rate_hz": trigger_rate,
+            "candidate_backshift_ts": 0,
+            "candidate_window_before_ts": readout_window_time_before,
+            "candidate_window_after_ts": readout_window_time_after
         },
     )
 )
+
 conf_dict.config_substitutions.append(
     data_classes.attribute_substitution(
         obj_class="DataStoreConf",
diff --git a/integtest/large_trigger_record_test.py b/integtest/large_trigger_record_test.py
index b8c9760..b62fa75 100644
--- a/integtest/large_trigger_record_test.py
+++ b/integtest/large_trigger_record_test.py
@@ -102,7 +102,12 @@
 conf_dict.config_substitutions.append(
     data_classes.attribute_substitution(
         obj_class="RandomTCMakerConf",
-        updates={"trigger_rate_hz": trigger_rate},
+        updates={
+            "trigger_rate_hz": trigger_rate,
+            "candidate_backshift_ts": 0,
+            "candidate_window_before_ts": readout_window_time_before,
+            "candidate_window_after_ts": readout_window_time_after
+        },
     )
 )
 conf_dict.config_substitutions.append(
@@ -136,23 +141,15 @@
 )
 oversize_conf = copy.deepcopy(conf_dict)  # Copy before setting the readout window
 
-conf_dict.config_substitutions.append(
-    data_classes.attribute_substitution(
-        obj_class="TCReadoutMap",
-        updates={
-            "time_before": readout_window_time_before,
-            "time_after": readout_window_time_after,
-        },
-    )
-)
-
 # Now set the readout window for the over-size case
 oversize_conf.config_substitutions.append(
     data_classes.attribute_substitution(
-        obj_class="TCReadoutMap",
+        obj_class="RandomTCMakerConf",
         updates={
-            "time_before": 2.5 * readout_window_time_before,
-            "time_after": readout_window_time_after,
+            "trigger_rate_hz": trigger_rate,
+            "candidate_backshift_ts": 0,
+            "candidate_window_before_ts": 2.5 * readout_window_time_before,
+            "candidate_window_after_ts": readout_window_time_after
         },
     )
 )
diff --git a/integtest/trmonrequestor_test.py b/integtest/trmonrequestor_test.py
index f8929cc..0e1afe9 100755
--- a/integtest/trmonrequestor_test.py
+++ b/integtest/trmonrequestor_test.py
@@ -73,7 +73,12 @@
 substitution = data_classes.attribute_substitution(
     obj_id="random-tc-generator",
     obj_class="RandomTCMakerConf",
-    updates={"trigger_rate_hz": trigger_rate},
+    updates={
+        "trigger_rate_hz": trigger_rate,
+        "candidate_backshift_ts": 0,
+        "candidate_window_before_ts": readout_window_time_before,
+        "candidate_window_after_ts": readout_window_time_after
+    },
 )
 conf_dict.config_substitutions.append(substitution)