diff --git a/scenarios/invite_allowedcli_nonmatch_reject/0004_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch_reject/0004_test.yml.tt2
new file mode 100644
index 00000000..0aca64aa
--- /dev/null
+++ b/scenarios/invite_allowedcli_nonmatch_reject/0004_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_LOCAL:
+  - return|ROUTE_LOCAL:
+sip_in:
+  - 'ACK sip:testuser1003@'
+  - 'From: \"431100222\" <sip:testuser1002@spce.test>;tag='
+  - 'To: <sip:testuser1003@spce.test>;tag='
+  - 'Max-Forwards: 69'
+  - 'Content-Length: 0'
+  - 'P-NGCP-Src-Ip: 127.126.0.1'
+  - 'P-NGCP-Src-Port: \d+'
+  - 'P-NGCP-Src-Proto: udp'
+  - 'P-NGCP-Src-Af: 4'
+  - 'P-Sock-Info: udp:127.0.0.1:5060'
+sip_out: []
diff --git a/scenarios/invite_allowedcli_nonmatch_reject/sipp_scenario00.xml b/scenarios/invite_allowedcli_nonmatch_reject/sipp_scenario00.xml
index 2efe07a0..290e0433 100644
--- a/scenarios/invite_allowedcli_nonmatch_reject/sipp_scenario00.xml
+++ b/scenarios/invite_allowedcli_nonmatch_reject/sipp_scenario00.xml
@@ -80,29 +80,22 @@
   <recv response="100" optional="true">
   </recv>
 
-  <recv response="403" rrs="true" rtd="3">
+  <recv response="403" rtd="3">
   </recv>
 
   <send>
     <![CDATA[
 
-      ACK [next_url] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
+      [last_Via:]
       From: "431100222" <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=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
-      [routes]
       CSeq: 2 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>
 
diff --git a/scenarios/invite_concurrent_max_out_per_account/sipp_scenario00.xml b/scenarios/invite_concurrent_max_out_per_account/sipp_scenario00.xml
index b925395f..6ff611de 100644
--- a/scenarios/invite_concurrent_max_out_per_account/sipp_scenario00.xml
+++ b/scenarios/invite_concurrent_max_out_per_account/sipp_scenario00.xml
@@ -251,7 +251,7 @@
   <recv response="183" response_txn="invite3" optional="true">
   </recv>
 
-  <recv response="403" response_txn="invite3" rrs="true">
+  <recv response="403" response_txn="invite3">
     <action>
       <ereg regexp="tag=(.*)" search_in="hdr" header="To:" check_it="true" assign_to="1,3" />
     </action>
diff --git a/scenarios/lock_ported/0022_test.yml.tt2 b/scenarios/lock_ported/0022_test.yml.tt2
new file mode 100644
index 00000000..940e7fd7
--- /dev/null
+++ b/scenarios/lock_ported/0022_test.yml.tt2
@@ -0,0 +1,22 @@
+flow:
+  - start|DEFAULT_ROUTE:
+  - start|ROUTE_NET_INFO:
+  - return|ROUTE_NET_INFO:
+  - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_INITVARS:
+  - return|ROUTE_INITVARS:
+  - start|ROUTE_LOCAL:
+  - return|ROUTE_LOCAL:
+sip_in:
+  - 'ACK sip:testuser1004@'
+  - 'From: <sip:testuser1001@spce.test>;tag='
+  - 'To: <sip:testuser1004@spce.test>;tag='
+  - 'CSeq: 2 ACK'
+  - 'Max-Forwards: 69'
+  - 'Content-Length: 0'
+  - 'P-NGCP-Src-Ip: 127.126.0.1'
+  - 'P-NGCP-Src-Port: \d+'
+  - 'P-NGCP-Src-Proto: udp'
+  - 'P-NGCP-Src-Af: 4'
+  - 'P-Sock-Info: udp:127.0.0.1:5060'
+sip_out: []
diff --git a/scenarios/lock_ported/sipp_scenario01.xml b/scenarios/lock_ported/sipp_scenario01.xml
index 4f5f746b..1a22a095 100644
--- a/scenarios/lock_ported/sipp_scenario01.xml
+++ b/scenarios/lock_ported/sipp_scenario01.xml
@@ -86,23 +86,16 @@
   <send>
     <![CDATA[
 
-      ACK [next_url] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      ACK sip:[field0 file="callee.csv" line=2]@[field3 file="callee.csv" line=2] SIP/2.0
+      [last_Via:]
       From: <sip:[field0 file="caller.csv" line=1]@[field2 file="caller.csv" line=1]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:[field0 file="callee.csv" line=2]@[field3 file="callee.csv" line=2]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
-      [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv" line=1]@[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>
 
diff --git a/scenarios/register_allowip/sipp_scenario00.xml b/scenarios/register_allowip/sipp_scenario00.xml
index 45997674..a4419807 100644
--- a/scenarios/register_allowip/sipp_scenario00.xml
+++ b/scenarios/register_allowip/sipp_scenario00.xml
@@ -49,7 +49,20 @@
   <recv response="403">
   </recv>
 
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+  <send>
+    <![CDATA[
+
+      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
+      [last_Via:]
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
+      Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
+      CSeq: 2 ACK
+      Max-Forwards: 70
+      Content-Length: 0
+
+    ]]>
+  </send>
 
 </scenario>
 
diff --git a/scenarios/reminder/0007_test.yml.tt2 b/scenarios/reminder/0007_test.yml.tt2
new file mode 100644
index 00000000..2cb73b18
--- /dev/null
+++ b/scenarios/reminder/0007_test.yml.tt2
@@ -0,0 +1,18 @@
+flow:
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'From: <sip:\*55\*1420@spce.test>;tag='
+  - 'To: <sip:testuser1001@spce.test>;tag='
+  - 'CSeq: 10 BYE'
+  - 'Content-Length:\s+0'
+  - 'P-NGCP-Src-Ip: 127.126.0.1'
+  - 'P-NGCP-Src-Port: \d+'
+  - 'P-NGCP-Src-Proto: udp'
+  - 'P-NGCP-Src-Af: 4'
+sip_out:
+  - [
+       '^SIP/2.0 200 OK',
+       'CSeq: 10 BYE'
+    ]
diff --git a/scenarios/reminder/sipp_scenario00.xml b/scenarios/reminder/sipp_scenario00.xml
index 0f33ee13..cef27b03 100644
--- a/scenarios/reminder/sipp_scenario00.xml
+++ b/scenarios/reminder/sipp_scenario00.xml
@@ -106,9 +106,23 @@
     ]]>
   </send>
 
-  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200, 500, 1000"/>
+  <recv request="BYE">
+  </recv>
 
-<!-- <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> -->
+  <send>
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
+      Content-Length: [len]
+
+    ]]>
+  </send>
 
 </scenario>