diff --git a/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2
index 6638f543..62ea5d9c 100644
--- a/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2
@@ -3,32 +3,34 @@ flow:
   - start|ROUTE_NET_INFO:
   - end|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
-  - start|ROUTE_INVITE:
-  - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
-  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
-  - start|ROUTE_FIND_CALLER:
-  - start|ROUTE_AUTH:
-  - exit|ROUTE_AUTH:
+  - start|ROUTE_OUTBOUND:
+  - exit|ROUTE_OUTBOUND:
       $avp(proto): ["udp"]
+  - start|REPLY_ROUTE_NAT:
+  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^INVITE'
   - 'Contact: <sip:testuser1003@'
-  - 'To: <sip:testuser1002@'
-  - 'CSeq: 11 INVITE'
-  - 'Max-Forwards: 16'
+  - 'CSeq: 10 INVITE'
   - 'Content-Type: application/sdp'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 11 INVITE',
+      'CSeq: 10 INVITE',
       'From: <sip:testuser1003@',
-      'To: <sip:testuser1002@'
+      'To: <sip:4311002@'
     ]
   - [
-      '^SIP/2.0 407 Proxy Authentication Required',
-      'CSeq: 11 INVITE',
+      '^INVITE sip:testuser1002@',
+      'CSeq: 10 INVITE',
       'From: <sip:testuser1003@',
-      'To: <sip:testuser1002@'
+      'To: <sip:testuser1002@',
+      'Content-Type: application/sdp'
+    ]
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 10 INVITE',
+      'From: <sip:testuser1003@',
+      'To: <sip:4311002@',
+      'Content-Type: application/sdp'
     ]
diff --git a/scenarios/invite_tcp_udp_reinvite/0011_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0011_test.yml.tt2
deleted file mode 100644
index 32b923c7..00000000
--- a/scenarios/invite_tcp_udp_reinvite/0011_test.yml.tt2
+++ /dev/null
@@ -1,108 +0,0 @@
-flow:
-  - start|MAIN:
-  - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
-  - start|ROUTE_PRX_REQUEST:
-  - start|ROUTE_INVITE:
-  - start|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
-  - start|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_CLEAR_CALLEE_DOMAIN_PREF:
-  - end|ROUTE_LOAD_CALLEE_DOMAIN_PREF:
-  - start|ROUTE_FIND_CALLER:
-  - start|ROUTE_AUTH:
-  - start|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_ADD_CALLINFO_REPLY:
-  - end|ROUTE_AUTH:
-  - end|ROUTE_FIND_CALLER:
-  - start|ROUTE_LOAD_CALLER_PREF:
-  - start|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_CLEAR_CALLER_PREF:
-  - end|ROUTE_LOAD_CALLER_PREF:
-  - start|ROUTE_GET_CALLER_CLI:
-  - end|ROUTE_GET_CALLER_CLI:
-  - start|ROUTE_GET_FORWARDER_CLI:
-  - end|ROUTE_GET_FORWARDER_CLI:
-  - start|ROUTE_CHECK_USERPROV_CLI:
-  - start|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_CLI_ALLOWED:
-  - end|ROUTE_CHECK_USERPROV_CLI:
-  - start|ROUTE_CLIR:
-  - end|ROUTE_CLIR:
-  - start|ROUTE_FIND_CALLEE:
-  - start|ROUTE_CLEAR_CALLEE_PREF:
-  - end|ROUTE_CLEAR_CALLEE_PREF:
-  - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
-  - start|ROUTE_NCOS:
-  - end|ROUTE_NCOS:
-  - start|ROUTE_BLOCK_OUT:
-  - end|ROUTE_BLOCK_OUT:
-  - start|ROUTE_CHECK_PBX:
-  - return|ROUTE_CHECK_PBX:
-  - start|ROUTE_INVITE_TO_EXT:
-  - start|ROUTE_OUTBOUND:
-  - start|ROUTE_ACC_CALLER:
-  - end|ROUTE_ACC_CALLER:
-  - start|ROUTE_ACC_CALLEE:
-  - end|ROUTE_ACC_CALLEE:
-  - start|BRANCH_ROUTE_SBC:
-  - start|ROUTE_BRANCH_ACC_RTP:
-  - end|ROUTE_BRANCH_ACC_RTP:
-  - start|ROUTE_PREPARE_SST:
-  - end|ROUTE_PREPARE_SST:
-[% IF PRO -%]
-  - start|ROUTE_PREPARE_MOH:
-  - end|ROUTE_PREPARE_MOH:
-[% END -%]
-  - start|ROUTE_SET_CALLER_CLI:
-  - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - start|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_PREPARE_CALLER_CLI:
-  - end|ROUTE_SET_CALLER_CLI:
-  - start|ROUTE_SET_CALLEE:
-  - end|ROUTE_SET_CALLEE:
-  - start|ROUTE_ADD_CALLINFO:
-  - end|ROUTE_ADD_CALLINFO:
-  - end|BRANCH_ROUTE_SBC:
-  - exit|ROUTE_OUTBOUND:
-      $avp(proto): ["udp"]
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-sip_in:
-  - '^INVITE'
-  - 'Contact: <sip:testuser1003@'
-  - 'CSeq: 12 INVITE'
-  - 'Max-Forwards: 16'
-  - 'Content-Type: application/sdp'
-  - 'Proxy-Authorization: Digest username="testuser1003"'
-sip_out:
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 12 INVITE',
-      'From: <sip:testuser1003@',
-      'To: <sip:testuser1002@'
-    ]
-  - [
-      '^SIP/2.0 101 Connecting',
-      'CSeq: 12 INVITE',
-      'From: <sip:testuser1003@',
-      'To: <sip:testuser1002@'
-    ]
-  - [
-      '^INVITE sip:127.0.0.1:5080',
-      'CSeq: 12 INVITE',
-      'From: <sip:testuser1003@',
-      'To: <sip:testuser1002@',
-      'Content-Type: application/sdp',
-      'P-App-Name: sbc'
-    ]
diff --git a/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2
index 84c41d42..5f257c33 100644
--- a/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2
@@ -1,42 +1,46 @@
+# INVITE_OFFLINE scenario
 flow:
   - start|MAIN:
   - start|ROUTE_NET_INFO:
   - end|ROUTE_NET_INFO:
   - start|ROUTE_PRX_REQUEST:
+  - start|ROUTE_STOP_RTPPROXY:
+  - end|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-    $avp(proto): ["tcp"]
-  # 101 Connecting
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
   # 200 OK
   - start|REPLY_ROUTE_NAT:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
-  - '^INVITE sip:testuser1002@'
-  - 'Contact: <sip:testuser1003@'
-  - 'From: <sip:testuser1003@'
-  - 'To: <sip:4311002@'
-  - 'CSeq: 10 INVITE'
-  - 'Content-Type: application/sdp'
+  - '^BYE sip:127.0.0.1:5080 SIP/2.0'
+  - 'Contact: <sip:testuser1002@'
+  - 'CSeq: 11 BYE'
+  - 'Max-Forwards: 16'
+  - 'Content-Length: 0'
+  - 'From: <sip:testuser1002@'
+  - 'To: <sip:testuser1003@'
+
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 10 INVITE',
-      'From: <sip:testuser1003@',
-      'To: <sip:4311002@'
+      'CSeq: 11 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1003@'
     ]
   - [
-      '^INVITE sip:testuser1002@',
-      'CSeq: 10 INVITE',
-      'From: <sip:testuser1003@',
-      'To: <sip:testuser1002@',
-      'Content-Type: application/sdp'
+      '^BYE sip:127.0.0.1:5080 SIP/2.0',
+      'Contact: <sip:testuser1002@',
+      'CSeq: 11 BYE',
+      'Max-Forwards: 15',
+      'Content-Length: 0',
+      'From: <sip:4311002@',
+      'To: <sip:testuser1003@'
     ]
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 10 INVITE',
-      'From: <sip:testuser1003@',
-      'To: <sip:4311002@',
-      'P-NGCP-Src-Proto: tcp'
-    ]
\ No newline at end of file
+      'CSeq: 11 BYE',
+      'Content-Length: 0',
+      'From: <sip:testuser1002@',
+      'To: <sip:testuser1003@'
+    ]
diff --git a/scenarios/invite_tcp_udp_reinvite/0018_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0018_test.yml.tt2
deleted file mode 100644
index 5f257c33..00000000
--- a/scenarios/invite_tcp_udp_reinvite/0018_test.yml.tt2
+++ /dev/null
@@ -1,46 +0,0 @@
-# INVITE_OFFLINE scenario
-flow:
-  - start|MAIN:
-  - start|ROUTE_NET_INFO:
-  - end|ROUTE_NET_INFO:
-  - start|ROUTE_PRX_REQUEST:
-  - start|ROUTE_STOP_RTPPROXY:
-  - end|ROUTE_STOP_RTPPROXY:
-  - start|ROUTE_OUTBOUND:
-  - exit|ROUTE_OUTBOUND:
-  # 200 OK
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-sip_in:
-  - '^BYE sip:127.0.0.1:5080 SIP/2.0'
-  - 'Contact: <sip:testuser1002@'
-  - 'CSeq: 11 BYE'
-  - 'Max-Forwards: 16'
-  - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
-
-sip_out:
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
-  - [
-      '^BYE sip:127.0.0.1:5080 SIP/2.0',
-      'Contact: <sip:testuser1002@',
-      'CSeq: 11 BYE',
-      'Max-Forwards: 15',
-      'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@'
-    ]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 11 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
-    ]
diff --git a/scenarios/invite_tcp_udp_reinvite/sipp_scenario_responder00.xml b/scenarios/invite_tcp_udp_reinvite/sipp_scenario_responder00.xml
index be8908b0..ae4c7388 100644
--- a/scenarios/invite_tcp_udp_reinvite/sipp_scenario_responder00.xml
+++ b/scenarios/invite_tcp_udp_reinvite/sipp_scenario_responder00.xml
@@ -53,7 +53,7 @@
     ]]>
   </send>
 
-  <recv request="ACK" rtd="true"/>
+  <recv request="ACK" rtd="true" rrs="true"/>
 
   <pause milliseconds="500"/>
 
@@ -65,6 +65,7 @@
       From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag01[call_number]
       To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[$3]
       [last_Call-ID:]
+      [routes]
       CSeq: [cseq] INVITE
       Contact: <sip:[field0 file="callee.csv"]@[local_ip]:[local_port];transport=[transport]>
       Max-Forwards: 70
@@ -86,40 +87,6 @@
   <recv response="100" optional="true">
   </recv>
 
-  <recv response="407" auth="true">
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      INVITE [$2] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag01[call_number]
-      To: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[$3]
-      [last_Call-ID:]
-      CSeq: [cseq] INVITE
-      Contact: <sip:[field0 file="callee.csv"]@[local_ip]:[local_port];transport=[transport]>
-      Max-Forwards: 70
-      [field2 file="callee.csv"]
-      Content-Type: application/sdp
-      Content-Length: [len]
-      P-Test: yes
-
-      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="180" optional="true">
   </recv>