diff --git a/scenarios/invite_redirect_blocked/0003_test.yml.tt2 b/scenarios/invite_redirect_blocked/0003_test.yml.tt2
index 2ed92a4e..3f696341 100644
--- a/scenarios/invite_redirect_blocked/0003_test.yml.tt2
+++ b/scenarios/invite_redirect_blocked/0003_test.yml.tt2
@@ -22,8 +22,8 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -31,12 +31,12 @@ sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
       '^SIP/2.0 407 Proxy Authentication Required',
       'CSeq: 1 INVITE',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@'
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_redirect_blocked/0005_test.yml.tt2 b/scenarios/invite_redirect_blocked/0005_test.yml.tt2
index 1a3153c8..9f5be1e6 100644
--- a/scenarios/invite_redirect_blocked/0005_test.yml.tt2
+++ b/scenarios/invite_redirect_blocked/0005_test.yml.tt2
@@ -17,12 +17,12 @@ flow:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_AUTH_HELPER:
-      $x_hdr(From): spce.test
-      $var(realm_user): testuser1002
-      $var(realm_domain): spce.test
+      $x_hdr(From): invite-redirect-blocked.scenarios.test
+      $var(realm_user): [% scenarios.0.username %]
+      $var(realm_domain): invite-redirect-blocked.scenarios.test
   - return|ROUTE_AUTH_HELPER:
-      $avp(orig_acc_caller_user): ['testuser1002']
-      $avp(orig_acc_caller_domain): ['spce.test']
+      $avp(orig_acc_caller_user): ['[% scenarios.0.username %]']
+      $avp(orig_acc_caller_domain): ['invite-redirect-blocked.scenarios.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
   - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
@@ -65,10 +65,10 @@ flow:
   - return|ROUTE_SET_CALLEE_DIALOG:
       $avp(lua_dlg_profile): [
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_redirect_blocked_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_redirect_blocked_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
@@ -102,29 +102,29 @@ flow:
       $avp(lua_dlg_profile): [
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_redirect_blocked_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_redirect_blocked_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_redirect_blocked_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_redirect_blocked_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_redirect_blocked_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_redirect_blocked_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_redirect_blocked_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_redirect_blocked_scenarios_test.testuser1003.uuid %]"
       ]
   - start|ROUTE_ACC_CALLER:
   - start|ROUTE_SET_ACC_CALLER_CALL_COUNTERS:
@@ -192,58 +192,58 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(lua_dlg_profile): [
         "accountout:[% customer_test.id %]",
-        "userout:[% spce_test.testuser1002.uuid %]",
+        "userout:[% invite_redirect_blocked_scenarios_test.testuser1002.uuid %]",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1002.uuid %]",
+        "user:[% invite_redirect_blocked_scenarios_test.testuser1002.uuid %]",
         "totalaccountout:[% customer_test.id %]",
-        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totaluserout:[% invite_redirect_blocked_scenarios_test.testuser1002.uuid %]",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "totaluser:[% invite_redirect_blocked_scenarios_test.testuser1002.uuid %]",
         "local",
         "totalaccount:[% customer_test.id %]",
-        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "totaluser:[% invite_redirect_blocked_scenarios_test.testuser1003.uuid %]",
         "total",
         "account:[% customer_test.id %]",
-        "user:[% spce_test.testuser1003.uuid %]"
+        "user:[% invite_redirect_blocked_scenarios_test.testuser1003.uuid %]"
       ]
 sip_in:
-  - '^INVITE sip:testuser1003@'
-  - 'From: <sip:testuser1002@'
-  - 'To: <sip:testuser1003@'
+  - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
+  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
   - 'CSeq: 2 INVITE'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: sip:[% scenarios.0.username %]@'
   - 'Max-Forwards: 69'
-  - 'Proxy-Authorization: Digest username="testuser1002"'
+  - 'Proxy-Authorization: Digest username="[% scenarios.0.username %]"'
   - 'Content-Type: application/sdp'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 INVITE',
       'Content-Length: 0'
     ]
   - [
       '^SIP/2.0 101 Connecting',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 INVITE',
-      'P-NGCP-Authorization: testuser1002@',
+      'P-NGCP-Authorization: [% scenarios.0.username %]@',
       'P-NGCP-Authorized: 1',
       'Content-Length: 0'
     ]
   - [
-      '^INVITE sip:testuser1003@',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@',
+      '^INVITE sip:[% scenarios.0.responders.0.username %]@',
+      'From: <sip:[% invite_redirect_blocked_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 INVITE',
-      'Contact: sip:testuser1002@',
+      'Contact: sip:[% scenarios.0.username %]@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
-      'P-Asserted-Identity: <sip:4311002@',
-      'P-Called-Party-ID: <sip:testuser1003@',
+      'P-Caller-UUID: [% invite_redirect_blocked_scenarios_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% invite_redirect_blocked_scenarios_test.testuser1003.uuid %]',
+      'P-Asserted-Identity: <sip:[% invite_redirect_blocked_scenarios_test.testuser1002.phone_number %]@',
+      'P-Called-Party-ID: <sip:[% scenarios.0.responders.0.username %]@',
       'P-App-Name: sbc',
-      'P-NGCP-Caller-Info: <sip:testuser1002@',
-      'P-NGCP-Callee-Info: <sip:testuser1003@'
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@'
     ]
diff --git a/scenarios/invite_redirect_blocked/0006_test.yml.tt2 b/scenarios/invite_redirect_blocked/0006_test.yml.tt2
index 806fceca..c65523d4 100644
--- a/scenarios/invite_redirect_blocked/0006_test.yml.tt2
+++ b/scenarios/invite_redirect_blocked/0006_test.yml.tt2
@@ -14,8 +14,8 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - 'SIP/2.0 100'
-  - 'From: <sip:4311002@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1003@spce.test>'
+  - 'From: <sip:[% invite_redirect_blocked_scenarios_test.testuser1002.phone_number %]@invite-redirect-blocked.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-redirect-blocked.scenarios.test>'
   - 'CSeq: \d+ INVITE'
   - 'Content-Length: 0'
 sip_out: []
diff --git a/scenarios/invite_redirect_blocked/0007_test.yml.tt2 b/scenarios/invite_redirect_blocked/0007_test.yml.tt2
index a5d7e511..e0ae0a52 100644
--- a/scenarios/invite_redirect_blocked/0007_test.yml.tt2
+++ b/scenarios/invite_redirect_blocked/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:4311002@spce.test>;tag=[\w-]+'
-  - 'To: <sip:testuser1003@spce.test>'
+  - 'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0'
+  - 'From: <sip:[% invite_redirect_blocked_scenarios_test.testuser1002.phone_number %]@invite-redirect-blocked.scenarios.test>;tag=[\w-]+'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-redirect-blocked.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_redirect_blocked_scenarios_test.testuser1002.phone_number %]@invite-redirect-blocked.scenarios.test>'
+  - 'P-Caller-UUID: [% invite_redirect_blocked_scenarios_test.testuser1002.uuid %]'
+  - 'P-NGCP-Caller-Info: <sip:testuser1002@invite-redirect-blocked.scenarios.test>;ip=127.126.0.1;port=\d+;primary=[% invite_redirect_blocked_scenarios_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-redirect-blocked.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_redirect_blocked_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:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'From: <sip:[% invite_redirect_blocked_scenarios_test.testuser1002.phone_number %]@invite-redirect-blocked.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-redirect-blocked.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:4311002@spce.test>;tag=[\w-]+',
-      'To: <sip:testuser1003@spce.test>',
+      'INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %] SIP/2.0',
+      'From: <sip:[% invite_redirect_blocked_scenarios_test.testuser1002.phone_number %]@invite-redirect-blocked.scenarios.test>;tag=[\w-]+',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-redirect-blocked.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_redirect_blocked_scenarios_test.testuser1002.phone_number %]@invite-redirect-blocked.scenarios.test>',
+      'P-Caller-UUID: [% invite_redirect_blocked_scenarios_test.testuser1002.uuid %]',
+      'P-NGCP-Caller-Info: <sip:testuser1002@invite-redirect-blocked.scenarios.test>;ip=127.126.0.1;port=\d+;primary=[% invite_redirect_blocked_scenarios_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-redirect-blocked.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_redirect_blocked_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_redirect_blocked/0011_test.yml.tt2 b/scenarios/invite_redirect_blocked/0011_test.yml.tt2
index 03763db1..41145238 100644
--- a/scenarios/invite_redirect_blocked/0011_test.yml.tt2
+++ b/scenarios/invite_redirect_blocked/0011_test.yml.tt2
@@ -44,21 +44,23 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^SIP/2.0 302 Moved Temporarily'
-  - 'From: <sip:4311002@'
-  - 'To: <sip:testuser1003@'
+  - 'From: <sip:[% invite_redirect_blocked_scenarios_test.testuser1002.phone_number %]@'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.responders.1.username %]@'
   - 'CSeq: 2 INVITE'
 sip_out:
   - [
-      '^ACK sip:testuser1003@',
-      'From: <sip:4311002@',
-      'To: <sip:testuser1003@',
+      '^ACK sip:[% scenarios.0.responders.0.username %]@',
+      'From: <sip:[% invite_redirect_blocked_scenarios_test.testuser1002.phone_number %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0'
     ]
   - [
       '^SIP/2.0 302 Moved Temporarily',
-      'From: <sip:testuser1002@',
-      'To: <sip:testuser1003@',
+      'From: <sip:[% scenarios.0.username %]@',
+      'To: <sip:[% scenarios.0.responders.0.username %]@',
+      'Contact: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]>',
       'CSeq: 2 INVITE'
     ]
diff --git a/scenarios/invite_redirect_blocked/cdr_test.yml.tt2 b/scenarios/invite_redirect_blocked/cdr_test.yml.tt2
index b6df7f45..87c9f63a 100644
--- a/scenarios/invite_redirect_blocked/cdr_test.yml.tt2
+++ b/scenarios/invite_redirect_blocked/cdr_test.yml.tt2
@@ -1,10 +1,10 @@
 cdr:
-  - source_user: 'testuser1002'
-    source_domain: 'spce.test'
-    source_cli: '4311002'
-    destination_user: 'testuser1003'
-    destination_domain: 'spce.test'
-    destination_user_dialed: 'testuser1003'
+  - source_user: '[% scenarios.0.username %]'
+    source_domain: 'invite-redirect-blocked.scenarios.test'
+    source_cli: '[% invite_redirect_scenarios_test.testuser1002.phone_number %]'
+    destination_user: '[% scenarios.0.username %]'
+    destination_domain: 'invite-redirect-blocked.scenarios.test'
+    destination_user_dialed: '[% scenarios.0.username %]'
     call_type: 'call'
     call_status: 'other'
     call_code: '302'
diff --git a/scenarios/invite_redirect_blocked/prefs.json b/scenarios/invite_redirect_blocked/prefs.json
deleted file mode 100644
index 2cafb7d1..00000000
--- a/scenarios/invite_redirect_blocked/prefs.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "testuser1003@spce.test": {
-        "call_deflection": "disabled"
-     }
-}
diff --git a/scenarios/invite_redirect_blocked/prefs.json.tt2 b/scenarios/invite_redirect_blocked/prefs.json.tt2
new file mode 100644
index 00000000..27c4026f
--- /dev/null
+++ b/scenarios/invite_redirect_blocked/prefs.json.tt2
@@ -0,0 +1,5 @@
+{
+    "[% scenarios.0.responders.0.username %]@invite-redirect-blocked.scenarios.test": {
+        "call_deflection": "disabled"
+     }
+}
diff --git a/scenarios/invite_redirect_blocked/scenario.yml b/scenarios/invite_redirect_blocked/scenario.yml
index ddab7c44..a2dea4eb 100644
--- a/scenarios/invite_redirect_blocked/scenario.yml
+++ b/scenarios/invite_redirect_blocked/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite_redirect_blocked
 domains:
-  'spce.test':
+  invite-redirect-blocked.scenarios.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,13 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  invite-redirect-blocked.scenarios.test:
+    testuser1004:
+      customer: 'customer.test'
+      password: testuser
+      cc: 43
+      ac: 1
+      sn: 1004
     testuser1003:
       customer: 'customer.test'
       password: testuser
@@ -29,9 +36,14 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite-redirect-blocked.scenarios.test
     responders:
       - ip: 127.1.0.1
         username: testuser1003
-        domain: spce.test
-        register: yes
+        domain: invite-redirect-blocked.scenarios.test
+        register: 'yes'
+      - ip: 127.1.0.2
+        username: testuser1004
+        domain: invite-redirect-blocked.scenarios.test
+        active: 'no'
+        register: 'no'
diff --git a/scenarios/invite_redirect_blocked/sipp_scenario_responder00.xml b/scenarios/invite_redirect_blocked/sipp_scenario_responder00.xml
index ec9b3eee..57f07c09 100644
--- a/scenarios/invite_redirect_blocked/sipp_scenario_responder00.xml
+++ b/scenarios/invite_redirect_blocked/sipp_scenario_responder00.xml
@@ -14,7 +14,7 @@
       [last_To:];tag=[pid]SIPpTag01[call_number]
       [last_Call-ID:]
       [last_CSeq:]
-      Contact: <sip:testuser1004@spce.test;transport=[transport]>
+      Contact: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=0];transport=[transport]>
       Content-Length: 0
 
     ]]>