diff --git a/scenarios/invite_concurrent_max_out/0001_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0001_test.yml.tt2
new file mode 100644
index 00000000..cf91b29e
--- /dev/null
+++ b/scenarios/invite_concurrent_max_out/0001_test.yml.tt2
@@ -0,0 +1,35 @@
+flow:
+  - 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:
+  - start|ROUTE_AUTH:
+  - exit|ROUTE_AUTH:
+sip_in:
+  - '^INVITE sip:004321001@'
+  - 'Contact: sip:testuser1002@'
+  - 'To: <sip:004321001@'
+  - 'CSeq: 1 INVITE'
+  - 'Max-Forwards: 69'
+  - 'Content-Type: application/sdp'
+sip_out:
+  - [
+      '^SIP/2.0 100 Trying',
+      'CSeq: 1 INVITE',
+      'From: <sip:testuser1002@',
+      'To: <sip:004321001@'
+    ]
+  - [
+      '^SIP/2.0 407 Proxy Authentication Required',
+      'CSeq: 1 INVITE',
+      'From: <sip:testuser1002@',
+      'To: <sip:004321001@'
+    ]
diff --git a/scenarios/invite_concurrent_max_out/0007_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0003_test.yml.tt2
similarity index 89%
rename from scenarios/invite_concurrent_max_out/0007_test.yml.tt2
rename to scenarios/invite_concurrent_max_out/0003_test.yml.tt2
index c0de36d4..62e1e97e 100644
--- a/scenarios/invite_concurrent_max_out/0007_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0003_test.yml.tt2
@@ -43,13 +43,14 @@ flow:
   - return|ROUTE_NCOS:
   - start|ROUTE_BLOCK_OUT:
   - return|ROUTE_BLOCK_OUT:
-  - start|ROUTE_LOAD_CALLEE_PREF:
-  - start|ROUTE_BLOCK_IN:
-  - return|ROUTE_BLOCK_IN:
-  - return|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_CHECK_PBX:
   - return|ROUTE_CHECK_PBX:
-  - start|ROUTE_INVITE_TO_INT:
+  - start|ROUTE_INVITE_TO_EXT:
+  - start|ROUTE_PSTN:
+  - start|ROUTE_CLEAR_PEER_OUT_PREF:
+  - return|ROUTE_CLEAR_PEER_OUT_PREF:
+  - start|ROUTE_LOAD_PEER_OUT_PREF:
+  - return|ROUTE_LOAD_PEER_OUT_PREF:
   - start|ROUTE_OUTBOUND:
   - start|ROUTE_SET_CALLER_DIALOG:
   - return|ROUTE_SET_CALLER_DIALOG:
@@ -87,7 +88,7 @@ flow:
   - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
 sip_in:
-  - '^INVITE'
+  - '^INVITE sip:004321001@'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
@@ -98,24 +99,24 @@ sip_out:
       '^SIP/2.0 100 Trying',
       'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'To: <sip:004321001@'
     ]
   - [
       '^SIP/2.0 101 Connecting',
       'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'To: <sip:004321001@'
     ]
   - [
-      '^INVITE sip:testuser1003@',
+      '^INVITE sip:004321001@',
       'CSeq: 2 INVITE',
       'From: <sip:4311002@',
-      'To: <sip:testuser1003@',
+      'To: <sip:004321001@',
       'Content-Type: application/sdp',
       'P-Caller-UUID: \w+',
       'P-Callee-UUID: \w+',
       'P-Asserted-Identity: <sip:4311002@',
-      'P-Called-Party-ID: <sip:testuser1003@',
+      'P-Called-Party-ID: <sip:004321001@',
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
diff --git a/scenarios/invite_concurrent_max_out/0005_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0005_test.yml.tt2
index dfd92c95..1c18ea97 100644
--- a/scenarios/invite_concurrent_max_out/0005_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0005_test.yml.tt2
@@ -1,35 +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_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:
-  - start|ROUTE_AUTH:
-  - exit|ROUTE_AUTH:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
 sip_in:
-  - '^INVITE'
-  - 'Contact: sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
-  - 'CSeq: 1 INVITE'
-  - 'Max-Forwards: 69'
-  - 'Content-Type: application/sdp'
+  - '^SIP/2.0 180 Ringing'
+  - 'CSeq: 2 INVITE'
 sip_out:
   - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 1 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
-  - [
-      '^SIP/2.0 407 Proxy Authentication Required',
-      'CSeq: 1 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      '^SIP/2.0 180 Ringing',
+      'CSeq: 2 INVITE',
     ]
diff --git a/scenarios/invite_concurrent_max_out/0006_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0006_test.yml.tt2
new file mode 100644
index 00000000..f1b23716
--- /dev/null
+++ b/scenarios/invite_concurrent_max_out/0006_test.yml.tt2
@@ -0,0 +1,13 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 2 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 2 INVITE',
+      'From: <sip:testuser1002@',
+      'To: <sip:004321001@'
+    ]
diff --git a/scenarios/invite_concurrent_max_out/0008_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0008_test.yml.tt2
new file mode 100644
index 00000000..c2eeb01a
--- /dev/null
+++ b/scenarios/invite_concurrent_max_out/0008_test.yml.tt2
@@ -0,0 +1,37 @@
+flow:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - start|ROUTE_OUTBOUND:
+  - exit|ROUTE_OUTBOUND:
+sip_in:
+  - '^INVITE'
+  - 'Contact: sip:testuser1002@'
+  - 'CSeq: 3 INVITE'
+  - 'Max-Forwards: 69'
+  - 'Content-Type: application/sdp'
+  - 'Proxy-Authorization: Digest username="testuser1002"'
+  - 'a=sendonly'
+sip_out:
+  - [
+      '^SIP/2.0 100 Trying',
+      'CSeq: 3 INVITE',
+      'From: <sip:testuser1002@',
+      'To: <sip:004321001@'
+    ]
+  - [
+      '^INVITE',
+      'CSeq: 3 INVITE',
+      'From: <sip:4311002@',
+      'To: <sip:004321001@',
+      'Content-Type: application/sdp',
+      'Proxy-Authorization: Digest username="testuser1002"',
+      'Max-Forwards: 68',
+      'Content-Type: application/sdp',
+      'a=sendonly'
+    ]
diff --git a/scenarios/invite_concurrent_max_out/0010_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0010_test.yml.tt2
new file mode 100644
index 00000000..f5b99421
--- /dev/null
+++ b/scenarios/invite_concurrent_max_out/0010_test.yml.tt2
@@ -0,0 +1,13 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 3 INVITE'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 3 INVITE',
+      'From: <sip:testuser1002@',
+      'To: <sip:004321001@'
+    ]
diff --git a/scenarios/invite_concurrent_max_out/0012_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0012_test.yml.tt2
index 87567a36..118cc32d 100644
--- a/scenarios/invite_concurrent_max_out/0012_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0012_test.yml.tt2
@@ -14,22 +14,23 @@ flow:
   - start|ROUTE_AUTH:
   - exit|ROUTE_AUTH:
 sip_in:
-  - '^INVITE'
+  - '^INVITE sip:004421003@'
   - 'Contact: sip:testuser1002@'
-  - 'To: <sip:testuser1004@'
+  - 'To: <sip:004421003@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
+  - 'Call-ID: NGCP%invite_concurrent_max_out%NEW///'
   - 'Content-Type: application/sdp'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:testuser1004@'
+      'To: <sip:004421003@'
     ]
   - [
       '^SIP/2.0 407 Proxy Authentication Required',
       'CSeq: 1 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:testuser1004@'
+      'To: <sip:004421003@'
     ]
diff --git a/scenarios/invite_concurrent_max_out/0014_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0014_test.yml.tt2
index 9d3fb878..399a84c0 100644
--- a/scenarios/invite_concurrent_max_out/0014_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0014_test.yml.tt2
@@ -5,33 +5,96 @@ flow:
   - start|ROUTE_PRX_REQUEST:
   - start|ROUTE_INITVARS:
   - return|ROUTE_INITVARS:
-  - start|ROUTE_RESTORE_CLUSTERSET:
-  - return|ROUTE_RESTORE_CLUSTERSET:
+  - 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:
+  - start|ROUTE_AUTH:
+  - start|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_AUTH:
+  - return|ROUTE_FIND_CALLER:
+  - start|ROUTE_LOAD_CALLER_PREF:
+  - start|ROUTE_CLEAR_CALLER_PREF:
+  - return|ROUTE_CLEAR_CALLER_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_FIND_CALLEE:
+  - start|ROUTE_CLIR:
+  - return|ROUTE_CLIR:
+  - start|ROUTE_CLEAR_CALLEE_PREF:
+  - return|ROUTE_CLEAR_CALLEE_PREF:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_NCOS:
+  - return|ROUTE_NCOS:
+  - start|ROUTE_BLOCK_OUT:
+  - return|ROUTE_BLOCK_OUT:
+  - start|ROUTE_CHECK_PBX:
+  - return|ROUTE_CHECK_PBX:
+  - start|ROUTE_INVITE_TO_EXT:
+  - start|ROUTE_PSTN:
+  - start|ROUTE_CLEAR_PEER_OUT_PREF:
+  - return|ROUTE_CLEAR_PEER_OUT_PREF:
+  - start|ROUTE_LOAD_PEER_OUT_PREF:
+  - return|ROUTE_LOAD_PEER_OUT_PREF:
   - start|ROUTE_OUTBOUND:
-  - exit|ROUTE_OUTBOUND:
+  - start|ROUTE_SET_CALLER_DIALOG:
+  - start|ROUTE_ACC_FAILURE:
+  - start|ROUTE_ACC_CALLER:
+  - return|ROUTE_ACC_CALLER:
+  - start|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_CALLEE:
+  - return|ROUTE_ACC_FAILURE:
+  - start|ROUTE_EARLY_REJECT:
+  - start|ROUTE_ADD_CALLINFO_REPLY:
+  - return|ROUTE_ADD_CALLINFO_REPLY:
+  - start|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  # branch ??
+  - return|BRANCH_ROUTE_SBC:
+  - exit|ROUTE_EARLY_REJECT:
 sip_in:
-  - '^INVITE sip:127.0.0.1:5080'
+  - '^INVITE sip:004421003@'
   - 'Contact: sip:testuser1002@'
-  - 'CSeq: 3 INVITE'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:004421003@'
+  - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
   - 'Proxy-Authorization: Digest username="testuser1002"'
-  - 'a=sendonly'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 3 INVITE',
+      'CSeq: 2 INVITE',
       'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'To: <sip:004421003@'
     ]
   - [
-      '^INVITE sip:127.0.0.1:5080',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@',
-      'CSeq: 3 INVITE',
-      'Max-Forwards: 68',
-      'Contact: sip:testuser1002@',
-      'Content-Type: application/sdp',
-      'Proxy-Authorization: Digest username="testuser1002"',
-      'a=sendonly'
+      '^SIP/2.0 101 Connecting',
+      '<sip:testuser1002@',
+      'To: <sip:004421003@',
+      'CSeq: 2 INVITE',
+      'P-NGCP-Authorization: testuser1002@',
+    ]
+  - [
+      '^SIP/2.0 403 Maximum parallel calls exceeded',
+      'From: <sip:testuser1002@',
+      'To: <sip:004421003@',
+      'CSeq: 2 INVITE',
+      'P-NGCP-Authorization: testuser1002@',
+      'P-NGCP-Authorized: 1'
     ]
diff --git a/scenarios/invite_concurrent_max_out/0016_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0016_test.yml.tt2
index fdc9014c..3f89dd15 100644
--- a/scenarios/invite_concurrent_max_out/0016_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0016_test.yml.tt2
@@ -1,13 +1,39 @@
 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|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  - return|BRANCH_ROUTE_SBC:
+  - start|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_RESTORE_CLUSTERSET:
+  - return|ROUTE_STOP_RTPPROXY:
+  - start|ROUTE_OUTBOUND:
+  - exit|ROUTE_OUTBOUND:
 sip_in:
-  - '^SIP/2.0 200 OK'
-  - 'CSeq: 3 INVITE'
+  - '^BYE'
+  - 'Contact: sip:testuser1002@'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:004321001@'
+  - 'CSeq: 6 BYE'
+  - 'Max-Forwards: 69'
+  - 'Content-Length: 0'
 sip_out:
   - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 3 INVITE',
+      '^SIP/2.0 100 Trying',
+      'CSeq: 6 BYE',
       'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'To: <sip:004321001@',
+      'Content-Length: 0'
+    ]
+  - [
+      '^BYE',
+      'From: <sip:4311002@',
+      'To: <sip:004321001@',
+      'CSeq: 6 BYE',
+      'Content-Length: 0'
     ]
diff --git a/scenarios/invite_concurrent_max_out/0021_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0017_test.yml.tt2
similarity index 71%
rename from scenarios/invite_concurrent_max_out/0021_test.yml.tt2
rename to scenarios/invite_concurrent_max_out/0017_test.yml.tt2
index 8a132c55..e8b06a61 100644
--- a/scenarios/invite_concurrent_max_out/0021_test.yml.tt2
+++ b/scenarios/invite_concurrent_max_out/0017_test.yml.tt2
@@ -3,15 +3,15 @@ flow:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 4 BYE'
+  - 'CSeq: 6 BYE'
   - 'Content-Length: 0'
   - 'From: <sip:4311002@'
-  - 'To: <sip:testuser1003@'
+  - 'To: <sip:004321001@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 4 BYE',
+      'CSeq: 6 BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'To: <sip:004321001@'
     ]
