diff --git a/bin/generate_test_tt2.py b/bin/generate_test_tt2.py
index 3289b6dc..3f2c27ea 100755
--- a/bin/generate_test_tt2.py
+++ b/bin/generate_test_tt2.py
@@ -476,7 +476,7 @@ def cfgt_process(args):
     msgs = get_msgs(info["sip_in"])
     for msg in gen.run(msgs):
         for line in msg:
-            print(f" - '{line}'")
+            print(f"  - '{line}'")
     if len(info["sip_out"]) > 0:
         print("sip_out:")
         msgs = get_msgs(info["sip_out"])
diff --git a/tests/fixtures/incoming_shared_line/0023_test.yml.tt2 b/tests/fixtures/incoming_shared_line/0023_test.yml.tt2
index d25e845f..b5dbaa29 100644
--- a/tests/fixtures/incoming_shared_line/0023_test.yml.tt2
+++ b/tests/fixtures/incoming_shared_line/0023_test.yml.tt2
@@ -19,23 +19,23 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
- - 'CANCEL sip:[% scenarios.2.responders.0.username %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0'
- - 'To: <sip:[% scenarios.0.username %]@incoming-shared-line.scenarios-pbx.test>'
- - 'From: <sip:[% incoming_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]@incoming-shared-line.scenarios-pbx.test>;tag=[\w-]+'
- - 'CSeq: \d+ CANCEL'
- - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
- - 'P-LB-Uptime:\s+\d+'
- - 'P-Asserted-Identity: <sip:[% incoming_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]@incoming-shared-line.scenarios-pbx.test>'
- - 'P-Caller-UUID: [% incoming_shared_line_scenarios_pbx_test.testuser1003.uuid %]'
- - 'P-Callee-UUID: [% incoming_shared_line_scenarios_pbx_test.testuser1002.uuid %]'
- - 'P-NGCP-Rtpengine-Bleg: 1'
- - 'P-NGCP-Caller-Info: <sip:[% scenarios.2.username %]@incoming-shared-line.scenarios-pbx.test>;ip=[% scenarios.2.ip %];port=[% scenarios.2.port %];primary=[% incoming_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]'
- - 'P-NGCP-Callee-Info: <sip:[% incoming_shared_line_scenarios_pbx_test.testuser1002.phone_number %]@incoming-shared-line.scenarios-pbx.test>;ip=[% scenarios.2.responders.0.ip %];port=[% scenarios.2.responders.0.port %];primary=[% incoming_shared_line_scenarios_pbx_test.testuser1002.phone_number %]'
- - 'P-NGCP-Presence-Caller: sip:[% scenarios.2.username %]@incoming-shared-line.scenarios-pbx.test'
- - 'P-NGCP-Presence-Callee: sip:[% scenarios.0.username %]@incoming-shared-line.scenarios-pbx.test'
- - 'P-D-Uri: sip:lb@127.0.0.1;lr;received=sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];socket=sip:[% server_ip %]:5060'
- - 'Reason: SIP;cause=200;text="Call completed elsewhere"'
- - 'Content-Length:\s+0'
+  - 'CANCEL sip:[% scenarios.2.responders.0.username %]@[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %] SIP/2.0'
+  - 'To: <sip:[% scenarios.0.username %]@incoming-shared-line.scenarios-pbx.test>'
+  - 'From: <sip:[% incoming_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]@incoming-shared-line.scenarios-pbx.test>;tag=[\w-]+'
+  - 'CSeq: \d+ CANCEL'
+  - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
+  - 'P-LB-Uptime:\s+\d+'
+  - 'P-Asserted-Identity: <sip:[% incoming_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]@incoming-shared-line.scenarios-pbx.test>'
+  - 'P-Caller-UUID: [% incoming_shared_line_scenarios_pbx_test.testuser1003.uuid %]'
+  - 'P-Callee-UUID: [% incoming_shared_line_scenarios_pbx_test.testuser1002.uuid %]'
+  - 'P-NGCP-Rtpengine-Bleg: 1'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.2.username %]@incoming-shared-line.scenarios-pbx.test>;ip=[% scenarios.2.ip %];port=[% scenarios.2.port %];primary=[% incoming_shared_line_scenarios_pbx_test.testuser1003.pbx_phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% incoming_shared_line_scenarios_pbx_test.testuser1002.phone_number %]@incoming-shared-line.scenarios-pbx.test>;ip=[% scenarios.2.responders.0.ip %];port=[% scenarios.2.responders.0.port %];primary=[% incoming_shared_line_scenarios_pbx_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Presence-Caller: sip:[% scenarios.2.username %]@incoming-shared-line.scenarios-pbx.test'
+  - 'P-NGCP-Presence-Callee: sip:[% scenarios.0.username %]@incoming-shared-line.scenarios-pbx.test'
+  - 'P-D-Uri: sip:lb@127.0.0.1;lr;received=sip:[% scenarios.2.responders.0.ip %]:[% scenarios.2.responders.0.port %];socket=sip:[% server_ip %]:5060'
+  - 'Reason: SIP;cause=200;text="Call completed elsewhere"'
+  - 'Content-Length:\s+0'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
diff --git a/tests/fixtures/invite_alias/0002_test.yml.tt2 b/tests/fixtures/invite_alias/0002_test.yml.tt2
index cef3c33c..7140a26f 100644
--- a/tests/fixtures/invite_alias/0002_test.yml.tt2
+++ b/tests/fixtures/invite_alias/0002_test.yml.tt2
@@ -23,21 +23,21 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
- - 'REGISTER sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test SIP/2.0'
- - 'From: <sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
- - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test>'
- - 'CSeq: \d+ REGISTER'
- - 'Authorization: Digest username="[% scenarios.0.responders.0.username %]",realm="invite-alias.scenarios-pbx.test",uri="sip:[% server_ip %]:5060",nonce="[^"]+",response="[^"]+",algorithm=MD5'
- - 'Contact: sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP'
- - 'Content-Length:\s+0'
- - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
- - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]'
- - 'P-NGCP-Src-Proto: udp'
- - 'P-NGCP-Src-Af: 4'
- - 'P-Sock-Info: udp:[% server_ip %]:5060'
- - 'P-LB-Uptime:\s+\d+'
- - 'P-NGCP-Src-Nat: 1'
- - 'Path: <sip:lb@127.0.0.1;lr;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];socket=sip:[% server_ip %]:5060>'
+  - 'REGISTER sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test SIP/2.0'
+  - 'From: <sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test>'
+  - 'CSeq: \d+ REGISTER'
+  - 'Authorization: Digest username="[% scenarios.0.responders.0.username %]",realm="invite-alias.scenarios-pbx.test",uri="sip:[% server_ip %]:5060",nonce="[^"]+",response="[^"]+",algorithm=MD5'
+  - 'Contact: sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP'
+  - 'Content-Length:\s+0'
+  - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
+  - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]'
+  - 'P-NGCP-Src-Proto: udp'
+  - 'P-NGCP-Src-Af: 4'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
+  - 'P-LB-Uptime:\s+\d+'
+  - 'P-NGCP-Src-Nat: 1'
+  - 'Path: <sip:lb@127.0.0.1;lr;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];socket=sip:[% server_ip %]:5060>'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
diff --git a/tests/fixtures/invite_alias/0003_test.yml.tt2 b/tests/fixtures/invite_alias/0003_test.yml.tt2
index c354a849..9fdf4afc 100644
--- a/tests/fixtures/invite_alias/0003_test.yml.tt2
+++ b/tests/fixtures/invite_alias/0003_test.yml.tt2
@@ -21,30 +21,30 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
- - 'INVITE sip:[% invite_alias_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-alias.scenarios-pbx.test SIP/2.0'
- - '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: <sip:[% scenarios.0.username %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
- - 'To: <sip:[% invite_alias_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-alias.scenarios-pbx.test>'
- - 'CSeq: \d+ INVITE'
- - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %];alias=[^;]+>'
- - 'Content-Type: application/sdp'
- - 'Content-Length:\s+\d+'
- - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
- - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
- - 'P-NGCP-Src-Proto: udp'
- - 'P-NGCP-Src-Af: 4'
- - 'P-Sock-Info: udp:[% server_ip %]:5060'
- - 'P-LB-Uptime:\s+\d+'
- - 'P-NGCP-Src-Nat: 1'
- - 'v=0'
- - 'o=user1 \d+ \d+ IN IP4 [% scenarios.0.ip %]'
- - 's=-'
- - 'c=IN IP4 [% scenarios.0.ip %]'
- - 't=0 0'
- - 'm=audio [% scenarios.0.mport %] RTP/AVP 8'
- - 'a=rtpmap:8 PCMA/8000'
- - 'a=ptime:50'
+  - 'INVITE sip:[% invite_alias_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-alias.scenarios-pbx.test SIP/2.0'
+  - '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: <sip:[% scenarios.0.username %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
+  - 'To: <sip:[% invite_alias_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-alias.scenarios-pbx.test>'
+  - 'CSeq: \d+ INVITE'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %];alias=[^;]+>'
+  - 'Content-Type: application/sdp'
+  - 'Content-Length:\s+\d+'
+  - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
+  - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
+  - 'P-NGCP-Src-Proto: udp'
+  - 'P-NGCP-Src-Af: 4'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
+  - 'P-LB-Uptime:\s+\d+'
+  - 'P-NGCP-Src-Nat: 1'
+  - 'v=0'
+  - 'o=user1 \d+ \d+ IN IP4 [% scenarios.0.ip %]'
+  - 's=-'
+  - 'c=IN IP4 [% scenarios.0.ip %]'
+  - 't=0 0'
+  - 'm=audio [% scenarios.0.mport %] RTP/AVP 8'
+  - 'a=rtpmap:8 PCMA/8000'
+  - 'a=ptime:50'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
diff --git a/tests/fixtures/invite_alias/0006_test.yml.tt2 b/tests/fixtures/invite_alias/0006_test.yml.tt2
index f93a6938..f8e1fdb2 100644
--- a/tests/fixtures/invite_alias/0006_test.yml.tt2
+++ b/tests/fixtures/invite_alias/0006_test.yml.tt2
@@ -15,34 +15,34 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
- - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
- - 'From: <sip:[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
- - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test>'
- - 'CSeq: \d+ INVITE'
- - 'P-LB-Uptime:\s+\d+'
- - 'P-Asserted-Identity: <sip:[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias.scenarios-pbx.test>'
- - 'P-Caller-UUID: [% invite_alias_scenarios_pbx_test.testuser1002.uuid %]'
- - 'P-Callee-UUID: [% invite_alias_scenarios_pbx_test.testuser1003.uuid %]'
- - 'P-NGCP-Rtpengine-Bleg: 1'
- - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-alias.scenarios-pbx.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]'
- - 'P-NGCP-Callee-Info: <sip:[% invite_alias_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-alias.scenarios-pbx.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_alias_scenarios_pbx_test.testuser1003.pbx_phone_number %];alias=[% invite_alias_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]'
- - 'P-NGCP-Presence-Caller: sip:[% scenarios.0.username %]@invite-alias.scenarios-pbx.test'
- - 'P-NGCP-Presence-Callee: sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test'
- - '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'
- - 'Content-Length:\s+\d+'
- - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
- - 'v=0'
- - 'o=user1 \d+ \d+ IN IP4 [% server_ip %]'
- - 's=-'
- - 'c=IN IP4 [% server_ip %]'
- - 't=0 0'
- - 'm=audio \d+ RTP/AVP 8'
- - 'a=rtpmap:8 PCMA/8000'
- - 'a=sendrecv'
- - 'a=rtcp:\d+'
- - 'a=rtcp-mux'
- - 'a=ptime:50'
+  - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
+  - 'From: <sip:[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test>'
+  - 'CSeq: \d+ INVITE'
+  - 'P-LB-Uptime:\s+\d+'
+  - 'P-Asserted-Identity: <sip:[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias.scenarios-pbx.test>'
+  - 'P-Caller-UUID: [% invite_alias_scenarios_pbx_test.testuser1002.uuid %]'
+  - 'P-Callee-UUID: [% invite_alias_scenarios_pbx_test.testuser1003.uuid %]'
+  - 'P-NGCP-Rtpengine-Bleg: 1'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-alias.scenarios-pbx.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% invite_alias_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-alias.scenarios-pbx.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_alias_scenarios_pbx_test.testuser1003.pbx_phone_number %];alias=[% invite_alias_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]'
+  - 'P-NGCP-Presence-Caller: sip:[% scenarios.0.username %]@invite-alias.scenarios-pbx.test'
+  - 'P-NGCP-Presence-Callee: sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test'
+  - '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'
+  - 'Content-Length:\s+\d+'
+  - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
+  - 'v=0'
+  - 'o=user1 \d+ \d+ IN IP4 [% server_ip %]'
+  - 's=-'
+  - 'c=IN IP4 [% server_ip %]'
+  - 't=0 0'
+  - 'm=audio \d+ RTP/AVP 8'
+  - 'a=rtpmap:8 PCMA/8000'
+  - 'a=sendrecv'
+  - 'a=rtcp:\d+'
+  - 'a=rtcp-mux'
+  - 'a=ptime:50'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
diff --git a/tests/fixtures/invite_alias/0017_test.yml.tt2 b/tests/fixtures/invite_alias/0017_test.yml.tt2
index 806947cd..cdf621ec 100644
--- a/tests/fixtures/invite_alias/0017_test.yml.tt2
+++ b/tests/fixtures/invite_alias/0017_test.yml.tt2
@@ -13,16 +13,16 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
- - 'SIP/2.0 200 OK'
- - 'From: <sip:[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
- - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
- - 'CSeq: \d+ BYE'
- - 'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP>'
- - 'Content-Length:\s+0'
- - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
- - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]'
- - 'P-NGCP-Src-Proto: udp'
- - 'P-NGCP-Src-Af: 4'
+  - 'SIP/2.0 200 OK'
+  - 'From: <sip:[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
+  - 'CSeq: \d+ BYE'
+  - 'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP>'
+  - 'Content-Length:\s+0'
+  - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
+  - 'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]'
+  - 'P-NGCP-Src-Proto: udp'
+  - 'P-NGCP-Src-Af: 4'
 sip_out:
   - [
       'SIP/2.0 200 OK',
diff --git a/tests/fixtures/invite_alias/0018_test.yml.tt2 b/tests/fixtures/invite_alias/0018_test.yml.tt2
index 47a8b989..c4922104 100644
--- a/tests/fixtures/invite_alias/0018_test.yml.tt2
+++ b/tests/fixtures/invite_alias/0018_test.yml.tt2
@@ -15,14 +15,14 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
- - 'SIP/2.0 200 OK'
- - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;vsf=[^;]+;rtpprx=yes>'
- - '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: <sip:[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
- - 'To: <sip:[% invite_alias_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
- - 'CSeq: \d+ BYE'
- - 'Content-Length:\s+0'
+  - 'SIP/2.0 200 OK'
+  - 'Record-Route: <sip:127.0.0.1:5062;lr=on;ftag=[^;]+;vsf=[^;]+;rtpprx=yes>'
+  - '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: <sip:[% invite_alias_scenarios_pbx_test.testuser1002.phone_number %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
+  - 'To: <sip:[% invite_alias_scenarios_pbx_test.testuser1003.alias_numbers.0.phone_number %]@invite-alias.scenarios-pbx.test>;tag=[\w-]+'
+  - 'CSeq: \d+ BYE'
+  - 'Content-Length:\s+0'
 sip_out:
   - [
       'SIP/2.0 200 OK',
diff --git a/tests/fixtures/invite_manager_2sec/0026_test.yml.tt2 b/tests/fixtures/invite_manager_2sec/0026_test.yml.tt2
index 270ad76c..597144ba 100644
--- a/tests/fixtures/invite_manager_2sec/0026_test.yml.tt2
+++ b/tests/fixtures/invite_manager_2sec/0026_test.yml.tt2
@@ -169,51 +169,51 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
- - 'INVITE sip:[% invite_manager_2sec_scenarios_pbx_test.secretary1.pbx_phone_number %]@invite-manager-2sec.scenarios-pbx.test SIP/2.0'
- - 'From: <sip:[% scenarios.1.username %]@invite-manager-2sec.scenarios-pbx.test>;tag=[\w-]+'
- - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-manager-2sec.scenarios-pbx.test>'
- - 'CSeq: \d+ INVITE'
- - 'P-HIH-Cause: 302'
- - 'P-NGCP-Sems-Instance: sbc'
- - 'P-Caller-UUID: [% invite_manager_2sec_scenarios_pbx_test.manager.uuid %]'
- - 'P-MS-Forward-Active: 1'
- - 'P-First-Caller-UPN: [% invite_manager_2sec_scenarios_pbx_test.manager.phone_number %]1003'
- - 'P-First-Caller-NPN: [% invite_manager_2sec_scenarios_pbx_test.manager.phone_number %]1003'
- - 'P-First-Caller-UPD: invite-manager-2sec.scenarios-pbx.test'
- - 'P-First-Caller-NPD: invite-manager-2sec.scenarios-pbx.test'
- - 'P-Acc-Caller-User: manager'
- - 'P-Acc-Caller-Domain: invite-manager-2sec.scenarios-pbx.test'
- - 'P-Acc-State: cfu'
- - 'P-From-Peer: 0'
- - 'P-First-V46-RTP: auto'
- - 'P-First-RTP: ice_strip_candidates'
- - 'P-First-RTP-Transport: transparent'
- - 'P-First-Caller-CLIR: 0'
- - 'P-CF-Depth: 1'
- - 'P-First-Caller-UA-Mode: strip'
- - 'P-First-Caller-Cloud-PBX: [% invite_manager_2sec_customerpbx_test.id %]'
- - 'P-First-Caller-PBX-Ext: [% invite_manager_2sec_scenarios_pbx_test.testuser1003.pbx_extension %]'
- - 'P-Callee-Account-ID: [% invite_manager_2sec_customerpbx_test.id %]'
- - 'P-Orig-Callee-Dialed: manager'
- - 'P-Prev-Caller-UUID: [% invite_manager_2sec_scenarios_pbx_test.testuser1003.uuid %]'
- - 'P-First-Caller-RTP-Interface: ext'
- - 'P-First-Caller-RTP-Interface-Source: default'
- - 'P-NGCP-Presence-Caller: sip:[% scenarios.1.username %]@invite-manager-2sec.scenarios-pbx.test'
- - 'P-NGCP-Caller-Info: <sip:[% scenarios.1.username %]@invite-manager-2sec.scenarios-pbx.test>;ip=[% scenarios.1.ip %];port=[% scenarios.1.port %];primary=[% invite_manager_2sec_scenarios_pbx_test.testuser1003.pbx_phone_number %]'
- - 'P-NGCP-Forward-Info: <sip:[% scenarios.0.responders.0.username %]@invite-manager-2sec.scenarios-pbx.test>;ip=127.0.0.1;port=5080;primary=[% invite_manager_2sec_scenarios_pbx_test.manager.phone_number %]'
- - 'P-NGCP-Callee-Info: <sip:[% invite_manager_2sec_scenarios_pbx_test.secretary1.pbx_phone_number %]@invite-manager-2sec.scenarios-pbx.test>;ip=127.0.0.1;port=5080'
- - 'Content-Type: application/sdp'
- - 'Content-Length:\s+\d+'
- - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
- - 'v=0'
- - 'o=user1 \d+ \d+ IN IP4 [% scenarios.0.ip %]'
- - 's=-'
- - 'c=IN IP4 [% scenarios.0.ip %]'
- - 't=0 0'
- - 'm=audio [% scenarios.1.mport %] RTP/AVP 8'
- - 'a=rtpmap:8 PCMA/8000'
- - 'a=sendrecv'
- - 'a=ptime:50'
+  - 'INVITE sip:[% invite_manager_2sec_scenarios_pbx_test.secretary1.pbx_phone_number %]@invite-manager-2sec.scenarios-pbx.test SIP/2.0'
+  - 'From: <sip:[% scenarios.1.username %]@invite-manager-2sec.scenarios-pbx.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-manager-2sec.scenarios-pbx.test>'
+  - 'CSeq: \d+ INVITE'
+  - 'P-HIH-Cause: 302'
+  - 'P-NGCP-Sems-Instance: sbc'
+  - 'P-Caller-UUID: [% invite_manager_2sec_scenarios_pbx_test.manager.uuid %]'
+  - 'P-MS-Forward-Active: 1'
+  - 'P-First-Caller-UPN: [% invite_manager_2sec_scenarios_pbx_test.manager.phone_number %]1003'
+  - 'P-First-Caller-NPN: [% invite_manager_2sec_scenarios_pbx_test.manager.phone_number %]1003'
+  - 'P-First-Caller-UPD: invite-manager-2sec.scenarios-pbx.test'
+  - 'P-First-Caller-NPD: invite-manager-2sec.scenarios-pbx.test'
+  - 'P-Acc-Caller-User: manager'
+  - 'P-Acc-Caller-Domain: invite-manager-2sec.scenarios-pbx.test'
+  - 'P-Acc-State: cfu'
+  - 'P-From-Peer: 0'
+  - 'P-First-V46-RTP: auto'
+  - 'P-First-RTP: ice_strip_candidates'
+  - 'P-First-RTP-Transport: transparent'
+  - 'P-First-Caller-CLIR: 0'
+  - 'P-CF-Depth: 1'
+  - 'P-First-Caller-UA-Mode: strip'
+  - 'P-First-Caller-Cloud-PBX: [% invite_manager_2sec_customerpbx_test.id %]'
+  - 'P-First-Caller-PBX-Ext: [% invite_manager_2sec_scenarios_pbx_test.testuser1003.pbx_extension %]'
+  - 'P-Callee-Account-ID: [% invite_manager_2sec_customerpbx_test.id %]'
+  - 'P-Orig-Callee-Dialed: manager'
+  - 'P-Prev-Caller-UUID: [% invite_manager_2sec_scenarios_pbx_test.testuser1003.uuid %]'
+  - 'P-First-Caller-RTP-Interface: ext'
+  - 'P-First-Caller-RTP-Interface-Source: default'
+  - 'P-NGCP-Presence-Caller: sip:[% scenarios.1.username %]@invite-manager-2sec.scenarios-pbx.test'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.1.username %]@invite-manager-2sec.scenarios-pbx.test>;ip=[% scenarios.1.ip %];port=[% scenarios.1.port %];primary=[% invite_manager_2sec_scenarios_pbx_test.testuser1003.pbx_phone_number %]'
+  - 'P-NGCP-Forward-Info: <sip:[% scenarios.0.responders.0.username %]@invite-manager-2sec.scenarios-pbx.test>;ip=127.0.0.1;port=5080;primary=[% invite_manager_2sec_scenarios_pbx_test.manager.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% invite_manager_2sec_scenarios_pbx_test.secretary1.pbx_phone_number %]@invite-manager-2sec.scenarios-pbx.test>;ip=127.0.0.1;port=5080'
+  - 'Content-Type: application/sdp'
+  - 'Content-Length:\s+\d+'
+  - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
+  - 'v=0'
+  - 'o=user1 \d+ \d+ IN IP4 [% scenarios.0.ip %]'
+  - 's=-'
+  - 'c=IN IP4 [% scenarios.0.ip %]'
+  - 't=0 0'
+  - 'm=audio [% scenarios.1.mport %] RTP/AVP 8'
+  - 'a=rtpmap:8 PCMA/8000'
+  - 'a=sendrecv'
+  - 'a=ptime:50'
 sip_out:
   - [
       'SIP/2.0 100 Trying',