diff --git a/bin/generate_test_tt2.py b/bin/generate_test_tt2.py
index e46d0d86..74410f64 100755
--- a/bin/generate_test_tt2.py
+++ b/bin/generate_test_tt2.py
@@ -255,6 +255,7 @@ class Generator:
             rules.append((r";ftag=[^;>]+", r";ftag=[^;]+"))
             rules.append((r";aset=[^;>]+", r";aset=\\d+"))
             rules.append((r";vsf=[^;>]+", r";vsf=[^;]+"))
+            rules.append((r";vst=[^;>]+", r";vst=[^;]+"))
         elif hdr == "contact":
             rules.append((r"expires=[1-9]\d*", r"expires=\\d+"))
             rules.append((r";ngcpct=[^;>]+", r";ngcpct=[^;]+"))
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00_test.yml.tt2
index e384bb44..b0874fd0 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00_test.yml.tt2
@@ -3,10 +3,10 @@ messages:
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+>'
-  - 'From: <sip:1001@invite-peerout-rewrite-pv-regex.scenarios.test>;tag=[\w-]+'
+  - 'From: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:4321001@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
-  - 'P-Asserted-Identity: <sip:1001@invite-peerout-rewrite-pv-regex.scenarios.test>'
+  - 'P-Asserted-Identity: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>'
   - 'Content-Type: application/sdp'
   - 'Content-Length: \d+'
   - 'Contact: <sip:ngcp-lb@[% server_ip %]:5060;ngcpct=[^;]+>'
@@ -24,7 +24,7 @@ messages:
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+>'
-  - 'From: <sip:1001@invite-peerout-rewrite-pv-regex.scenarios.test>;tag=[\w-]+'
+  - 'From: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:4321001@[% scenarios.0.responders.0.ip %]>;tag=[\w-]+'
   - 'CSeq: \d+ ACK'
   - 'Content-Length: 0'
@@ -33,8 +33,8 @@ messages:
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes>'
   - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+>'
-  - 'From: <sip:1001@invite-peerout-rewrite-pv-regex.scenarios.test>;tag=[\w-]+'
+  - 'From: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:4321001@[% scenarios.0.responders.0.ip %]>;tag=[\w-]+'
   - 'CSeq: \d+ BYE'
-  - 'P-Asserted-Identity: <sip:1001@invite-peerout-rewrite-pv-regex.scenarios.test>'
+  - 'P-Asserted-Identity: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>'
   - 'Content-Length: 0'
diff --git a/scenarios/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2 b/scenarios/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2
index 4a089cde..53e9d527 100644
--- a/scenarios/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2
+++ b/scenarios/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2
@@ -19,7 +19,7 @@ messages:
   - 'Server: Sipwise NGCP LB'
   - 'Content-Length: 0'
 - - 'SIP/2.0 180 Ringing'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes;vsf=[^;]+;vst=cmZudmlLY3dhaXZrJgErOjEHJnsHDxYfGy4AA0wdEwdLHTcldgAgMxsLAB8GOE0DBBoCUBMbID5lAys5Gw8->'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes;vsf=[^;]+;vst=[^;]+>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;nat=yes;socket=udp:[% server_ip %]:5060>'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;nat=yes;socket=udp:[% server_ip %]:5060>'
   - 'From: <tel:\+[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]>;tag=[\w-]+'
@@ -28,7 +28,7 @@ messages:
   - 'Content-Length: 0'
   - 'Contact: <sip:ngcp-lb@[% server_ip %]:5060;ngcpct=[^;]+>'
 - - 'SIP/2.0 200 OK'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes;vsf=[^;]+;vst=cmZudmlLY3dhaXZrJgErOjEHJnsHDxYfGy4AA0wdEwdLHTcldgAgMxsLAB8GOE0DBBoCUBMbID5lAys5Gw8->'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes;vsf=[^;]+;vst=[^;]+>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;nat=yes;socket=udp:[% server_ip %]:5060>'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;nat=yes;socket=udp:[% server_ip %]:5060>'
   - 'From: <tel:\+[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]>;tag=[\w-]+'
@@ -48,7 +48,7 @@ messages:
   - 'a=rtcp:\d+'
   - 'a=ptime:50'
 - - 'SIP/2.0 200 OK'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;vsf=[^;]+;vst=cmZudmlLY3dhaXZrJgErOjEHJnsHDxYfGy4AA0wdEwdLHTcldgAgMxsLAB8GOE0DBBoCUBMbID5lAys5Gw8-;rtpprx=yes>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;vsf=[^;]+;vst=[^;]+;rtpprx=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=udp:[% server_ip %]:5060>'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=udp:[% server_ip %]:5060>'
   - 'From: <tel:\+[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]>;tag=[\w-]+'
diff --git a/tests/fixtures/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2 b/tests/fixtures/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2
index 215fc7d3..99b97686 100644
--- a/tests/fixtures/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2
+++ b/tests/fixtures/invite_redirect_tel_uri/sipp_scenario00_test.yml.tt2
@@ -19,7 +19,7 @@ messages:
   - 'Server: Sipwise NGCP LB'
   - 'Content-Length: 0'
 - - 'SIP/2.0 180 Ringing'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes;vsf=[^;]+;vst=dHx5SlZXRXl3aXJGNDwYMx4AAmsBFQEjJDImDVodFypZIAQsWQcEIx0RFyM5JGsNEhoGfQEmEzdKBA8pHRU->'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes;vsf=[^;]+;vst=[^;]+>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;nat=yes;socket=udp:[% server_ip %]:5060>'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;nat=yes;socket=udp:[% server_ip %]:5060>'
   - 'From: <tel:\+[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]>;tag=[\w-]+'
@@ -28,7 +28,7 @@ messages:
   - 'Content-Length: 0'
   - 'Contact: <sip:ngcp-lb@[% server_ip %]:5060;ngcpct=[^;]+>'
 - - 'SIP/2.0 200 OK'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes;vsf=[^;]+;vst=dHx5SlZXRXl3aXJGNDwYMx4AAmsBFQEjJDImDVodFypZIAQsWQcEIx0RFyM5JGsNEhoGfQEmEzdKBA8pHRU->'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;did=[^;]+;ice_caller=strip;ice_callee=strip;aset=\d+;rtpprx=yes;vsf=[^;]+;vst=[^;]+>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;nat=yes;socket=udp:[% server_ip %]:5060>'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;nat=yes;socket=udp:[% server_ip %]:5060>'
   - 'From: <tel:\+[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]>;tag=[\w-]+'
@@ -49,7 +49,7 @@ messages:
   - 'a=rtcp:\d+'
   - 'a=ptime:50'
 - - 'SIP/2.0 200 OK'
-  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;vsf=[^;]+;vst=dHx5SlZXRXl3aXJGNDwYMx4AAmsBFQEjJDImDVodFypZIAQsWQcEIx0RFyM5JGsNEhoGfQEmEzdKBA8pHRU-;rtpprx=yes>'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;vsf=[^;]+;vst=[^;]+;rtpprx=yes>'
   - 'Record-Route: <sip:127.0.0.1;r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=udp:[% server_ip %]:5060>'
   - 'Record-Route: <sip:[% server_ip %];r2=on;lr=on;ftag=[^;]+;ngcplb=yes;socket=udp:[% server_ip %]:5060>'
   - 'From: <tel:\+[% invite_redirect_tel_uri_scenarios_test.testuser1000.phone_number %]>;tag=[\w-]+'