diff --git a/scenarios/invite_concurrent_max_out/0018_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0018_test.yml.tt2
deleted file mode 100644
index d81a43e7..00000000
--- a/scenarios/invite_concurrent_max_out/0018_test.yml.tt2
+++ /dev/null
@@ -1,99 +0,0 @@
-flow:
-  - 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:
-  - start|ROUTE_AUTH:
-  - start|ROUTE_ADD_CALLINFO_REPLY:
-  - return|ROUTE_ADD_CALLINFO_REPLY:
-  - return|ROUTE_AUTH:
-  - return|ROUTE_FIND_CALLER:
-  - start|ROUTE_LOAD_CALLER_PREF:
-  - start|ROUTE_CLEAR_CALLER_PREF:
-  - return|ROUTE_CLEAR_CALLER_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_FIND_CALLEE:
-  - start|ROUTE_CLIR:
-  - return|ROUTE_CLIR:
-  - start|ROUTE_CLEAR_CALLEE_PREF:
-  - return|ROUTE_CLEAR_CALLEE_PREF:
-  - start|ROUTE_NCOS:
-  - return|ROUTE_NCOS:
-  - start|ROUTE_NCOS:
-  - return|ROUTE_NCOS:
-  - start|ROUTE_NCOS:
-  - return|ROUTE_NCOS:
-  - start|ROUTE_NCOS:
-  - return|ROUTE_NCOS:
-  - start|ROUTE_BLOCK_OUT:
-  - return|ROUTE_BLOCK_OUT:
-  - start|ROUTE_LOAD_CALLEE_PREF:
-  - start|ROUTE_BLOCK_IN:
-  - return|ROUTE_BLOCK_IN:
-  - 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:
-  - start|ROUTE_ACC_FAILURE:
-  - start|ROUTE_ACC_CALLER:
-  - return|ROUTE_ACC_CALLER:
-  - start|ROUTE_ACC_CALLEE:
-  - return|ROUTE_ACC_CALLEE:
-  - return|ROUTE_ACC_FAILURE:
-  - start|ROUTE_EARLY_REJECT:
-  - start|ROUTE_ADD_CALLINFO_REPLY:
-  - return|ROUTE_ADD_CALLINFO_REPLY:
-  - start|BRANCH_ROUTE_SBC:
-  - return|BRANCH_ROUTE_SBC:
-  # branch ??
-  - return|BRANCH_ROUTE_SBC:
-  - exit|ROUTE_EARLY_REJECT:
-sip_in:
-  - '^INVITE sip:testuser1004@'
-  - 'Contact: sip:testuser1002@'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1004@'
-  - 'CSeq:  2 INVITE'
-  - 'Max-Forwards: 69'
-  - 'Content-Type: application/sdp'
-  - 'Proxy-Authorization: Digest username="testuser1002"'
-sip_out:
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq:  2 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1004@'
-    ]
-  - [
-      '^SIP/2.0 101 Connecting',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1004@',
-      'CSeq:  2 INVITE',
-      'P-NGCP-Authorization: testuser1002@',
-    ]
-  - [
-      '^SIP/2.0 403 Maximum parallel calls exceeded',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1004@',
-      'CSeq:  2 INVITE',
-      'P-NGCP-Authorization: testuser1002@',
-      'P-NGCP-Authorized: 1'
-    ]
diff --git a/scenarios/invite_concurrent_max_out/0020_test.yml.tt2 b/scenarios/invite_concurrent_max_out/0020_test.yml.tt2
deleted file mode 100644
index 03c73165..00000000
--- a/scenarios/invite_concurrent_max_out/0020_test.yml.tt2
+++ /dev/null
@@ -1,43 +0,0 @@
-flow:
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - start|ROUTE_PRX_REQUEST:
-  - start|ROUTE_INITVARS:
-  - return|ROUTE_INITVARS:
-  - start|BRANCH_ROUTE_SBC:
-  - return|BRANCH_ROUTE_SBC:
-  # branch ??
-  - return|BRANCH_ROUTE_SBC:
-  - 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:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:testuser1002@'
-  - 'CSeq: 4 BYE'
-  - 'Max-Forwards: 69'
-  - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
-
-sip_out:
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 4 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
-  - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:testuser1002@',
-      'CSeq: 4 BYE',
-      'Max-Forwards: 68',
-      'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@'
-    ]
diff --git a/scenarios/invite_concurrent_max_out/peer.yml b/scenarios/invite_concurrent_max_out/peer.yml
new file mode 100644
index 00000000..d968daca
--- /dev/null
+++ b/scenarios/invite_concurrent_max_out/peer.yml
@@ -0,0 +1,57 @@
+---
+peer_00:
+  contract:
+    billing_profile: default
+    contact:
+      company: peer_00
+      email: peer_00@host0.not
+  groups:
+    - name: peer_00_group
+      priority: 1
+      description:
+  rules:
+    - group_id: peer_00_group
+      data:
+        callee_prefix: ""
+        callee_pattern: ""
+        caller_pattern: "^sip:.+@spce.test"
+        description: ""
+  hosts:
+    - group_id: peer_00_group
+      data:
+        name: peer_00_host0
+        ip: 127.0.2.1
+        port: 50602
+        host:
+        transport: UDP
+        weight: 1
+      preferences:
+        concurrent_max: 10
+peer_01:
+  contract:
+    billing_profile: default
+    contact:
+      company: peer_01
+      email: peer_01@host1.not
+  groups:
+    - name: peer_01_group
+      priority: 1
+      description:
+  rules:
+    - group_id: peer_01_group
+      data:
+        callee_prefix: ""
+        callee_pattern: "^44.+"
+        caller_pattern: "^sip:.+@spce.test"
+        description: ""
+  hosts:
+    - group_id: peer_01_group
+      data:
+        name: peer_01_host0
+        ip: 127.0.3.1
+        port: 50607
+        host:
+        transport: UDP
+        weight: 2
+      preferences:
+        concurrent_max: 10
diff --git a/scenarios/invite_concurrent_max_out/scenario.yml b/scenarios/invite_concurrent_max_out/scenario.yml
index 1085f889..03a3a45a 100644
--- a/scenarios/invite_concurrent_max_out/scenario.yml
+++ b/scenarios/invite_concurrent_max_out/scenario.yml
@@ -1,36 +1,25 @@
 test_uuid: invite_concurrent_max_out
 subscribers:
   spce.test:
-    testuser1003:
-      password: testuser
-      cc: 43
-      ac: 1
-      sn: 1003
     testuser1002:
       password: testuser
       cc: 43
       ac: 1
       sn: 1002
-    testuser1004:
-      password: testuser
-      cc: 43
-      ac: 1
-      sn: 1004
-    testuser1001:
-      password: testuser
-      cc: 43
-      ac: 1
-      sn: 1001
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
     domain: spce.test
     responders:
-      - ip: 127.1.0.1
-        username: testuser1003
+      - ip: 127.0.2.1
+        number: 004321001
+        username: 004321001
         domain: spce.test
-        register: yes
-      - ip: 127.2.0.1
-        username: testuser1004
+        peer_host: peer_00_host0
+        register: no
+      - ip: 127.0.3.1
+        number: 004421003
+        username: 004421003
         domain: spce.test
-        register: yes
+        peer_host: peer_00_host1
+        register: no
diff --git a/scenarios/invite_concurrent_max_out/sipp_scenario00.xml b/scenarios/invite_concurrent_max_out/sipp_scenario00.xml
index d00cd7b1..b925395f 100644
--- a/scenarios/invite_concurrent_max_out/sipp_scenario00.xml
+++ b/scenarios/invite_concurrent_max_out/sipp_scenario00.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <scenario name="Sipwise NGCP Benchmark UAC Caller">
-  <send>
+  <send start_txn="invite0">
     <![CDATA[
 
       INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
@@ -27,12 +27,12 @@
     ]]>
   </send>
 
-  <recv response="100" optional="true">
+  <recv response="100" response_txn="invite0" optional="true">
   </recv>
 
-  <recv response="407" auth="true"/>
+  <recv response="407" response_txn="invite0" auth="true"/>
 
