diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2
index 9c0e67ac..1fa55fd8 100644
--- a/scenarios/invite_callforward/0011_test.yml.tt2
+++ b/scenarios/invite_callforward/0011_test.yml.tt2
@@ -21,10 +21,6 @@ flow:
   - start|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_USERPROV_CLI:
-  - start|ROUTE_CHECK_USERPROV_CLI:
-  - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
diff --git a/scenarios/invite_callforward/0029_test.yml.tt2 b/scenarios/invite_callforward/0029_test.yml.tt2
index eb5542d9..646ad553 100644
--- a/scenarios/invite_callforward/0029_test.yml.tt2
+++ b/scenarios/invite_callforward/0029_test.yml.tt2
@@ -21,10 +21,6 @@ flow:
   - start|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_USERPROV_CLI:
-  - start|ROUTE_CHECK_USERPROV_CLI:
-  - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE:
diff --git a/scenarios/invite_ignore_allowip/0005_test.yml.tt2 b/scenarios/invite_ignore_allowip/0005_test.yml.tt2
index d4e62ca3..cd3b38d3 100644
--- a/scenarios/invite_ignore_allowip/0005_test.yml.tt2
+++ b/scenarios/invite_ignore_allowip/0005_test.yml.tt2
@@ -70,6 +70,8 @@ flow:
   - end|ROUTE_PREPARE_CALLER_CLI:
   - start|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - end|ROUTE_PREPARE_CALLER_CLI:
   - end|ROUTE_SET_CALLER_CLI:
   - start|ROUTE_SET_CALLEE:
   - end|ROUTE_SET_CALLEE:
@@ -116,7 +118,7 @@ sip_out:
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
+      'P-App-Param: ;su=testuser1003;sr=[\w\.]+;sp=testuser;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
   - [
diff --git a/scenarios/invite_voicebox/0005_test.yml.tt2 b/scenarios/invite_voicebox/0005_test.yml.tt2
index 93204e19..5cd31595 100644
--- a/scenarios/invite_voicebox/0005_test.yml.tt2
+++ b/scenarios/invite_voicebox/0005_test.yml.tt2
@@ -20,10 +20,6 @@ flow:
   - start|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_CLI_ALLOWED:
   - end|ROUTE_CHECK_USERPROV_CLI:
-  - start|ROUTE_CHECK_USERPROV_CLI:
-  - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CLIR:
   - end|ROUTE_CLIR:
   - start|ROUTE_FIND_CALLEE: