From a45680463b8057a9c5c22659cef6667752fd6acc Mon Sep 17 00:00:00 2001
From: Andrew Pogrebennyk <apogrebennyk@sipwise.com>
Date: Wed, 20 Sep 2017 13:21:33 +0200
Subject: [PATCH] TT#21894 fix kamailio-config-tests for new sems in PRO

Change-Id: I786eb2beca241205057bd6a637c7d5e84f1aeeb3
---
 scenarios/incoming_hih/0005_test.yml.tt2      |  6 +--
 scenarios/incoming_hih/0014_test.yml.tt2      | 29 ++---------
 scenarios/incoming_hih/0015_test.yml.tt2      | 49 +------------------
 scenarios/incoming_hih/0016_test.yml.tt2      |  8 ---
 .../invite_callforward/0011_test.yml.tt2      |  6 +--
 .../invite_callforward/0020_test.yml.tt2      | 29 ++---------
 .../invite_callforward/0021_test.yml.tt2      | 49 +------------------
 .../invite_callforward/0022_test.yml.tt2      |  8 ---
 .../invite_callforward/0029_test.yml.tt2      | 10 ++--
 .../invite_callforward/0031_test.yml.tt2      |  4 +-
 .../invite_callforward/0033_test.yml.tt2      |  4 +-
 .../invite_callforward/0038_test.yml.tt2      | 29 ++---------
 .../invite_callforward/0039_test.yml.tt2      | 49 +------------------
 .../invite_callforward/0040_test.yml.tt2      |  9 ----
 .../0005_test.yml.tt2                         |  6 +--
 .../0011_test.yml.tt2                         | 10 ++--
 .../0014_test.yml.tt2                         | 29 ++---------
 .../0015_test.yml.tt2                         | 49 +------------------
 .../invite_tcp_udp_reinvite/0010_test.yml.tt2 |  6 +--
 .../invite_tcp_udp_reinvite/0013_test.yml.tt2 |  6 +--
 scenarios/invite_voicebox/0005_test.yml.tt2   |  6 +--
 scenarios/invite_voicebox/0012_test.yml.tt2   | 29 ++---------
 scenarios/invite_voicebox/0013_test.yml.tt2   | 49 +------------------
 scenarios/lock_ported/0007_test.yml.tt2       |  6 +--
 scenarios/lock_ported/0016_test.yml.tt2       | 29 ++---------
 scenarios/lock_ported/0017_test.yml.tt2       | 49 +------------------
 scenarios/lock_ported/0018_test.yml.tt2       |  8 ---
 scenarios_lnp/incoming_peer/0003_test.yml.tt2 |  4 +-
 scenarios_lnp/incoming_peer/0005_test.yml.tt2 |  4 +-
 scenarios_lnp/incoming_peer/0007_test.yml.tt2 |  4 +-
 scenarios_lnp/incoming_peer/0010_test.yml.tt2 |  4 +-
 scenarios_lnp/incoming_peer/0013_test.yml.tt2 | 49 +------------------
 scenarios_lnp/incoming_peer/0014_test.yml.tt2 |  8 ---
 33 files changed, 71 insertions(+), 573 deletions(-)

diff --git a/scenarios/incoming_hih/0005_test.yml.tt2 b/scenarios/incoming_hih/0005_test.yml.tt2
index 3bb72f16..302c3f9d 100644
--- a/scenarios/incoming_hih/0005_test.yml.tt2
+++ b/scenarios/incoming_hih/0005_test.yml.tt2
@@ -172,7 +172,7 @@ flow:
 sip_in:
   - '^INVITE sip:4311002@'
   - 'Contact: <sip:127.0.0.1:5080'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: \w+'
   - 'P-First-Caller-UPN: 004321001'
@@ -184,13 +184,13 @@ sip_in:
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:004321001@',
       'To: <sip:4311003@'
     ]
   - [
       '^INVITE sip:testuser1002@',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:004321001@',
       'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
       'To: <sip:4311003@',
diff --git a/scenarios/incoming_hih/0014_test.yml.tt2 b/scenarios/incoming_hih/0014_test.yml.tt2
index 00b571e0..052da2ff 100644
--- a/scenarios/incoming_hih/0014_test.yml.tt2
+++ b/scenarios/incoming_hih/0014_test.yml.tt2
@@ -1,8 +1,4 @@
 flow:
-[% IF PRO %]
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-[% ELSE %]
   - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
@@ -19,44 +15,25 @@ flow:
   - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-[% END %]
 sip_in:
-[% IF PRO %]
-  - '^SIP/2.0 200 OK'
-  - 'CSeq: 2 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311003@'
-[% ELSE %]
   - '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:004321001@'
   - 'To: <sip:4311003@'
-[% END %]
 sip_out:
-[% IF PRO %]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 2 BYE',
-      'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
-    ]
-[% ELSE %]
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:004321001@',
       'To: <sip:4311003@'
     ]
   - [
       '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
       'From: <sip:004321001@',
       'To: <sip:4311003@'
     ]
-[% END %]
diff --git a/scenarios/incoming_hih/0015_test.yml.tt2 b/scenarios/incoming_hih/0015_test.yml.tt2
index a855df8a..36e659ec 100644
--- a/scenarios/incoming_hih/0015_test.yml.tt2
+++ b/scenarios/incoming_hih/0015_test.yml.tt2
@@ -1,62 +1,17 @@
 flow:
-[% IF CE %]
   - start|REPLY_ROUTE_NAT:
   - exit|REPLY_ROUTE_NAT:
-[% ELSE %]
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - 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_OUTBOUND:
-  - exit|ROUTE_OUTBOUND:
-[% END %]
 sip_in:
-[% IF CE %]
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:004321001@'
   - 'To: <sip:4311003@'
-[% ELSE %]
-  - '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
-  - 'CSeq: 11 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311003@'
-[% END %]
 sip_out:
-[% IF CE %]
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 11 BYE',
-      'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
-    ]
-[% ELSE %]
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
-      'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311003@'
-    ]
-  - [
-      '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
-      'CSeq: 11 BYE',
-      'Max-Forwards: 70',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:004321001@',
       'To: <sip:4311003@'
     ]
-[% END %]
diff --git a/scenarios/incoming_hih/0016_test.yml.tt2 b/scenarios/incoming_hih/0016_test.yml.tt2
index c3d400c2..690618f4 100644
--- a/scenarios/incoming_hih/0016_test.yml.tt2
+++ b/scenarios/incoming_hih/0016_test.yml.tt2
@@ -4,21 +4,13 @@ flow:
 sip_in:
   - '^SIP/2.0 200 OK'
   - 'Content-Length: 0'
-[% IF PRO %]
-  - 'From: <sip:004321001@'
-[% ELSE %]
   - 'CSeq: 2 BYE'
   - 'From: <sip:004321001@'
-[% END %]
   - 'To: <sip:4311003@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
-[% IF PRO %]
-      'CSeq: 11 BYE',
-[% ELSE %]
       'CSeq: 2 BYE',
-[% END %]
       'Content-Length: 0',
       'From: <sip:004321001@',
       'To: <sip:4311003@'
diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2
index 68ddabbe..50d1293a 100644
--- a/scenarios/invite_callforward/0011_test.yml.tt2
+++ b/scenarios/invite_callforward/0011_test.yml.tt2
@@ -171,7 +171,7 @@ flow:
 sip_in:
   - '^INVITE sip:4311003@'
   - 'Contact: <sip:127.0.0.1:5080'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: [% spce_test.testuser1001.uuid %]'
   - 'P-First-Caller-UPN: 4311002'
@@ -183,13 +183,13 @@ sip_in:
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
   - [
       '^INVITE sip:testuser1003@',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:4311002@',
       'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
       'To: <sip:testuser1001@',
diff --git a/scenarios/invite_callforward/0020_test.yml.tt2 b/scenarios/invite_callforward/0020_test.yml.tt2
index 25bf2f05..e3408310 100644
--- a/scenarios/invite_callforward/0020_test.yml.tt2
+++ b/scenarios/invite_callforward/0020_test.yml.tt2
@@ -1,8 +1,4 @@
 flow:
-[% IF PRO %]
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-[% ELSE %]
   - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
@@ -19,44 +15,25 @@ flow:
   - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-[% END %]
 sip_in:
-[% IF PRO %]
-  - '^SIP/2.0 200 OK'
-  - 'CSeq: 3 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1001@'
-[% ELSE %]
   - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1001@'
-[% END %]
 sip_out:
-[% IF PRO %]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 3 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1001@'
-    ]
-[% ELSE %]
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
   - [
       '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
       'From: <sip:4311002@',
       'To: <sip:testuser1001@'
     ]
-[% END %]
\ No newline at end of file
diff --git a/scenarios/invite_callforward/0021_test.yml.tt2 b/scenarios/invite_callforward/0021_test.yml.tt2
index 922fa39a..b1878326 100644
--- a/scenarios/invite_callforward/0021_test.yml.tt2
+++ b/scenarios/invite_callforward/0021_test.yml.tt2
@@ -1,62 +1,17 @@
 flow:
-[% IF CE %]
   - start|REPLY_ROUTE_NAT:
   - exit|REPLY_ROUTE_NAT:
-[% ELSE %]
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - 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_OUTBOUND:
-  - exit|ROUTE_OUTBOUND:
-[% END %]
 sip_in:
-[% IF CE %]
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:4311002@'
   - 'To: <sip:testuser1001@'
-[% ELSE %]
-  - '^BYE sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
-  - 'CSeq: 11 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1001@'
-[% END %]
 sip_out:
-[% IF CE %]
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
-[% ELSE %]
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1001@'
-    ]
-  - [
-      '^BYE sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
-      'CSeq: 11 BYE',
-      'Max-Forwards: 70',
-      'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1001@'
-    ]
-[% END %]
\ No newline at end of file
diff --git a/scenarios/invite_callforward/0022_test.yml.tt2 b/scenarios/invite_callforward/0022_test.yml.tt2
index bb32c936..81f8534f 100644
--- a/scenarios/invite_callforward/0022_test.yml.tt2
+++ b/scenarios/invite_callforward/0022_test.yml.tt2
@@ -4,21 +4,13 @@ flow:
 sip_in:
   - '^SIP/2.0 200 OK'
   - 'Content-Length: 0'
-[% IF PRO %]
-  - 'From: <sip:4311002@'
-[% ELSE %]
   - 'CSeq: 3 BYE'
   - 'From: <sip:testuser1002@'
-[% END %]
   - 'To: <sip:testuser1001@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
-[% IF PRO %]
-      'CSeq: 11 BYE',
-[% ELSE %]
       'CSeq: 3 BYE',
-[% END %]
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
diff --git a/scenarios/invite_callforward/0029_test.yml.tt2 b/scenarios/invite_callforward/0029_test.yml.tt2
index 8f03841f..b657fd1b 100644
--- a/scenarios/invite_callforward/0029_test.yml.tt2
+++ b/scenarios/invite_callforward/0029_test.yml.tt2
@@ -162,18 +162,18 @@ flow:
 sip_in:
   - '^INVITE sip:4311005@'
   - 'Contact: <sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)?>'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1004@'
     ]
   - [
       '^INVITE sip:testuser1005@',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:4311002@',
       'To: <sip:testuser1004@',
       'Content-Type: application/sdp',
@@ -182,9 +182,5 @@ sip_out:
       'P-App-Name: sbc',
       'P-NGCP-Caller-Info: <sip:testuser1004@',
       'P-NGCP-Callee-Info: <sip:4311005@',
-[% IF PRO %]
-      'Max-Forwards: 70'
-[% ELSE %]
       'Max-Forwards: 69'
-[% END %]
     ]
diff --git a/scenarios/invite_callforward/0031_test.yml.tt2 b/scenarios/invite_callforward/0031_test.yml.tt2
index eed8f56a..5b7541ad 100644
--- a/scenarios/invite_callforward/0031_test.yml.tt2
+++ b/scenarios/invite_callforward/0031_test.yml.tt2
@@ -3,9 +3,9 @@ flow:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
 sip_out:
   - [
       '^SIP/2.0 180 Ringing',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
     ]
diff --git a/scenarios/invite_callforward/0033_test.yml.tt2 b/scenarios/invite_callforward/0033_test.yml.tt2
index 1aba577a..5cfdd9c6 100644
--- a/scenarios/invite_callforward/0033_test.yml.tt2
+++ b/scenarios/invite_callforward/0033_test.yml.tt2
@@ -22,7 +22,7 @@ flow:
 #  - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
   - 'Content-Length: \d+'
   - 'Content-Type: application/sdp'
   - 'From: <sip:4311002@'
@@ -30,7 +30,7 @@ sip_in:
 sip_out:
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'Content-Length: \d+',
       'Content-Type: application/sdp',
       'From: <sip:testuser1002@',
diff --git a/scenarios/invite_callforward/0038_test.yml.tt2 b/scenarios/invite_callforward/0038_test.yml.tt2
index dc8e9534..a86dc49a 100644
--- a/scenarios/invite_callforward/0038_test.yml.tt2
+++ b/scenarios/invite_callforward/0038_test.yml.tt2
@@ -1,8 +1,4 @@
 flow:
-[% IF PRO %]
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-[% ELSE %]
   - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
@@ -19,44 +15,25 @@ flow:
   - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-[% END %]
 sip_in:
-[% IF PRO %]
-  - '^SIP/2.0 200 OK'
-  - 'CSeq: 3 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1004@'
-[% ELSE %]
   - '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1004@'
-[% END %]
 sip_out:
-[% IF PRO %]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 3 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1004@'
-    ]
-[% ELSE %]
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1004@'
     ]
   - [
       '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
       'From: <sip:4311002@',
       'To: <sip:testuser1004@'
     ]
-[% END %]
\ No newline at end of file
diff --git a/scenarios/invite_callforward/0039_test.yml.tt2 b/scenarios/invite_callforward/0039_test.yml.tt2
index bbbb0622..32357696 100644
--- a/scenarios/invite_callforward/0039_test.yml.tt2
+++ b/scenarios/invite_callforward/0039_test.yml.tt2
@@ -1,62 +1,17 @@
 flow:
-[% IF CE %]
   - start|REPLY_ROUTE_NAT:
   - exit|REPLY_ROUTE_NAT:
-[% ELSE %]
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - 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_OUTBOUND:
-  - exit|ROUTE_OUTBOUND:
-[% END %]
 sip_in:
-[% IF CE %]
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:4311002@'
   - 'To: <sip:testuser1004@'
-[% ELSE %]
-  - '^BYE sip:(testuser1005@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
-  - 'CSeq: 11 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1004@'
-[% END %]
 sip_out:
-[% IF CE %]
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1004@'
     ]
-[% ELSE %]
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1004@'
-    ]
-  - [
-      '^BYE sip:(testuser1005@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
-      'CSeq: 11 BYE',
-      'Max-Forwards: 70',
-      'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1004@'
-    ]
-[% END %]
\ No newline at end of file
diff --git a/scenarios/invite_callforward/0040_test.yml.tt2 b/scenarios/invite_callforward/0040_test.yml.tt2
index 4b3b51f7..ce441c82 100644
--- a/scenarios/invite_callforward/0040_test.yml.tt2
+++ b/scenarios/invite_callforward/0040_test.yml.tt2
@@ -3,23 +3,14 @@ flow:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 200 OK'
-[% IF PRO %]
-  - 'CSeq: 11 BYE'
-  - 'From: <sip:4311002@'
-[% ELSE %]
   - 'CSeq: 3 BYE'
   - 'From: <sip:testuser1002@'
-[% END %]
   - 'Content-Length: 0'
   - 'To: <sip:testuser1004@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
-[% IF PRO %]
-      'CSeq: 11 BYE',
-[% ELSE %]
       'CSeq: 3 BYE',
-[% END %]
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1004@'
diff --git a/scenarios/invite_conference_update/0005_test.yml.tt2 b/scenarios/invite_conference_update/0005_test.yml.tt2
index 1a55d3aa..425a392a 100644
--- a/scenarios/invite_conference_update/0005_test.yml.tt2
+++ b/scenarios/invite_conference_update/0005_test.yml.tt2
@@ -103,7 +103,7 @@ flow:
 sip_in:
   - '^INVITE sip:conf=4311001@conference.local SIP/2.0'
   - 'Contact: <sip:127.0.0.1:5080(;transport=udp)?>'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: [% spce_test.testuser1001.uuid %]'
   - 'P-First-Caller-UPN: 4311002'
