diff --git a/scenarios_pbx/invite/0005_test.yml.tt2 b/scenarios_pbx/invite/0005_test.yml.tt2
index b39ae006..18bbcc39 100644
--- a/scenarios_pbx/invite/0005_test.yml.tt2
+++ b/scenarios_pbx/invite/0005_test.yml.tt2
@@ -52,8 +52,6 @@ flow:
   - start|ROUTE_NCOS:
   - return|ROUTE_NCOS:
   - return|ROUTE_NCOS_CHECK:
-  - start|ROUTE_BLOCK_OUT:
-  - return|ROUTE_BLOCK_OUT:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
   - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
@@ -65,8 +63,8 @@ flow:
   - return|ROUTE_ORDER_CF_MAP_ID:
   - return|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_CHECK_PBX:
-  - return|ROUTE_CHECK_PBX:
-  - start|ROUTE_INVITE_TO_INT:
+  - start|ROUTE_APPEND_PBX_HDRS:
+  - return|ROUTE_APPEND_PBX_HDRS:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_SET_CALLER_DIALOG:
   - return|ROUTE_SET_CALLER_DIALOG:
@@ -74,42 +72,25 @@ flow:
   - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
   - return|ROUTE_ACC_CALLEE:
-  - start|BRANCH_ROUTE_SBC:
-  - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
-  - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
-  - start|ROUTE_SET_CALLEE_DIALOG:
-  - return|ROUTE_SET_CALLEE_DIALOG:
+  - start|BRANCH_ROUTE_NO_SBC:
   - start|ROUTE_BRANCH_ACC_RTP:
   - return|ROUTE_BRANCH_ACC_RTP:
-  - start|ROUTE_SET_RUSER:
-  - return|ROUTE_SET_RUSER:
   - start|ROUTE_FILTER_PRACK:
   - return|ROUTE_FILTER_PRACK:
+  - start|ROUTE_PREPARE_MOH_PBX:
+  - return|ROUTE_PREPARE_MOH_PBX:
   - start|ROUTE_PREPARE_SST:
   - return|ROUTE_PREPARE_SST:
-  - start|ROUTE_PREPARE_MOH:
-  - return|ROUTE_PREPARE_MOH:
-  - start|ROUTE_SET_CALLER_CLI:
-  - start|ROUTE_PREPARE_CALLER_CLI:
-  - return|ROUTE_PREPARE_CALLER_CLI:
-  - start|ROUTE_PREPARE_CALLER_CLI:
-  - return|ROUTE_PREPARE_CALLER_CLI:
-  - start|ROUTE_PREPARE_CALLER_CLI:
-  - return|ROUTE_PREPARE_CALLER_CLI:
-  - start|ROUTE_PREPARE_CALLER_CLI:
-  - return|ROUTE_PREPARE_CALLER_CLI:
-  - start|ROUTE_PREPARE_CALLER_CLI:
-  - return|ROUTE_PREPARE_CALLER_CLI:
-  - return|ROUTE_SET_CALLER_CLI:
-  - start|ROUTE_SET_CALLEE:
-  - return|ROUTE_SET_CALLEE:
+  - start|ROUTE_LOAD_PBXSRV:
+  - return|ROUTE_LOAD_PBXSRV:
   - start|ROUTE_ADD_CALLINFO:
   - return|ROUTE_ADD_CALLINFO:
-  - return|BRANCH_ROUTE_SBC:
-  - return|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_NO_SBC:
+  - return|BRANCH_ROUTE_NO_SBC:
   - exit|ROUTE_OUTBOUND:
+
 sip_in:
-  - '^INVITE'
+  - '^INVITE sip:1003'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
@@ -126,18 +107,21 @@ sip_out:
       '^SIP/2.0 101 Connecting',
       'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:1003@'
+      'To: <sip:1003@',
+      'P-Caller-UUID: \w+',
+      'P-NGCP-Caller-Info: <sip:testuser1002@'
     ]
   - [
       '^INVITE sip:testuser1003@',
       'CSeq: 2 INVITE',
-      'From: <sip:4311002@',
-      'To: <sip:1003@',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1003@',
       'Content-Type: application/sdp',
       'P-Caller-UUID: \w+',
       '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-NGCP-Lookup-Ext: 1003',
+      'P-NGCP-Orig-User: 43110021003',
+      'P-NGCP-Orig-Dialed: 1003',
+      'P-App-Param: ;aleg_sst_enable=no;sst_enable=no;a_park_domain=\d+;b_park_domain=\d+',
       'P-App-Name: sbc'
     ]
diff --git a/scenarios_pbx/invite/0006_test.yml.tt2 b/scenarios_pbx/invite/0006_test.yml.tt2
new file mode 100644
index 00000000..7915c06f
--- /dev/null
+++ b/scenarios_pbx/invite/0006_test.yml.tt2
@@ -0,0 +1,10 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - 'SIP/2.0 100 Trying'
+  - 'From: <sip:testuser1002'
+  - 'To: <sip:testuser1003'
+  - 'CSeq: 2 INVITE'
+  - 'Content-Length: 0'
+sip_out: []
diff --git a/scenarios_pbx/invite/0007_test.yml.tt2 b/scenarios_pbx/invite/0007_test.yml.tt2
index 1c18ea97..b42e782b 100644
--- a/scenarios_pbx/invite/0007_test.yml.tt2
+++ b/scenarios_pbx/invite/0007_test.yml.tt2
@@ -1,11 +1,134 @@
 flow:
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_INVITE:
+  - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
+  - return|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
+  - start|ROUTE_FIND_CALLER:
+  - return|ROUTE_FIND_CALLER:
+  - start|ROUTE_LOAD_CALLER_PREF:
+  - start|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_PREF:
+  - start|ROUTE_LOAD_CALLER_CONTRACT_PREF:
+  - return|ROUTE_LOAD_CALLER_CONTRACT_PREF:
+  - return|ROUTE_LOAD_CALLER_PREF:
+  - start|ROUTE_GET_CALLER_CLI:
+  - return|ROUTE_GET_CALLER_CLI:
+  - start|ROUTE_GET_FORWARDER_CLI:
+  - return|ROUTE_GET_FORWARDER_CLI:
+  - start|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_CLI_ALLOWED:
+  - return|ROUTE_CHECK_USERPROV_CLI:
+  - start|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
+  - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
+  - start|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
+  - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
+  - start|ROUTE_SET_CALLEE_DIALOG:
+  - return|ROUTE_SET_CALLEE_DIALOG:
+  - start|ROUTE_BLOCK_IN:
+  - return|ROUTE_BLOCK_IN:
+  - start|ROUTE_ORDER_CF_MAP_ID:
+  - return|ROUTE_ORDER_CF_MAP_ID:
+  - return|ROUTE_LOAD_CALLEE_PREF:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
+  - start|ROUTE_INVITE_TO_INT:
+  - start|ROUTE_OUTBOUND:
+  - start|ROUTE_SET_CALLER_DIALOG:
+  - return|ROUTE_SET_CALLER_DIALOG:
+  - start|BRANCH_ROUTE_SBC:
+  - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
+  - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
+  - start|ROUTE_SET_CALLEE_DIALOG:
+  - return|ROUTE_SET_CALLEE_DIALOG:
+  - start|ROUTE_BRANCH_ACC_RTP:
+  - return|ROUTE_BRANCH_ACC_RTP:
+  - start|ROUTE_SET_RUSER:
+  - return|ROUTE_SET_RUSER:
+  - start|ROUTE_FILTER_PRACK:
+  - return|ROUTE_FILTER_PRACK:
+  - start|ROUTE_PREPARE_SST:
+  - return|ROUTE_PREPARE_SST:
+  - start|ROUTE_PREPARE_MOH:
+  - return|ROUTE_PREPARE_MOH:
+  - start|ROUTE_SET_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - start|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_PREPARE_CALLER_CLI:
+  - return|ROUTE_SET_CALLER_CLI:
+  - start|ROUTE_SET_CALLEE:
+  - return|ROUTE_SET_CALLEE:
+  - start|ROUTE_ADD_CALLINFO:
+  - return|ROUTE_ADD_CALLINFO:
+  - return|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  - exit|ROUTE_OUTBOUND:
 sip_in:
-  - '^SIP/2.0 180 Ringing'
-  - 'CSeq: 2 INVITE'
+  - 'INVITE sip:testuser1003@'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:testuser1003@'
+  - 'CSeq: 10 INVITE'
+  - 'Max-Forwards: 70'
+  - 'P-NGCP-Lookup-Ext: 1003'
+  - 'P-NGCP-Orig-User: 43110021003'
+  - 'P-NGCP-Orig-Domain: spce.test'
+  - 'P-NGCP-Orig-Dialed: 1003'
+  - 'P-NGCP-BlockOut-Override: 0'
+  - 'P-NGCP-AdmBlockOut-Override: 0'
+  - 'P-NGCP-ContBlockOut-Override: 0'
+  - 'P-NGCP-ContAdmBlockOut-Override: 0'
+  - 'P-Caller-CLIR: 0'
+  - 'P-Caller-UUID: \w+'
+  - 'P-Callee-UUID: \w+'
+  - 'P-NGCP-Caller-Info: <sip:testuser1002@'
+  - 'P-NGCP-Callee-Info: <sip:43110021003@spce.test>;ip=127.0.0.1;port=5085;'
+  - 'P-To-Device: 1'
+  - 'Content-Type: application/sdp'
+  - 'Contact: <sip:127.0.0.1:5085;transport=udp>'
 sip_out:
   - [
-      '^SIP/2.0 180 Ringing',
-      'CSeq: 2 INVITE',
+      'SIP/2.0 100 Trying',
+      'Via: SIP/2.0/UDP 127.0.0.1:5085;branch=',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1003@',
+      'CSeq: 10 INVITE',
+      'Content-Length: 0'
+   ]
+  - [
+       'INVITE sip:testuser1003@',
+       'From: <sip:4311002@',
+       'To: <sip:testuser1003@',
+       'CSeq: 10 INVITE',
+       'Max-Forwards: 69',
+       'P-NGCP-Lookup-Ext: 1003',
+       'Content-Type: application/sdp',
+       'Contact: <sip:127.0.0.1:5085;transport=udp>',
+       'Call-Info: <sip:spce.test>;appearance-index=1',
+       'P-Caller-UUID: \w+',
+       '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-Name: sbc',
+       'P-NGCP-Caller-Info: <sip:testuser1002@',
+       'P-NGCP-Callee-Info: <sip:43110021003@',
+       'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
     ]
diff --git a/scenarios_pbx/invite/0009_test.yml.tt2 b/scenarios_pbx/invite/0009_test.yml.tt2
index e1257cbb..eed8f56a 100644
--- a/scenarios_pbx/invite/0009_test.yml.tt2
+++ b/scenarios_pbx/invite/0009_test.yml.tt2
@@ -1,21 +1,11 @@
 flow:
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - start|ROUTE_PRX_REQUEST:
-  - start|ROUTE_INITVARS:
-  - return|ROUTE_INITVARS:
-  - start|ROUTE_OUTBOUND:
-  - return|ROUTE_OUTBOUND:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
-  - 'CSeq: 2 ACK'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:1003@'
+  - '^SIP/2.0 180 Ringing'
+  - 'CSeq: 10 INVITE'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
-      'CSeq: 2 ACK',
-      'From: <sip:4311002@',
-      'To: <sip:1003@'
+      '^SIP/2.0 180 Ringing',
+      'CSeq: 10 INVITE',
     ]
diff --git a/scenarios_pbx/invite/0010_test.yml.tt2 b/scenarios_pbx/invite/0010_test.yml.tt2
index 9220f8c4..1c18ea97 100644
--- a/scenarios_pbx/invite/0010_test.yml.tt2
+++ b/scenarios_pbx/invite/0010_test.yml.tt2
@@ -1,42 +1,11 @@
 flow:
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - start|ROUTE_PRX_REQUEST:
-  - start|ROUTE_INITVARS:
-  - return|ROUTE_INITVARS:
-  - 'start|dialog:end':
-  - 'return|dialog:end':
-  - 'return|dialog:end':
-  - start|ROUTE_STOP_RTPPROXY:
-  - start|ROUTE_RESTORE_CLUSTERSET:
-  - return|ROUTE_RESTORE_CLUSTERSET:
-  - return|ROUTE_STOP_RTPPROXY:
-  - start|ROUTE_OUTBOUND:
-  - exit|ROUTE_OUTBOUND:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
-  - 'CSeq: 3 BYE'
-  - 'Max-Forwards: 69'
-  - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:1003@'
-
+  - '^SIP/2.0 180 Ringing'
+  - 'CSeq: 2 INVITE'
 sip_out:
   - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 3 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:1003@'
-    ]
-  - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
-      'CSeq: 3 BYE',
-      'Max-Forwards: 68',
-      'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:1003@'
+      '^SIP/2.0 180 Ringing',
+      'CSeq: 2 INVITE',
     ]
diff --git a/scenarios_pbx/invite/0011_test.yml.tt2 b/scenarios_pbx/invite/0011_test.yml.tt2
index cbeb9229..ba41b7ac 100644
--- a/scenarios_pbx/invite/0011_test.yml.tt2
+++ b/scenarios_pbx/invite/0011_test.yml.tt2
@@ -1,17 +1,16 @@
 flow:
   - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
+  - 'start|dialog:start':
+  - 'return|dialog:start':
+  # branch ??
+  - 'return|dialog:start':
 sip_in:
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 3 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:1003@'
+  - 'CSeq: 10 INVITE'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 3 BYE',
-      'Content-Length: 0',
+      'CSeq: 10 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:1003@'
+      'To: <sip:testuser1003@'
     ]
diff --git a/scenarios_pbx/invite/0008_test.yml.tt2 b/scenarios_pbx/invite/0012_test.yml.tt2
similarity index 90%
rename from scenarios_pbx/invite/0008_test.yml.tt2
rename to scenarios_pbx/invite/0012_test.yml.tt2
index c0bf2269..4afff712 100644
--- a/scenarios_pbx/invite/0008_test.yml.tt2
+++ b/scenarios_pbx/invite/0012_test.yml.tt2
@@ -12,5 +12,5 @@ sip_out:
       '^SIP/2.0 200 OK',
       'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:1003@'
+      'To: <sip:testuser1003@'
     ]
diff --git a/scenarios_pbx/invite/0013_test.yml.tt2 b/scenarios_pbx/invite/0013_test.yml.tt2
new file mode 100644
index 00000000..98b63550
--- /dev/null
+++ b/scenarios_pbx/invite/0013_test.yml.tt2
@@ -0,0 +1,21 @@
+flow:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_OUTBOUND:
+  - return|ROUTE_OUTBOUND:
+sip_in:
+  - '^ACK sip:127.0.0.1:5085;prxroute=1 SIP/2.0'
+  - 'CSeq: 2 ACK'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:1003@'
+sip_out:
+  - [
+      '^ACK sip:127.0.0.1:5085;prxroute=1 SIP/2.0',
+      'CSeq: 2 ACK',
+      'From: <sip:testuser1002@',
+      'To: <sip:1003@'
+    ]
diff --git a/scenarios_pbx/invite/0014_test.yml.tt2 b/scenarios_pbx/invite/0014_test.yml.tt2
new file mode 100644
index 00000000..e050dfef
--- /dev/null
+++ b/scenarios_pbx/invite/0014_test.yml.tt2
@@ -0,0 +1,21 @@
+flow:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_OUTBOUND:
+  - return|ROUTE_OUTBOUND:
+sip_in:
+  - '^ACK sip:testuser1003@127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - 'CSeq: 10 ACK'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:testuser1003@'
+sip_out:
+  - [
+      '^ACK sip:testuser1003@127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      'CSeq: 10 ACK',
+      'From: <sip:4311002@',
+      'To: <sip:testuser1003@'
+    ]
diff --git a/scenarios_pbx/invite/0015_test.yml.tt2 b/scenarios_pbx/invite/0015_test.yml.tt2
new file mode 100644
index 00000000..2fbb81cd
--- /dev/null
+++ b/scenarios_pbx/invite/0015_test.yml.tt2
@@ -0,0 +1,42 @@
+flow:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - 'start|dialog:end':
+  - 'return|dialog:end':
+  - 'return|dialog:end':
+  - start|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_OUTBOUND:
+  - exit|ROUTE_OUTBOUND:
+sip_in:
+  - '^BYE sip:127.0.0.1:5085(;prxroute=1)? SIP/2.0'
+  - 'Contact: sip:testuser1002@'
+  - 'CSeq: 3 BYE'
+  - 'Max-Forwards: 69'
+  - 'Content-Length: 0'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:1003@'
+
+sip_out:
+  - [
+      '^SIP/2.0 100 Trying',
+      'CSeq: 3 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:1003@'
+    ]
+  - [
+      '^BYE sip:127.0.0.1:5085(;prxroute=1)? SIP/2.0',
+      'Contact: sip:testuser1002@',
+      'CSeq: 3 BYE',
+      'Max-Forwards: 68',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:1003@'
+    ]
diff --git a/scenarios_pbx/invite/0016_test.yml.tt2 b/scenarios_pbx/invite/0016_test.yml.tt2
new file mode 100644
index 00000000..5f708a07
--- /dev/null
+++ b/scenarios_pbx/invite/0016_test.yml.tt2
@@ -0,0 +1,41 @@
+flow:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - 'start|dialog:end':
+  - 'return|dialog:end':
+  - 'return|dialog:end':
+  - start|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_OUTBOUND:
+  - exit|ROUTE_OUTBOUND:
+sip_in:
+  - '^BYE sip:testuser1003@127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - 'CSeq: 11 BYE'
+  - 'Max-Forwards: 70'
+  - 'Content-Length: 0'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:testuser1003@'
+  - 'P-Asserted-Identity: \"1003\" <sip:1003@'
+
+sip_out:
+  - [
+      '^SIP/2.0 100 Trying',
+      'CSeq: 11 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]
+  - [
+      '^BYE sip:testuser1003@127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      'CSeq: 11 BYE',
+      'Max-Forwards: 69',
+      'Content-Length: 0',
+      'From: <sip:4311002@',
+      'To: <sip:testuser1003@'
+    ]
diff --git a/scenarios_pbx/invite/0017_test.yml.tt2 b/scenarios_pbx/invite/0017_test.yml.tt2
new file mode 100644
index 00000000..094eb844
--- /dev/null
+++ b/scenarios_pbx/invite/0017_test.yml.tt2
@@ -0,0 +1,17 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 11 BYE'
+  - 'Content-Length: 0'
+  - 'From: <sip:4311002@'
+  - 'To: <sip:testuser1003@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 11 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]
diff --git a/scenarios_pbx/invite/0018_test.yml.tt2 b/scenarios_pbx/invite/0018_test.yml.tt2
new file mode 100644
index 00000000..a39f6314
--- /dev/null
+++ b/scenarios_pbx/invite/0018_test.yml.tt2
@@ -0,0 +1,17 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 3 BYE'
+  - 'Content-Length: 0'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:1003@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 3 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:1003@'
+    ]
diff --git a/scenarios_pbx/invite/scenario.yml b/scenarios_pbx/invite/scenario.yml
index 5bd3229e..0e7b3c18 100644
--- a/scenarios_pbx/invite/scenario.yml
+++ b/scenarios_pbx/invite/scenario.yml
@@ -22,10 +22,6 @@ subscribers:
       sn: 1002
       is_pbx_pilot: 1
       pbx_extension: 1002
-      alias_numbers:
-        - cc: 34
-          ac: 96
-          sn: 5711941
     testuser1003:
       customer: 'customerpbx.test'
       password: testuser
diff --git a/scenarios_pbx/invite/sipp_scenario00.xml b/scenarios_pbx/invite/sipp_scenario00.xml
index 0b1df0a2..7d0224f2 100644
--- a/scenarios_pbx/invite/sipp_scenario00.xml
+++ b/scenarios_pbx/invite/sipp_scenario00.xml
@@ -4,7 +4,7 @@
   <send start_rtd="1" start_rtd="2">
     <![CDATA[
 
-      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
+      INVITE sip:[field5 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field5 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
@@ -35,7 +35,7 @@
   <send>
     <![CDATA[
 
-      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
+      ACK sip:[field5 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field5 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
@@ -53,7 +53,7 @@
   <send start_rtd="3">
     <![CDATA[
 
-      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
+      INVITE sip:[field5 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field5 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>