-  <send>
+  <send ack_txn="invite0">
     <![CDATA[
 
       ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
@@ -50,7 +50,7 @@
 
   <pause milliseconds="500"/>
 
-  <send>
+  <send start_txn="invite1">
     <![CDATA[
 
       INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
@@ -77,19 +77,19 @@
     ]]>
   </send>
 
-  <recv response="100" optional="true">
+  <recv response="100" response_txn="invite1" optional="true">
   </recv>
 
-  <recv response="180" optional="true">
+  <recv response="180" response_txn="invite1" optional="true">
   </recv>
 
-  <recv response="183" optional="true">
+  <recv response="183" response_txn="invite1" optional="true">
   </recv>
 
-  <recv response="200" rrs="true">
+  <recv response="200" response_txn="invite1" rrs="true">
   </recv>
 
-  <send>
+  <send ack_txn="invite1">
     <![CDATA[
 
       ACK [next_url] SIP/2.0
@@ -108,7 +108,7 @@
 
   <pause milliseconds="500"/>
 
-  <send>
+  <send start_txn="reinvite0">
     <![CDATA[
 
       INVITE [next_url] SIP/2.0
@@ -137,13 +137,17 @@
     ]]>
   </send>
 
-  <recv response="100" optional="true">
+  <recv response="100" response_txn="reinvite0" optional="true">
   </recv>
 
-  <recv response="200" rrs="true">
+  <recv response="200" response_txn="reinvite0" rrs="true">
+    <action>
+      <ereg regexp="tag=(.*)" search_in="hdr" header="To:" check_it="true" assign_to="1,2" />
+      <log message="[$1]"/>
+    </action>
   </recv>
 
-  <send>
+  <send ack_txn="reinvite0">
     <![CDATA[
 
       ACK [next_url] SIP/2.0
@@ -161,20 +165,124 @@
   </send>
 
   <pause milliseconds="500"/>
-  <nop>
+
+  <send start_txn="invite2">
+    <![CDATA[
+
+      INVITE sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] 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]SIPpTag01[call_number]
+      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%NEW///[call_id]
+      CSeq: 1 INVITE
+      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 8
+      a=rtpmap:8 PCMA/8000
+      a=ptime:50
+
+    ]]>
+  </send>
+
+  <recv response="100" response_txn="invite2" optional="true">
+  </recv>
+
+  <recv response="407" response_txn="invite2" auth="true"/>
+
+  <send ack_txn="invite2">
+    <![CDATA[
+
+      ACK sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]:[remote_port] SIP/2.0
+      [last_Via:]
+      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag01[call_number]
+      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>[peer_tag_param]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%NEW///[call_id]
+      CSeq: 1 ACK
+      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <pause milliseconds="500"/>
+
+  <send start_txn="invite3">
+    <![CDATA[
+
+      INVITE sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] 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]SIPpTag01[call_number]
+      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%NEW///[call_id]
+      CSeq: 2 INVITE
+      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Max-Forwards: 70
+      [field1 file="caller.csv"]
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 8
+      a=rtpmap:8 PCMA/8000
+      a=ptime:50
+
+    ]]>
+  </send>
+
+  <recv response="100" response_txn="invite3" optional="true">
+  </recv>
+
+  <recv response="180" response_txn="invite3" optional="true">
+  </recv>
+
+  <recv response="183" response_txn="invite3" optional="true">
+  </recv>
+
+  <recv response="403" response_txn="invite3" rrs="true">
     <action>
-      <exec play_pcap_audio="scenarios/media181sec.pcap"/>
+      <ereg regexp="tag=(.*)" search_in="hdr" header="To:" check_it="true" assign_to="1,3" />
     </action>
-  </nop>
+  </recv>
 
-  <send>
+  <send ack_txn="invite3">
+    <![CDATA[
+
+      ACK sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]:[remote_port] SIP/2.0
+      [last_Via:]
+      From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag01[call_number]
+      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>;tag=[$3]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%NEW///[call_id]
+      CSeq: 2 ACK
+      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <pause milliseconds="500"/>
+
+  <send start_txn="reinvite0">
     <![CDATA[
 
       BYE [next_url] 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:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
-      [last_Call-ID:]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[$2]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: [cseq] BYE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
       [routes]
@@ -184,10 +292,10 @@
     ]]>
   </send>
 
-  <recv response="100" optional="true">
+  <recv response="100" response_txn="reinvite0" optional="true">
   </recv>
 
-  <recv response="200" crlf="true">
+  <recv response="200" response_txn="reinvite0" crlf="true">
   </recv>
 
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
diff --git a/scenarios/invite_concurrent_max_out/sipp_scenario_responder01.xml b/scenarios/invite_concurrent_max_out/sipp_scenario_responder01.xml
deleted file mode 100644
index 2d723206..00000000
--- a/scenarios/invite_concurrent_max_out/sipp_scenario_responder01.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<scenario name="Sipwise NGCP Benchmark UAC Caller">
-
-  <pause milliseconds="1500"/>
-
-  <send start_rtd="1" start_rtd="2">
-    <![CDATA[
-
-      INVITE sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
-      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
-      CSeq: 1 INVITE
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 8
-      a=rtpmap:8 PCMA/8000
-      a=ptime:50
-
-    ]]>
-  </send>
-
-  <recv response="100" rtd="1" optional="true">
-  </recv>
-
-  <recv response="407" rtd="2" auth="true"/>
-
-  <send>
-    <![CDATA[
-
-      ACK sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]:[remote_port] SIP/2.0
-      [last_Via:]
-      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>[peer_tag_param]
-      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
-      CSeq: [cseq] ACK
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <pause milliseconds="500"/>
-
-  <send>
-    <![CDATA[
-
-      INVITE sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
-      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
-      CSeq:  [cseq] INVITE
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
-      Max-Forwards: 70
-      [field1 file="caller.csv" line=0]
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 8
-      a=rtpmap:8 PCMA/8000
-      a=ptime:50
-
-    ]]>
-  </send>
-
-  <recv response="100" optional="true">
-  </recv>
-
-  <recv response="403" rrs="true">
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      ACK sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]:[remote_port] SIP/2.0
-      [last_Via:]
-      From: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>[peer_tag_param]
-      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
-      CSeq: [cseq] ACK
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
-
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
-
-</scenario>
-