@@ -113,13 +113,13 @@ sip_in:
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
   - [
       '^INVITE sip:conf=4311001@conference.local SIP/2.0',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:4311002@',
       'To: <sip:testuser1001@',
       'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
diff --git a/scenarios/invite_conference_update/0011_test.yml.tt2 b/scenarios/invite_conference_update/0011_test.yml.tt2
index 97de67fd..a2c9adad 100644
--- a/scenarios/invite_conference_update/0011_test.yml.tt2
+++ b/scenarios/invite_conference_update/0011_test.yml.tt2
@@ -7,26 +7,22 @@ flow:
   - return|ROUTE_INITVARS:
   - exit|ROUTE_PRX_REQUEST:
 sip_in:
-[% IF PRO %]
-  - '^UPDATE sip:conf=4311001@127.0.0.1:5080 SIP/2.0'
-[% ELSE %]
   - '^UPDATE sip:127.0.0.1:5080;transport=udp SIP/2.0'
-[% END %]
-  - 'CSeq: 11 UPDATE'
+  - 'CSeq: \d+ UPDATE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1001@'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 11 UPDATE',
+      'CSeq: \d+ UPDATE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 11 UPDATE',
+      'CSeq: \d+ UPDATE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
diff --git a/scenarios/invite_conference_update/0014_test.yml.tt2 b/scenarios/invite_conference_update/0014_test.yml.tt2
index d3e6ca2a..e3408310 100644
--- a/scenarios/invite_conference_update/0014_test.yml.tt2
+++ b/scenarios/invite_conference_update/0014_test.yml.tt2
@@ -1,8 +1,4 @@
 flow:
-[% IF PRO %]
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-[% ELSE %]
   - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
@@ -19,44 +15,25 @@ flow:
   - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-[% END %]
 sip_in:
-[% IF PRO %]
-  - '^SIP/2.0 200 OK'
-  - 'CSeq: 4 BYE'
-  - 'From: <sip:testuser1002@'
-  - 'Content-Length: 0'
-  - 'To: <sip:testuser1001@'
-[% ELSE %]
   - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0'
-  - 'CSeq: 12 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1001@'
-[% END %]
 sip_out:
-[% IF PRO %]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 4 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1001@'
-    ]
-[% ELSE %]
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 12 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
   - [
       '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0',
-      'CSeq: 12 BYE',
+      'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
       'From: <sip:4311002@',
       'To: <sip:testuser1001@'
     ]
-[% END %]
diff --git a/scenarios/invite_conference_update/0015_test.yml.tt2 b/scenarios/invite_conference_update/0015_test.yml.tt2
index 2e67ac1c..324b1d2a 100644
--- a/scenarios/invite_conference_update/0015_test.yml.tt2
+++ b/scenarios/invite_conference_update/0015_test.yml.tt2
@@ -1,62 +1,17 @@
 flow:
-[% IF PRO %]
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - 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_OUTBOUND:
-  - exit|ROUTE_OUTBOUND:
-[% ELSE %]
   - start|REPLY_ROUTE_NAT:
   - exit|REPLY_ROUTE_NAT:
-[% END %]
 sip_in:
-[% IF PRO %]
-  - '^BYE sip:conf=4311001@127.0.0.1:5080 SIP/2.0'
-  - 'CSeq: 12 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1001@'
-[% ELSE %]
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 12 BYE'
+  - 'CSeq: \d+ BYE'
   - 'From: <sip:4311002@'
   - 'Content-Length: 0'
   - 'To: <sip:testuser1001@'
-[% END %]
 sip_out:
-[% IF PRO %]
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 12 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1001@'
-    ]
-  - [
-      '^BYE sip:conf=4311001@127.0.0.1:5080 SIP/2.0',
-      'CSeq: 12 BYE',
-      'Max-Forwards: 70',
-      'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1001@'
-    ]
-[% ELSE %]
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 12 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
-[% END %]
diff --git a/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2
index 2f2af4eb..e6310428 100644
--- a/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2
@@ -15,18 +15,18 @@ flow:
 sip_in:
   - '^INVITE'
   - 'Contact: <sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)?>'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:testuser1003@',
       'To: <sip:4311002@'
     ]
   - [
       '^INVITE sip:testuser1002@',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:testuser1003@',
       'To: <sip:testuser1002@',
       'Content-Type: application/sdp'
diff --git a/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2
index 1eec21cf..4792f0d4 100644
--- a/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2
@@ -19,7 +19,7 @@ flow:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
   - 'Contact: <sip:testuser1002@'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
@@ -28,7 +28,7 @@ sip_in:
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1003@'
@@ -36,7 +36,7 @@ sip_out:
   - [
       '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
       'Contact: <sip:testuser1002@',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
       'From: <sip:4311002@',
diff --git a/scenarios/invite_voicebox/0005_test.yml.tt2 b/scenarios/invite_voicebox/0005_test.yml.tt2
index a73f581a..1c560440 100644
--- a/scenarios/invite_voicebox/0005_test.yml.tt2
+++ b/scenarios/invite_voicebox/0005_test.yml.tt2
@@ -101,7 +101,7 @@ flow:
 sip_in:
   - '^INVITE sip:vmu4311001@voicebox.local SIP/2.0'
   - 'Contact: <sip:127.0.0.1:5080(;transport=udp)?>'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: [% spce_test.testuser1001.uuid %]'
   - 'P-First-Caller-UPN: 4311002'
@@ -111,13 +111,13 @@ sip_in:
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
   - [
       '^INVITE sip:vmu4311001@voicebox.local SIP/2.0',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:4311002@',
       'To: <sip:testuser1001@',
       'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
diff --git a/scenarios/invite_voicebox/0012_test.yml.tt2 b/scenarios/invite_voicebox/0012_test.yml.tt2
index 4eb9c2f7..2f917508 100644
--- a/scenarios/invite_voicebox/0012_test.yml.tt2
+++ b/scenarios/invite_voicebox/0012_test.yml.tt2
@@ -1,8 +1,4 @@
 flow:
-[% IF PRO %]
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-[% ELSE %]
   - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
@@ -19,44 +15,25 @@ flow:
   - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-[% END %]
 sip_in:
-[% IF PRO %]
-  - '^SIP/2.0 200 OK'
-  - 'CSeq: 3 BYE'
-  - 'From: <sip:testuser1002@'
-  - 'Content-Length: 0'
-  - 'To: <sip:testuser1001@'
-[% ELSE %]
   - '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1001@'
-[% END %]
 sip_out:
-[% IF PRO %]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 3 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1001@'
-    ]
-[% ELSE %]
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
   - [
       '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
       'From: <sip:4311002@',
       'To: <sip:testuser1001@'
     ]
-[% END %]
diff --git a/scenarios/invite_voicebox/0013_test.yml.tt2 b/scenarios/invite_voicebox/0013_test.yml.tt2
index 86008a50..324b1d2a 100644
--- a/scenarios/invite_voicebox/0013_test.yml.tt2
+++ b/scenarios/invite_voicebox/0013_test.yml.tt2
@@ -1,62 +1,17 @@
 flow:
-[% IF PRO %]
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - 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_OUTBOUND:
-  - exit|ROUTE_OUTBOUND:
-[% ELSE %]
   - start|REPLY_ROUTE_NAT:
   - exit|REPLY_ROUTE_NAT:
-[% END %]
 sip_in:
-[% IF PRO %]
-  - '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0'
-  - 'CSeq: 11 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1001@'
-[% ELSE %]
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'From: <sip:4311002@'
   - 'Content-Length: 0'
   - 'To: <sip:testuser1001@'
-[% END %]
 sip_out:
-[% IF PRO %]
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1001@'
-    ]
-  - [
-      '^BYE sip:vmu4311001@127.0.0.1:5070 SIP/2.0',
-      'CSeq: 11 BYE',
-      'Max-Forwards: 70',
-      'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1001@'
-    ]
-[% ELSE %]
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
-[% END %]
\ No newline at end of file
diff --git a/scenarios/lock_ported/0007_test.yml.tt2 b/scenarios/lock_ported/0007_test.yml.tt2
index fde43b4f..db39ace8 100644
--- a/scenarios/lock_ported/0007_test.yml.tt2
+++ b/scenarios/lock_ported/0007_test.yml.tt2
@@ -173,7 +173,7 @@ flow:
 sip_in:
   - '^INVITE sip:4311003@'
   - 'Contact: <sip:127.0.0.1:5080'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: [% spce_test.testuser1001.uuid %]'
   - 'P-First-Caller-UPN: 4311002'
@@ -185,13 +185,13 @@ sip_in:
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
   - [
       '^INVITE sip:testuser1003@',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:4311002@',
       'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
       'To: <sip:testuser1001@',
diff --git a/scenarios/lock_ported/0016_test.yml.tt2 b/scenarios/lock_ported/0016_test.yml.tt2
index a80eb77b..f945748c 100644
--- a/scenarios/lock_ported/0016_test.yml.tt2
+++ b/scenarios/lock_ported/0016_test.yml.tt2
@@ -1,8 +1,4 @@
 flow:
-[% IF PRO %]
-  - start|REPLY_ROUTE_NAT:
-  - exit|REPLY_ROUTE_NAT:
-[% ELSE %]
   - start|DEFAULT_ROUTE:
   - start|ROUTE_NET_INFO:
   - return|ROUTE_NET_INFO:
@@ -19,44 +15,25 @@ flow:
   - return|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_OUTBOUND:
   - exit|ROUTE_OUTBOUND:
-[% END %]
 sip_in:
-[% IF PRO %]
-  - '^SIP/2.0 200 OK'
-  - 'CSeq: 3 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1001@'
-[% ELSE %]
   - '^BYE sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1001@'
-[% END %]
 sip_out:
-[% IF PRO %]
-  - [
-      '^SIP/2.0 200 OK',
-      'CSeq: 3 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1001@'
-    ]
-[% ELSE %]
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
   - [
       '^BYE sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
       'From: <sip:4311002@',
       'To: <sip:testuser1001@'
     ]
-[% END %]
\ No newline at end of file
diff --git a/scenarios/lock_ported/0017_test.yml.tt2 b/scenarios/lock_ported/0017_test.yml.tt2
index 922fa39a..b1878326 100644
--- a/scenarios/lock_ported/0017_test.yml.tt2
+++ b/scenarios/lock_ported/0017_test.yml.tt2
@@ -1,62 +1,17 @@
 flow:
-[% IF CE %]
   - start|REPLY_ROUTE_NAT:
   - exit|REPLY_ROUTE_NAT:
-[% ELSE %]
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - 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_OUTBOUND:
-  - exit|ROUTE_OUTBOUND:
-[% END %]
 sip_in:
-[% IF CE %]
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:4311002@'
   - 'To: <sip:testuser1001@'
-[% ELSE %]
-  - '^BYE sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
-  - 'CSeq: 11 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1001@'
-[% END %]
 sip_out:
-[% IF CE %]
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
     ]
-[% ELSE %]
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
-      'Content-Length: 0',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1001@'
-    ]
-  - [
-      '^BYE sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
-      'CSeq: 11 BYE',
-      'Max-Forwards: 70',
-      'Content-Length: 0',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1001@'
-    ]
-[% END %]
\ No newline at end of file
diff --git a/scenarios/lock_ported/0018_test.yml.tt2 b/scenarios/lock_ported/0018_test.yml.tt2
index bb32c936..81f8534f 100644
--- a/scenarios/lock_ported/0018_test.yml.tt2
+++ b/scenarios/lock_ported/0018_test.yml.tt2
@@ -4,21 +4,13 @@ flow:
 sip_in:
   - '^SIP/2.0 200 OK'
   - 'Content-Length: 0'
-[% IF PRO %]
-  - 'From: <sip:4311002@'
-[% ELSE %]
   - 'CSeq: 3 BYE'
   - 'From: <sip:testuser1002@'
-[% END %]
   - 'To: <sip:testuser1001@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
-[% IF PRO %]
-      'CSeq: 11 BYE',
-[% ELSE %]
       'CSeq: 3 BYE',
-[% END %]
       'Content-Length: 0',
       'From: <sip:testuser1002@',
       'To: <sip:testuser1001@'
diff --git a/scenarios_lnp/incoming_peer/0003_test.yml.tt2 b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
index 5d5f9e85..f9109091 100644
--- a/scenarios_lnp/incoming_peer/0003_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
@@ -174,13 +174,13 @@ sip_in:
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:004321001@',
       'To: <sip:4311001@'
     ]
   - [
       '^INVITE sip:4318881003@',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:004321001@',
       'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
       'To: <sip:4311001@',
diff --git a/scenarios_lnp/incoming_peer/0005_test.yml.tt2 b/scenarios_lnp/incoming_peer/0005_test.yml.tt2
index f2b4f287..8e44678f 100644
--- a/scenarios_lnp/incoming_peer/0005_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0005_test.yml.tt2
@@ -17,13 +17,13 @@ flow:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
   - 'From: <sip:004321001@'
   - 'To: <sip:4311001@'
 sip_out:
   - [
       '^SIP/2.0 180 Ringing',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:004321001@',
       'To: <sip:4311001@',
     ]
diff --git a/scenarios_lnp/incoming_peer/0007_test.yml.tt2 b/scenarios_lnp/incoming_peer/0007_test.yml.tt2
index bf065563..80901561 100644
--- a/scenarios_lnp/incoming_peer/0007_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0007_test.yml.tt2
@@ -21,13 +21,13 @@ flow:
   - return|dialog:start:
 sip_in:
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 10 INVITE'
+  - 'CSeq: \d+ INVITE'
   - 'From: <sip:004321001@'
   - 'To: <sip:4311001@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 10 INVITE',
+      'CSeq: \d+ INVITE',
       'From: <sip:004321001@',
       'To: <sip:4311001@',
     ]
diff --git a/scenarios_lnp/incoming_peer/0010_test.yml.tt2 b/scenarios_lnp/incoming_peer/0010_test.yml.tt2
index 8270cd95..9ea41824 100644
--- a/scenarios_lnp/incoming_peer/0010_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0010_test.yml.tt2
@@ -13,13 +13,13 @@ flow:
   - return|ROUTE_OUTBOUND:
 sip_in:
   - '^ACK sip:(4318881003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
-  - 'CSeq: 10 ACK'
+  - 'CSeq: \d+ ACK'
   - 'From: <sip:004321001@'
   - 'To: <sip:4311001@'
 sip_out:
   - [
       '^ACK sip:(4318881003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
-      'CSeq: 10 ACK',
+      'CSeq: \d+ ACK',
       'From: <sip:004321001@',
       'To: <sip:4311001@'
     ]
diff --git a/scenarios_lnp/incoming_peer/0013_test.yml.tt2 b/scenarios_lnp/incoming_peer/0013_test.yml.tt2
index 402a8fc0..3bcd09b4 100644
--- a/scenarios_lnp/incoming_peer/0013_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0013_test.yml.tt2
@@ -1,62 +1,17 @@
 flow:
-[% IF PRO %]
-  - start|DEFAULT_ROUTE:
-  - start|ROUTE_NET_INFO:
-  - return|ROUTE_NET_INFO:
-  - 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_OUTBOUND:
-  - exit|ROUTE_OUTBOUND:
-[% ELSE %]
   - start|REPLY_ROUTE_NAT:
   - exit|REPLY_ROUTE_NAT:
-[% END %]
 sip_in:
-[% IF PRO %]
-  - '^BYE sip:(4318881003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
-  - 'CSeq: 11 BYE'
-  - 'Content-Length: 0'
-  - 'From: <sip:004321001@'
-  - 'To: <sip:4311001@'
-[% ELSE %]
   - '^SIP/2.0 200 OK'
-  - 'CSeq: 11 BYE'
+  - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:004321001@'
   - 'To: <sip:4311001@'
-[% END %]
 sip_out:
-[% IF PRO %]
-  - [
-      '^SIP/2.0 100 Trying',
-      'CSeq: 11 BYE',
-      'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@'
-    ]
-  - [
-      '^BYE sip:(4318881003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
-      'CSeq: 11 BYE',
-      'Max-Forwards: 70',
-      'Content-Length: 0',
-      'From: <sip:004321001@',
-      'To: <sip:4311001@'
-    ]
-[% ELSE %]
   - [
       '^SIP/2.0 200 OK',
-      'CSeq: 11 BYE',
+      'CSeq: \d+ BYE',
       'Content-Length: 0',
       'From: <sip:004321001@',
       'To: <sip:4311001@'
     ]
-[% END %]
\ No newline at end of file
diff --git a/scenarios_lnp/incoming_peer/0014_test.yml.tt2 b/scenarios_lnp/incoming_peer/0014_test.yml.tt2
index 027d2f5e..9709e5c4 100644
--- a/scenarios_lnp/incoming_peer/0014_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0014_test.yml.tt2
@@ -3,22 +3,14 @@ flow:
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 200 OK'
-[% IF PRO -%]
-  - 'CSeq: 11 BYE'
-[% ELSE -%]
   - 'CSeq: 2 BYE'
-[% END -%]
   - 'Content-Length: 0'
   - 'From: <sip:004321001@'
   - 'To: <sip:4311001@'
 sip_out:
   - [
       '^SIP/2.0 200 OK',
-[% IF PRO -%]
-      'CSeq: 11 BYE',
-[% ELSE -%]
       'CSeq: 2 BYE',
-[% END -%]
       'Content-Length: 0',
       'From: <sip:004321001@',
       'To: <sip:4311001@'