diff --git a/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2
index c60c8719..c8d8da30 100644
--- a/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2
@@ -31,6 +31,8 @@ flow:
   - return|ROUTE_CHECK_UA:
   - start|ROUTE_LOAD_CALLER_CONTRACT_PREF:
   - return|ROUTE_LOAD_CALLER_CONTRACT_PREF:
+  - start|ROUTE_LOAD_CALLER_RESELLER_PREF:
+  - return|ROUTE_LOAD_CALLER_RESELLER_PREF:
   - start|ROUTE_DLG_MANAGE:
   - return|ROUTE_DLG_MANAGE:
   - return|ROUTE_LOAD_CALLER_PREF:
@@ -58,6 +60,8 @@ flow:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
   - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
+  - start|ROUTE_LOAD_CALLEE_RESELLER_PREF:
+  - return|ROUTE_LOAD_CALLEE_RESELLER_PREF:
   - start|ROUTE_SET_CALLEE_DIALOG:
   - start|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_CNT_DLG_CHECK:
@@ -93,6 +97,8 @@ flow:
   - start|ROUTE_INVITE_TO_INT:
   - start|ROUTE_APPLY_HEADER_RULES:
   - return|ROUTE_APPLY_HEADER_RULES:
+  - start|ROUTE_CHECK_APPSRV:
+  - return|ROUTE_CHECK_APPSRV:
   - start|ROUTE_CF_CFU:
   - return|ROUTE_CF_CFU:
   - start|ROUTE_CNT_DLG_CHECK:
@@ -124,6 +130,8 @@ flow:
   - start|BRANCH_ROUTE_SBC:
   - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
   - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
+  - start|ROUTE_LOAD_CALLEE_RESELLER_PREF:
+  - return|ROUTE_LOAD_CALLEE_RESELLER_PREF:
   - start|ROUTE_SET_CALLEE_DIALOG:
   - start|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_CNT_DLG_CHECK:
@@ -175,6 +183,8 @@ flow:
   - return|BRANCH_ROUTE_SBC:
   - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
   - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
+  - start|ROUTE_LOAD_CALLEE_RESELLER_PREF:
+  - return|ROUTE_LOAD_CALLEE_RESELLER_PREF:
   - start|ROUTE_SET_CALLEE_DIALOG:
   - start|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_CNT_DLG_CHECK:
diff --git a/scenarios_pbx/incoming_shared_line/0020_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0020_test.yml.tt2
index 63077878..36a060ab 100644
--- a/scenarios_pbx/incoming_shared_line/0020_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0020_test.yml.tt2
@@ -8,6 +8,10 @@ flow:
   - start|ROUTE_PREPARE_UA:
   - return|ROUTE_PREPARE_UA:
   - start|REPLY_ROUTE_NAT_CONTINUE:
+  - start|ROUTE_STOP_RTPPROXY_BRANCH:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY_BRANCH:
   - start|ROUTE_EXIT:
   - start|ROUTE_RUNTIME:
   - return|ROUTE_RUNTIME:
diff --git a/scenarios_pbx/invite_alias_devid/0016_test.yml.tt2 b/scenarios_pbx/invite_alias_devid/0016_test.yml.tt2
index b1466252..5720f979 100644
--- a/scenarios_pbx/invite_alias_devid/0016_test.yml.tt2
+++ b/scenarios_pbx/invite_alias_devid/0016_test.yml.tt2
@@ -15,7 +15,7 @@ flow:
   - return|REPLY_ROUTE_RTPENGINE:
   - start|REPLY_ROUTE_NAT_CONTINUE:
   - start|ROUTE_EXIT:
-      $avp(s:0-callee_rU): ["4311003"]
+      $avp(s:0-callee_rU): ["[% invite_alias_devid_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]"]
   - start|ROUTE_RUNTIME:
   - return|ROUTE_RUNTIME:
   - start|dialog:start:
diff --git a/scenarios_pbx/invite_manager/0023_test.yml.tt2 b/scenarios_pbx/invite_manager/0023_test.yml.tt2
index eaf4b0dd..31d0743c 100644
--- a/scenarios_pbx/invite_manager/0023_test.yml.tt2
+++ b/scenarios_pbx/invite_manager/0023_test.yml.tt2
@@ -127,8 +127,6 @@ flow:
   - start|ROUTE_CHECK_APPSRV:
   - return|ROUTE_CHECK_APPSRV:
   - start|ROUTE_CF_CFU:
-  - start|ROUTE_LOAD_CF_MAP:
-  - return|ROUTE_LOAD_CF_MAP:
   - start|ROUTE_CHECK_CF:
   - return|ROUTE_CHECK_CF:
   - start|ROUTE_PLAY_ANNOUNCE_BEFORE_CF:
diff --git a/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2 b/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2
index 21e421ea..57e13b53 100644
--- a/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2
+++ b/scenarios_pbx/invite_manager_2sec/0025_test.yml.tt2
@@ -127,8 +127,6 @@ flow:
   - start|ROUTE_CHECK_APPSRV:
   - return|ROUTE_CHECK_APPSRV:
   - start|ROUTE_CF_CFU:
-  - start|ROUTE_LOAD_CF_MAP:
-  - return|ROUTE_LOAD_CF_MAP:
   - start|ROUTE_CHECK_CF:
   - return|ROUTE_CHECK_CF:
   - start|ROUTE_PLAY_ANNOUNCE_BEFORE_CF: