diff --git a/scenarios/invite_blockin_blst/0003_test.yml.tt2 b/scenarios/invite_blockin_blst/0003_test.yml.tt2
index b2068691..8e9d4df8 100644
--- a/scenarios/invite_blockin_blst/0003_test.yml.tt2
+++ b/scenarios/invite_blockin_blst/0003_test.yml.tt2
@@ -49,8 +49,6 @@ flow:
   - end|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
   - end|ROUTE_ACC_CALLEE:
-  - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
   - end|ROUTE_ACC_FAILURE:
   - start|ROUTE_EARLY_REJECT:
   - start|ROUTE_ADD_CALLINFO_REPLY:
diff --git a/scenarios/invite_blockin_clir/0003_test.yml.tt2 b/scenarios/invite_blockin_clir/0003_test.yml.tt2
index b2068691..8e9d4df8 100644
--- a/scenarios/invite_blockin_clir/0003_test.yml.tt2
+++ b/scenarios/invite_blockin_clir/0003_test.yml.tt2
@@ -49,8 +49,6 @@ flow:
   - end|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
   - end|ROUTE_ACC_CALLEE:
-  - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
   - end|ROUTE_ACC_FAILURE:
   - start|ROUTE_EARLY_REJECT:
   - start|ROUTE_ADD_CALLINFO_REPLY:
diff --git a/scenarios/invite_blockin_wlst/0003_test.yml.tt2 b/scenarios/invite_blockin_wlst/0003_test.yml.tt2
index b2068691..8e9d4df8 100644
--- a/scenarios/invite_blockin_wlst/0003_test.yml.tt2
+++ b/scenarios/invite_blockin_wlst/0003_test.yml.tt2
@@ -49,8 +49,6 @@ flow:
   - end|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
   - end|ROUTE_ACC_CALLEE:
-  - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
   - end|ROUTE_ACC_FAILURE:
   - start|ROUTE_EARLY_REJECT:
   - start|ROUTE_ADD_CALLINFO_REPLY:
diff --git a/scenarios/invite_callforward/0009_test.yml.tt2 b/scenarios/invite_callforward/0009_test.yml.tt2
index 4e3d6376..879e6101 100644
--- a/scenarios/invite_callforward/0009_test.yml.tt2
+++ b/scenarios/invite_callforward/0009_test.yml.tt2
@@ -58,12 +58,10 @@ flow:
   - end|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
   - end|ROUTE_ACC_CALLEE:
-  - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
   - end|ROUTE_ACC_CF:
+  - start|ROUTE_EXECUTE_CF_LOOP:
   - start|ROUTE_SET_CALLER_DIALOG:
   - end|ROUTE_SET_CALLER_DIALOG:
-  - start|ROUTE_EXECUTE_CF_LOOP:
   - start|BRANCH_ROUTE_FWD_LOOP:
   - start|ROUTE_ADD_CALLINFO:
   - end|ROUTE_ADD_CALLINFO:
diff --git a/scenarios/invite_concurrent_max_out/0007_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0007_test.yml.tt2
index b8c5e696..acbcd6df 100644
--- a/scenarios/invite_concurrent_max_out/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0007_test.yml.tt2
@@ -43,8 +43,6 @@ flow:
   - start|ROUTE_BLOCK_OUT:
   - end|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
-  - start|ROUTE_SET_CALLER_DIALOG:
-  - end|ROUTE_SET_CALLER_DIALOG:
   - start|ROUTE_BLOCK_IN:
   - end|ROUTE_BLOCK_IN:
   - end|ROUTE_LOAD_CALLEE_PREF:
@@ -56,6 +54,8 @@ flow:
   - end|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
   - end|ROUTE_ACC_CALLEE:
+  - start|ROUTE_SET_CALLER_DIALOG:
+  - end|ROUTE_SET_CALLER_DIALOG:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - end|ROUTE_BRANCH_ACC_RTP:
diff --git a/scenarios/invite_concurrent_max_out/0018_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0018_test.yml.tt2
index bae6b50c..3d436a1a 100644
--- a/scenarios/invite_concurrent_max_out/0018_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0018_test.yml.tt2
@@ -42,6 +42,17 @@ flow:
   - start|ROUTE_BLOCK_OUT:
   - end|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_BLOCK_IN:
+  - end|ROUTE_BLOCK_IN:
+  - end|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
+  - start|ROUTE_INVITE_TO_INT:
+  - start|ROUTE_OUTBOUND:
+  - start|ROUTE_ACC_CALLER:
+  - end|ROUTE_ACC_CALLER:
+  - start|ROUTE_ACC_CALLEE:
+  - end|ROUTE_ACC_CALLEE:
   - start|ROUTE_SET_CALLER_DIALOG:
   - start|ROUTE_ACC_FAILURE:
   - start|ROUTE_ACC_CALLER: