diff --git a/scenarios/incoming_peer/0003_test.yml.tt2 b/scenarios/incoming_peer/0003_test.yml.tt2
deleted file mode 100644
index fd88abbc..00000000
--- a/scenarios/incoming_peer/0003_test.yml.tt2
+++ /dev/null
@@ -1,210 +0,0 @@
-flow:
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_ENTRY:
-  - return|ROUTE_ENTRY:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - start|ROUTE_CHECK_TEL_URI:
-  - return|ROUTE_CHECK_TEL_URI:
-  - 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_PSTN_SELECT_INBOUND_PEER:
-  - return|ROUTE_PSTN_SELECT_INBOUND_PEER:
-  - start|ROUTE_CLEAR_PEER_IN_PREF:
-  - return|ROUTE_CLEAR_PEER_IN_PREF:
-  - start|ROUTE_LOAD_PEER_IN_PREF:
-  - start|ROUTE_DLG_MANAGE:
-  - return|ROUTE_DLG_MANAGE:
-  - return|ROUTE_LOAD_PEER_IN_PREF:
-      $avp(lua_dlg_profile): ["peer:[% peer_00_host0.id %]", "total"]
-  - return|ROUTE_FIND_CALLER:
-  - start|ROUTE_APPLY_HEADER_RULES:
-  - return|ROUTE_APPLY_HEADER_RULES:
-  - start|ROUTE_GET_CALLER_CLI:
-  - return|ROUTE_GET_CALLER_CLI:
-  - start|ROUTE_GET_CALLER_CLI:
-  - return|ROUTE_GET_CALLER_CLI:
-  - start|ROUTE_GET_FORWARDER_CLI:
-  - return|ROUTE_GET_FORWARDER_CLI:
-  - start|ROUTE_CLIR:
-  - return|ROUTE_CLIR:
-  - start|ROUTE_CALLER_BLOCK_CLI:
-  - return|ROUTE_CALLER_BLOCK_CLI:
-  - 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:
-  - start|ROUTE_CNT_DLG_CHECK:
-  - return|ROUTE_CNT_DLG_CHECK:
-  - start|ROUTE_SET_CALLEE_DIALOG_BASE:
-  - return|ROUTE_SET_CALLEE_DIALOG_BASE:
-  - start|ROUTE_SET_CALLEE_DIALOG_TOTAL:
-  - return|ROUTE_SET_CALLEE_DIALOG_TOTAL:
-  - return|ROUTE_SET_CALLEE_DIALOG:
-     $avp(lua_dlg_profile): [
-        "totalaccount:[% customer_test.id %]",
-        "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
-        "account:[% customer_test.id %]",
-        "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
-        "peer:[% peer_00_host0.id %]",
-        "total"
-      ]
-  - start|ROUTE_BLOCK_IN:
-  - return|ROUTE_BLOCK_IN:
-  - return|ROUTE_LOAD_CALLEE_PREF:
-      $xavp(caller_peer_prefs[0]=>concurrent_max[*]): [1]
-  - start|ROUTE_NCOS_CHECK:
-  - start|ROUTE_NCOS:
-  - return|ROUTE_NCOS:
-  - start|ROUTE_NCOS:
-  - return|ROUTE_NCOS:
-  - start|ROUTE_NCOS:
-  - return|ROUTE_NCOS:
-  - start|ROUTE_NCOS:
-  - return|ROUTE_NCOS:
-  - return|ROUTE_NCOS_CHECK:
-  - start|ROUTE_BLOCK_OUT:
-  - return|ROUTE_BLOCK_OUT:
-  - start|ROUTE_CHECK_PBX:
-  - return|ROUTE_CHECK_PBX:
-  - start|ROUTE_CALLEE_DISPATCH:
-  - start|ROUTE_INVITE_TO_INT:
-  - start|ROUTE_APPLY_HEADER_RULES:
-  - return|ROUTE_APPLY_HEADER_RULES:
-  - start|ROUTE_CF_CFU:
-  - return|ROUTE_CF_CFU:
-  - start|ROUTE_CNT_DLG_CHECK:
-  - return|ROUTE_CNT_DLG_CHECK:
-  - start|ROUTE_CHECK_LOCATIONS:
-  - start|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS:
-  - return|ROUTE_LOOKUP_SUBSCRIBER_LOCATIONS:
-  - start|ROUTE_OUTBOUND:
-  - start|ROUTE_SET_CALLER_DIALOG:
-      $avp(lua_dlg_profile): [
-        "incoming",
-        "totalaccount:[% customer_test.id %]",
-        "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
-        "account:[% customer_test.id %]",
-        "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
-        "peer:[% peer_00_host0.id %]",
-        "total"
-      ]
-  - start|ROUTE_CNT_DLG_CHECK:
-  - return|ROUTE_CNT_DLG_CHECK:
-  - return|ROUTE_SET_CALLER_DIALOG:
-  - start|ROUTE_ACC_CALLER:
-  - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
-  - return|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
-  - return|ROUTE_ACC_CALLER:
-  - start|ROUTE_ACC_CALLEE:
-  - start|ROUTE_SET_ACC_CALLEE_CALL_COUNTERS:
-  - return|ROUTE_SET_ACC_CALLEE_CALL_COUNTERS:
-  - return|ROUTE_ACC_CALLEE:
-  - start|ROUTE_ADD_AOC_HEADER:
-  - return|ROUTE_ADD_AOC_HEADER:
-  - start|BRANCH_ROUTE_SBC:
-  - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
-  - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
-  - start|ROUTE_SET_CALLEE_DIALOG:
-  - start|ROUTE_CNT_DLG_CHECK:
-  - return|ROUTE_CNT_DLG_CHECK:
-  - start|ROUTE_SET_CALLEE_DIALOG_BASE:
-  - return|ROUTE_SET_CALLEE_DIALOG_BASE:
-  - start|ROUTE_SET_CALLEE_DIALOG_TOTAL:
-  - return|ROUTE_SET_CALLEE_DIALOG_TOTAL:
-  - return|ROUTE_SET_CALLEE_DIALOG:
-  - start|ROUTE_SET_BRANCH_HDRS:
-  - start|ROUTE_PREPARE_UA:
-  - return|ROUTE_PREPARE_UA:
-  - return|ROUTE_SET_BRANCH_HDRS:
-  - start|ROUTE_SET_RUSER:
-  - return|ROUTE_SET_RUSER:
-  - start|ROUTE_BRANCH_ACC_RTP:
-  - return|ROUTE_BRANCH_ACC_RTP:
-  - start|ROUTE_FILTER_PRACK:
-  - return|ROUTE_FILTER_PRACK:
-  - start|ROUTE_PREPARE_SST:
-  - start|ROUTE_REMOVE_TIMER_SUPP_REQ:
-  - return|ROUTE_REMOVE_TIMER_SUPP_REQ:
-  - 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:
-  - 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:
-  - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
-  - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
-  - start|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY:
-  - return|ROUTE_ADD_CALLINFO_CALLEE_PRIMARY:
-  - return|ROUTE_ADD_CALLINFO:
-  - start|ROUTE_APPLY_HEADER_RULES:
-  - return|ROUTE_APPLY_HEADER_RULES:
-  - return|BRANCH_ROUTE_SBC:
-  # branch ??
-  - start|DEFAULT_SEND:
-  - exit|DEFAULT_SEND:
-  - exit|DEFAULT_SEND:
-  - start|ROUTE_EXIT:
-  - start|ROUTE_RUNTIME:
-  - return|ROUTE_RUNTIME:
-  - exit|ROUTE_EXIT:
-      $avp(lua_dlg_profile): [
-        "incoming",
-        "totalaccount:[% customer_test.id %]",
-        "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
-        "account:[% customer_test.id %]",
-        "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
-        "peer:[% peer_00_host0.id %]",
-        "total"
-      ]
-sip_in:
-  - '^INVITE sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
-  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
-  - 'CSeq: 1 INVITE'
-  - 'Max-Forwards: 69'
-  - 'Content-Type: application/sdp'
-sip_out:
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 1 INVITE',
-      'From: <sip:[% scenarios.0.username %]@',
-      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
-    ]
-  - [
-      '^INVITE sip:testuser1003@',
-      'CSeq: 1 INVITE',
-      'From: <sip:[% scenarios.0.username %]@',
-      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@',
-      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
-      'Content-Type: application/sdp',
-      'P-Caller-UUID: 0',
-      'P-Callee-UUID: [% incoming_peer_scenarios_test.testuser1003.uui %]',
-      'P-Asserted-Identity: <sip:[% scenarios.0.username %]@',
-      'P-Called-Party-ID: <sip:testuser1003@',
-      'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
-      'P-App-Name: sbc'
-    ]
diff --git a/scenarios/incoming_peer/0005_test.yml.tt2 b/scenarios/incoming_peer/0005_test.yml.tt2
deleted file mode 100644
index cfa3304b..00000000
--- a/scenarios/incoming_peer/0005_test.yml.tt2
+++ /dev/null
@@ -1,52 +0,0 @@
-flow:
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_ENTRY:
-  - return|ROUTE_ENTRY:
-  - start|ROUTE_LEG_B:
-  - start|ROUTE_INITVARS:
-  - return|ROUTE_INITVARS:
-  - start|DEFAULT_SEND:
-  - exit|DEFAULT_SEND:
-  - exit|DEFAULT_SEND:
-  - start|ROUTE_EXIT:
-  - start|ROUTE_RUNTIME:
-  - return|ROUTE_RUNTIME:
-  - exit|ROUTE_EXIT:
-sip_in:
-  - 'INVITE sip:testuser1003@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
-  - 'From: <sip:[% scenarios.0.username %]@incoming-peer.scenarios.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1003@incoming-peer.scenarios.test>'
-  - 'CSeq: \d+ INVITE'
-  - 'P-LB-Uptime: \d+'
-  - 'P-Asserted-Identity: <sip:[% scenarios.0.username %]@incoming-peer.scenarios.test>'
-  - 'P-Caller-UUID: 0'
-  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]'
-  - 'P-NGCP-Callee-Info: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@incoming-peer.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% incoming_peer_scenarios_test.testuser1003.phone_number %]'
-  - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060'
-  - 'Content-Type: application/sdp'
-  - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
-  - 'Content-Length:\s+\d+'
-sip_out:
-  - [
-      'SIP/2.0 100 Trying',
-      'From: <sip:[% scenarios.0.username %]@incoming-peer.scenarios.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@incoming-peer.scenarios.test>',
-      'CSeq: \d+ INVITE',
-      'Server: Sipwise NGCP Proxy',
-      'Content-Length: 0',
-    ]
-  - [
-      'INVITE sip:testuser1003@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0',
-      'From: <sip:[% scenarios.0.username %]@incoming-peer.scenarios.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@incoming-peer.scenarios.test>',
-      'CSeq: \d+ INVITE',
-      'P-LB-Uptime: \d+',
-      'P-Asserted-Identity: <sip:[% scenarios.0.username %]@incoming-peer.scenarios.test>',
-      'P-Caller-UUID: 0',
-      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]',
-      'P-NGCP-Callee-Info: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@incoming-peer.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% incoming_peer_scenarios_test.testuser1003.phone_number %]',
-      'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060',
-      'Content-Type: application/sdp',
-      'Contact: <sip:127.0.0.1:508[08];transport=udp>',
-      'Content-Length:\s+\d+',
-    ]
diff --git a/scenarios/incoming_peer/0008_test.yml.tt2 b/scenarios/incoming_peer/0008_test.yml.tt2
deleted file mode 100644
index 8a914f9e..00000000
--- a/scenarios/incoming_peer/0008_test.yml.tt2
+++ /dev/null
@@ -1,23 +0,0 @@
-# INVITE_OFFLINE scenario
-flow:
-  - start|DEFAULT_ONREPLY:
-  - start|REPLY_ROUTE_NAT:
-  - start|ROUTE_ENTRY:
-  - return|ROUTE_ENTRY:
-  - start|ROUTE_APPLY_HEADER_RULES:
-  - return|ROUTE_APPLY_HEADER_RULES:
-  - start|ROUTE_PREPARE_UA:
-  - return|ROUTE_PREPARE_UA:
-  - start|REPLY_ROUTE_NAT_CONTINUE:
-  - start|ROUTE_EXIT:
-  - start|ROUTE_RUNTIME:
-  - return|ROUTE_RUNTIME:
-  - exit|ROUTE_EXIT:
-sip_in:
-  - '^SIP/2.0 180 Ringing'
-  - 'CSeq: 1 INVITE'
-sip_out:
-  - [
-      '^SIP/2.0 180 Ringing',
-      'CSeq: 1 INVITE',
-    ]
diff --git a/scenarios/incoming_peer/0010_test.yml.tt2 b/scenarios/incoming_peer/0010_test.yml.tt2
deleted file mode 100644
index 763f8dc0..00000000
--- a/scenarios/incoming_peer/0010_test.yml.tt2
+++ /dev/null
@@ -1,43 +0,0 @@
-flow:
-  - start|DEFAULT_ONREPLY:
-  - start|REPLY_ROUTE_NAT:
-  - start|ROUTE_ENTRY:
-  - return|ROUTE_ENTRY:
-  - start|ROUTE_APPLY_HEADER_RULES:
-  - return|ROUTE_APPLY_HEADER_RULES:
-  - start|ROUTE_PREPARE_UA:
-  - return|ROUTE_PREPARE_UA:
-  - start|ROUTE_CHECK_TIMER_SUPP_REQ:
-  - return|ROUTE_CHECK_TIMER_SUPP_REQ:
-  - start|ROUTE_REMOVE_TIMER_SUPP_REQ:
-  - return|ROUTE_REMOVE_TIMER_SUPP_REQ:
-  - start|REPLY_ROUTE_RTPENGINE:
-  - return|REPLY_ROUTE_RTPENGINE:
-  - start|REPLY_ROUTE_NAT_CONTINUE:
-  - start|ROUTE_EXIT:
-  - start|ROUTE_RUNTIME:
-  - return|ROUTE_RUNTIME:
-  - start|dialog:start:
-  - return|dialog:start:
-      $avp(lua_dlg_profile): [
-        "incoming",
-        "totalaccount:[% customer_test.id %]",
-        "totaluser:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
-        "account:[% customer_test.id %]",
-        "user:[% incoming_peer.scenarios.test.testuser1003.uuid %]",
-        "peer:[% peer_00_host0.id %]",
-        "total"
-      ]
-  - return|dialog:start:
-sip_in:
-  - '^SIP/2.0 200 OK'
-  - 'CSeq: 1 INVITE'
-  - 'From: <sip:[% scenarios.0.username %]@'
-  - 'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
-sip_out:
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 1 INVITE',
-      'From: <sip:[% scenarios.0.username %]@',
-      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@',
-    ]
diff --git a/scenarios/incoming_peer/0011_test.yml.tt2 b/scenarios/incoming_peer/0011_test.yml.tt2
deleted file mode 100644
index 9a6dcb69..00000000
--- a/scenarios/incoming_peer/0011_test.yml.tt2
+++ /dev/null
@@ -1,37 +0,0 @@
-flow:
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_ENTRY:
-  - return|ROUTE_ENTRY:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - start|ROUTE_CHECK_TEL_URI:
-  - return|ROUTE_CHECK_TEL_URI:
-  - start|ROUTE_PRX_REQUEST:
-  - start|ROUTE_INITVARS:
-  - return|ROUTE_INITVARS:
-  - start|ROUTE_PREPARE_UA:
-  - return|ROUTE_PREPARE_UA:
-  - start|ROUTE_RESTORE_CLUSTERSET:
-  - return|ROUTE_RESTORE_CLUSTERSET:
-  - start|ROUTE_WITHINDLG_RTPENGINE:
-  - return|ROUTE_WITHINDLG_RTPENGINE:
-  - start|ROUTE_OUTBOUND:
-  - start|DEFAULT_SEND:
-  - exit|DEFAULT_SEND:
-  - exit|DEFAULT_SEND:
-  - start|ROUTE_EXIT:
-  - start|ROUTE_RUNTIME:
-  - return|ROUTE_RUNTIME:
-  - exit|ROUTE_EXIT:
-sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
-  - 'CSeq: 1 ACK'
-  - 'From: <sip:[% scenarios.0.username %]@'
-  - 'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
-sip_out:
-  - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
-      'CSeq: 1 ACK',
-      'From: <sip:[% scenarios.0.username %]@',
-      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
-    ]
diff --git a/scenarios/incoming_peer/0013_test.yml.tt2 b/scenarios/incoming_peer/0013_test.yml.tt2
deleted file mode 100644
index 7525d9e3..00000000
--- a/scenarios/incoming_peer/0013_test.yml.tt2
+++ /dev/null
@@ -1,56 +0,0 @@
-# INVITE_OFFLINE scenario
-flow:
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_ENTRY:
-  - return|ROUTE_ENTRY:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - start|ROUTE_CHECK_TEL_URI:
-  - return|ROUTE_CHECK_TEL_URI:
-  - start|ROUTE_PRX_REQUEST:
-  - start|ROUTE_INITVARS:
-  - return|ROUTE_INITVARS:
-  - start|dialog:end:
-  - return|dialog:end:
-      $avp(lua_dlg_profile): None
-  - return|dialog:end:
-  - start|ROUTE_STOP_RTPPROXY:
-  - start|ROUTE_RESTORE_CLUSTERSET:
-  - return|ROUTE_RESTORE_CLUSTERSET:
-  - return|ROUTE_STOP_RTPPROXY:
-  - start|ROUTE_PREPARE_UA:
-  - return|ROUTE_PREPARE_UA:
-  - start|ROUTE_OUTBOUND:
-  - start|DEFAULT_SEND:
-  - exit|DEFAULT_SEND:
-  - exit|DEFAULT_SEND:
-  - start|ROUTE_EXIT:
-  - start|ROUTE_RUNTIME:
-  - return|ROUTE_RUNTIME:
-  - exit|ROUTE_EXIT:
-sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
-  - 'CSeq: 2 BYE'
-  - 'Max-Forwards: 69'
-  - 'Content-Length: 0'
-  - 'From: <sip:[% scenarios.0.username %]@'
-  - 'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
-
-sip_out:
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 2 BYE',
-      'Content-Length: 0',
-      'From: <sip:[% scenarios.0.username %]@',
-      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
-    ]
-  - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
-      'CSeq: 2 BYE',
-      'Max-Forwards: 68',
-      'Content-Length: 0',
-      'From: <sip:[% scenarios.0.username %]@',
-      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
-    ]
diff --git a/scenarios/incoming_peer/0016_test.yml.tt2 b/scenarios/incoming_peer/0016_test.yml.tt2
deleted file mode 100644
index eaaf48f6..00000000
--- a/scenarios/incoming_peer/0016_test.yml.tt2
+++ /dev/null
@@ -1,28 +0,0 @@
-flow:
-  - start|DEFAULT_ONREPLY:
-  - start|REPLY_ROUTE_NAT:
-  - start|ROUTE_ENTRY:
-  - return|ROUTE_ENTRY:
-  - start|ROUTE_APPLY_HEADER_RULES:
-  - return|ROUTE_APPLY_HEADER_RULES:
-  - start|ROUTE_PREPARE_UA:
-  - return|ROUTE_PREPARE_UA:
-  - start|REPLY_ROUTE_NAT_CONTINUE:
-  - start|ROUTE_EXIT:
-  - start|ROUTE_RUNTIME:
-  - return|ROUTE_RUNTIME:
-  - exit|ROUTE_EXIT:
-sip_in:
-  - '^SIP/2.0 200 OK'
-  - 'CSeq: 2 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:[% scenarios.0.username %]@'
-  - 'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
-sip_out:
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 2 BYE',
-      'Content-Length: 0',
-      'From: <sip:[% scenarios.0.username %]@',
-      'To: <sip:[% incoming_peer_scenarios_test.testuser1003.phone_number %]@'
-    ]