diff --git a/scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2
index d130838f..526ada2b 100644
--- a/scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0003_test.yml.tt2
@@ -32,12 +32,12 @@ sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'From: "431100222" <sip:testuser1002@',
+      'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" <sip:testuser1002@',
       'To: <sip:testuser1003@'
     ]
   - [
       '^SIP/2.0 407 Proxy Authentication Required',
       'CSeq: 1 INVITE',
-      'From: "431100222" <sip:testuser1002@',
+      'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" <sip:testuser1002@',
       'To: <sip:testuser1003@'
     ]
diff --git a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
index e7c53125..d764769e 100644
--- a/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0005_test.yml.tt2
@@ -18,12 +18,12 @@ flow:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_AUTH_HELPER:
-      $x_hdr(From): spce.test
+      $x_hdr(From): invite-allowedcli-nonmatch.scenarios.test
       $var(realm_user): testuser1002
-      $var(realm_domain): spce.test
+      $var(realm_domain): invite-allowedcli-nonmatch.scenarios.test
   - return|ROUTE_AUTH_HELPER:
       $avp(orig_acc_caller_user): ['testuser1002']
-      $avp(orig_acc_caller_domain): ['spce.test']
+      $avp(orig_acc_caller_domain): ['invite-allowedcli-nonmatch.scenarios.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
   - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
@@ -38,8 +38,8 @@ flow:
   - start|ROUTE_LOAD_CALLER_CONTRACT_PREF:
   - return|ROUTE_LOAD_CALLER_CONTRACT_PREF:
   - return|ROUTE_LOAD_CALLER_PREF:
-      $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
-      $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
+      $xavp(caller_usr_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]9*']
+      $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]9*']
       $xavp(caller_usr_prefs[0]=>user_cli[*]): ['43122122']
       $xavp(caller_real_prefs[0]=>user_cli[*]): ['43122122']
       $xavp(caller_usr_prefs[0]=>inbound_upn[*]): ['from_display']
@@ -55,7 +55,7 @@ flow:
   - start|ROUTE_CLIR:
   - return|ROUTE_CLIR:
   - start|ROUTE_CALLER_BLOCK_CLI:
-      $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['43110021*', '43110029*']
+      $xavp(caller_real_prefs[0]=>allowed_clis[*]): ['[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]1*', '[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]9*']
   - return|ROUTE_CALLER_BLOCK_CLI:
   - start|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_CHECK_CLI_ALLOWED:
@@ -73,10 +73,10 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
       $avp(lua_dlg_profile) : [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
@@ -110,29 +110,29 @@ flow:
      $avp(lua_dlg_profile) : [
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_CNT_DLG_CHECK:
   - return|ROUTE_SET_CALLER_DIALOG:
       $avp(lua_dlg_profile) : [
         'accountout:[% customer_test.id %]',
-        'userout:[% spce_test.testuser1002.uuid %]',
+        'userout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'account:[% customer_test.id %]',
-        'user:[% spce_test.testuser1002.uuid %]',
+        'user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'totalaccountout:[% customer_test.id %]',
-        'totaluserout:[% spce_test.testuser1002.uuid %]',
+        'totaluserout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'totalaccount:[% customer_test.id %]',
-        'totaluser:[% spce_test.testuser1002.uuid %]',
+        'totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_ACC_CALLER:
   - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
@@ -199,19 +199,19 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile) : [
         'accountout:[% customer_test.id %]',
-        'userout:[% spce_test.testuser1002.uuid %]',
+        'userout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'account:[% customer_test.id %]',
-        'user:[% spce_test.testuser1002.uuid %]',
+        'user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'totalaccountout:[% customer_test.id %]',
-        'totaluserout:[% spce_test.testuser1002.uuid %]',
+        'totaluserout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'totalaccount:[% customer_test.id %]',
-        'totaluser:[% spce_test.testuser1002.uuid %]',
+        'totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]"
       ]
 sip_in:
   - '^INVITE'
@@ -224,13 +224,13 @@ sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 2 INVITE',
-      'From: "431100222" <sip:testuser1002@',
+      'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" <sip:testuser1002@',
       'To: <sip:testuser1003@'
     ]
   - [
       '^SIP/2.0 101 Connecting',
       'CSeq: 2 INVITE',
-      'From: "431100222" <sip:testuser1002@',
+      'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" <sip:testuser1002@',
       'To: <sip:testuser1003@'
     ]
   - [
@@ -239,9 +239,9 @@ sip_out:
       'From: <sip:43122122@',
       'To: <sip:testuser1003@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: \w+',
-      'P-Callee-UUID: \w+',
-      'P-Asserted-Identity: <sip:4311002@',
+      'P-Caller-UUID: [% invite_allowedcli_match_alias_scenarios_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% invite_allowedcli_match_alias_scenarios_test.testuser1003.uuid %]',
+      'P-Asserted-Identity: <sip:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]@',
       'P-Called-Party-ID: <sip:testuser1003@',
       'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
diff --git a/scenarios/invite_allowedcli_nonmatch/0007_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0007_test.yml.tt2
index 51ba94a0..bd6c8d26 100644
--- a/scenarios/invite_allowedcli_nonmatch/0007_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0007_test.yml.tt2
@@ -13,15 +13,15 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0'
-  - 'From: <sip:43122122@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1003@spce.test>'
+  - 'INVITE sip:testuser1003@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
+  - 'From: <sip:43122122@invite-allowedcli-nonmatch.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:testuser1003@invite-allowedcli-nonmatch.scenarios.test>'
   - 'CSeq: \d+ INVITE'
   - 'P-LB-Uptime: \d+'
-  - 'P-Asserted-Identity: <sip:4311002@spce.test>'
-  - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]'
-  - 'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002'
-  - 'P-NGCP-Callee-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003'
+  - 'P-Asserted-Identity: <sip:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]@invite-allowedcli-nonmatch.scenarios.test>'
+  - 'P-Caller-UUID: [% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]'
+  - 'P-NGCP-Caller-Info: <sip:testuser1002@invite-allowedcli-nonmatch.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:testuser1003@invite-allowedcli-nonmatch.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.phone_number %]'
   - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
@@ -29,22 +29,22 @@ sip_in:
 sip_out:
   - [
       'SIP/2.0 100 Trying',
-      'From: <sip:43122122@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'From: <sip:43122122@invite-allowedcli-nonmatch.scenarios.test>;tag=[\w-]+',
+      'To: <sip:testuser1003@invite-allowedcli-nonmatch.scenarios.test>',
       'CSeq: \d+ INVITE',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:testuser1003@127.1.0.1:\d+ SIP/2.0',
-      'From: <sip:43122122@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'INVITE sip:testuser1003@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0',
+      'From: <sip:43122122@invite-allowedcli-nonmatch.scenarios.test>;tag=[\w-]+',
+      'To: <sip:testuser1003@invite-allowedcli-nonmatch.scenarios.test>',
       'CSeq: \d+ INVITE',
       'P-LB-Uptime: \d+',
-      'P-Asserted-Identity: <sip:4311002@spce.test>',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002',
-      'P-NGCP-Callee-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=5060;primary=4311003',
+      'P-Asserted-Identity: <sip:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]@invite-allowedcli-nonmatch.scenarios.test>',
+      'P-Caller-UUID: [% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
+      'P-NGCP-Caller-Info: <sip:testuser1002@invite-allowedcli-nonmatch.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:testuser1003@invite-allowedcli-nonmatch.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.phone_number %]',
       'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
diff --git a/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2
index fc37f0c3..d7b0f9dc 100644
--- a/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2
@@ -7,19 +7,19 @@ flow:
   - return|ROUTE_APPLY_HEADER_RULES:
       $avp(lua_dlg_profile) : [
         'accountout:[% customer_test.id %]',
-        'userout:[% spce_test.testuser1002.uuid %]',
+        'userout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'account:[% customer_test.id %]',
-        'user:[% spce_test.testuser1002.uuid %]',
+        'user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'totalaccountout:[% customer_test.id %]',
-        'totaluserout:[% spce_test.testuser1002.uuid %]',
+        'totaluserout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'totalaccount:[% customer_test.id %]',
-        'totaluser:[% spce_test.testuser1002.uuid %]',
+        'totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_PREPARE_UA:
   - return|ROUTE_PREPARE_UA:
@@ -37,6 +37,6 @@ sip_out:
   - [
       '^SIP/2.0 180 Ringing',
       'CSeq: 2 INVITE',
-      'From: "431100222" <sip:testuser1002@',
+      'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" <sip:testuser1002@',
       'To: <sip:testuser1003@'
     ]
diff --git a/scenarios/invite_allowedcli_nonmatch/0011_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0011_test.yml.tt2
index a091efb6..40961802 100644
--- a/scenarios/invite_allowedcli_nonmatch/0011_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0011_test.yml.tt2
@@ -11,27 +11,27 @@ flow:
   - return|dialog:start:
 sip_in:
   - 'SIP/2.0 200 OK'
-  - 'From: <sip:43122122@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1003@spce.test>;tag=[\w-]+'
+  - 'From: <sip:43122122@invite-allowedcli-nonmatch.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:testuser1003@invite-allowedcli-nonmatch.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: <sip:127.1.0.1:\d+;transport=UDP>'
+  - 'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP>'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
-  - 'P-NGCP-Src-Ip: 127.1.0.1'
-  - 'P-NGCP-Src-Port: \d+'
+  - 'P-NGCP-Src-Ip: [% scenarios.0.responders.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',
-      'From: <sip:43122122@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>;tag=[\w-]+',
+      'From: <sip:43122122@invite-allowedcli-nonmatch.scenarios.test>;tag=[\w-]+',
+      'To: <sip:testuser1003@invite-allowedcli-nonmatch.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ INVITE',
-      'Contact: <sip:127.1.0.1:\d+;transport=UDP>',
+      'Contact: <sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=UDP>',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
-      'P-NGCP-Src-Ip: 127.1.0.1',
-      'P-NGCP-Src-Port: \d+',
+      'P-NGCP-Src-Ip: [% scenarios.0.responders.0.ip %]',
+      'P-NGCP-Src-Port: [% scenarios.0.responders.0.port %]',
       'P-NGCP-Src-Proto: udp',
       'P-NGCP-Src-Af: 4',
     ]
diff --git a/scenarios/invite_allowedcli_nonmatch/0012_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0012_test.yml.tt2
index 9ca0e4e5..b59e9f6c 100644
--- a/scenarios/invite_allowedcli_nonmatch/0012_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0012_test.yml.tt2
@@ -17,19 +17,19 @@ flow:
   - return|dialog:start:
       $avp(lua_dlg_profile) : [
         'accountout:[% customer_test.id %]',
-        'userout:[% spce_test.testuser1002.uuid %]',
+        'userout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'account:[% customer_test.id %]',
-        'user:[% spce_test.testuser1002.uuid %]',
+        'user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'totalaccountout:[% customer_test.id %]',
-        'totaluserout:[% spce_test.testuser1002.uuid %]',
+        'totaluserout:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         'totalaccount:[% customer_test.id %]',
-        'totaluser:[% spce_test.testuser1002.uuid %]',
+        'totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.uuid %]',
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_allowedcli_nonmatch_scenarios_test.testuser1003.uuid %]"
       ]
   - return|dialog:start:
 sip_in:
@@ -39,6 +39,6 @@ sip_out:
   - [
       '^SIP/2.0 200 OK',
       'CSeq: 2 INVITE',
-      'From: "431100222" <sip:testuser1002@',
+      'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" <sip:testuser1002@',
       'To: <sip:testuser1003@'
     ]
diff --git a/scenarios/invite_allowedcli_nonmatch/0013_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0013_test.yml.tt2
index 22058cd5..93766714 100644
--- a/scenarios/invite_allowedcli_nonmatch/0013_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0013_test.yml.tt2
@@ -26,12 +26,12 @@ flow:
 sip_in:
   - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
-  - 'From: "431100222" <sip:testuser1002@'
+  - 'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
       '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
-      'From: "431100222" <sip:43122122@',
+      'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" <sip:43122122@',
       'To: <sip:testuser1003@'
     ]
diff --git a/scenarios/invite_allowedcli_nonmatch/0015_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0015_test.yml.tt2
index a88f6a5c..cc0aa20c 100644
--- a/scenarios/invite_allowedcli_nonmatch/0015_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0015_test.yml.tt2
@@ -33,7 +33,7 @@ sip_in:
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
-  - 'From: "431100222" <sip:testuser1002@'
+  - 'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 
 sip_out:
@@ -41,7 +41,7 @@ sip_out:
       '^SIP/2.0 100 Trying',
       'CSeq: 3 BYE',
       'Content-Length: 0',
-      'From: "431100222" <sip:testuser1002@',
+      'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" <sip:testuser1002@',
       'To: <sip:testuser1003@'
     ]
   - [
@@ -50,6 +50,6 @@ sip_out:
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
-      'From: "431100222" <sip:43122122@',
+      'From: "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]22" <sip:43122122@',
       'To: <sip:testuser1003@'
     ]
diff --git a/scenarios/invite_allowedcli_nonmatch/cdr_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/cdr_test.yml.tt2
index 9f21b819..8c9d1561 100644
--- a/scenarios/invite_allowedcli_nonmatch/cdr_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/cdr_test.yml.tt2
@@ -1,9 +1,9 @@
 cdr:
   - source_user: 'testuser1002'
-    source_domain: 'spce.test'
+    source_domain: 'invite-allowedcli-nonmatch.scenarios.test'
     source_cli: '43122122'
     destination_user: 'testuser1003'
-    destination_domain: 'spce.test'
+    destination_domain: 'invite-allowedcli-nonmatch.scenarios.test'
     destination_user_dialed: 'testuser1003'
     call_type: 'call'
     call_status: 'ok'
diff --git a/scenarios/invite_allowedcli_nonmatch/prefs.json b/scenarios/invite_allowedcli_nonmatch/prefs.json
deleted file mode 100644
index 831f6cc1..00000000
--- a/scenarios/invite_allowedcli_nonmatch/prefs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "testuser1002@spce.test": {
-        "allowed_clis": [
-            "43110029*",
-            "43110021*"
-        ],
-        "cli": 4311002,
-        "user_cli": 43122122,
-        "inbound_upn": "from_display"
-    }
-}
diff --git a/scenarios/invite_allowedcli_nonmatch/prefs.json.tt2 b/scenarios/invite_allowedcli_nonmatch/prefs.json.tt2
new file mode 100644
index 00000000..0370e4d9
--- /dev/null
+++ b/scenarios/invite_allowedcli_nonmatch/prefs.json.tt2
@@ -0,0 +1,11 @@
+{
+    "testuser1002@invite-allowedcli-nonmatch.scenarios.test": {
+        "allowed_clis": [
+            "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]9*",
+            "[% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %]1*"
+        ],
+        "cli": [% invite_allowedcli_nonmatch_scenarios_test.testuser1002.phone_number %],
+        "user_cli": 43122122,
+        "inbound_upn": "from_display"
+    }
+}
diff --git a/scenarios/invite_allowedcli_nonmatch/scenario.yml b/scenarios/invite_allowedcli_nonmatch/scenario.yml
index 8ac54169..6af02a07 100644
--- a/scenarios/invite_allowedcli_nonmatch/scenario.yml
+++ b/scenarios/invite_allowedcli_nonmatch/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite_allowedcli_nonmatch
 domains:
-  'spce.test':
+  invite-allowedcli-nonmatch.scenarios.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  invite-allowedcli-nonmatch.scenarios.test:
     testuser1003:
       customer: 'customer.test'
       password: testuser
@@ -29,9 +30,14 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite-allowedcli-nonmatch.scenarios.test
     responders:
       - ip: 127.1.0.1
         username: testuser1003
-        domain: spce.test
-        register: yes
+        domain: invite-allowedcli-nonmatch.scenarios.test
+        register: 'yes'
+      - ip: 127.1.0.2
+        username: testuser1002
+        domain: invite-allowedcli-nonmatch.scenarios.test
+        register: 'no'
+        active: 'no'
diff --git a/scenarios/invite_allowedcli_nonmatch/sipp_scenario00.xml b/scenarios/invite_allowedcli_nonmatch/sipp_scenario00.xml
index 8aadfd83..406cbb3f 100644
--- a/scenarios/invite_allowedcli_nonmatch/sipp_scenario00.xml
+++ b/scenarios/invite_allowedcli_nonmatch/sipp_scenario00.xml
@@ -6,7 +6,7 @@
 
       INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: "431100222" <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      From: "[field1 file="callee.csv" line=1]22" <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]>
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
@@ -37,7 +37,7 @@
 
       ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] 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]
+      From: "[field1 file="callee.csv" line=1]22" <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]
       CSeq: 1 ACK
@@ -55,7 +55,7 @@
 
       INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: "431100222" <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      From: "[field1 file="callee.csv" line=1]22" <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]>
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
@@ -94,7 +94,7 @@
 
       ACK [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: "431100222" <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      From: "[field1 file="callee.csv" line=1]22" <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]
@@ -120,7 +120,7 @@
 
       BYE [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: "431100222" <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      From: "[field1 file="callee.csv" line=1]22" <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]
       CSeq: 3 BYE