diff --git a/bin/check.py b/bin/check.py
index 3f767352..9e6c5a8e 100755
--- a/bin/check.py
+++ b/bin/check.py
@@ -132,7 +132,7 @@ class Test:
             try:
                 result = (val0 == int(val1))
             except:
-                result = false
+                result = False
         elif isinstance(val0, list) and isinstance(val1, list):
             size = len(val0)
             if size != len(val1):
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2
similarity index 100%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2
rename to scenarios/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
similarity index 100%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
rename to scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/0004_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0005_test.yml.tt2
similarity index 91%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/0004_test.yml.tt2
rename to scenarios/invite_peerout_rewrite_pv_regex/0005_test.yml.tt2
index c760e7e8..c6769726 100644
--- a/scenarios_disabled/invite_peerout_rewrite_pv_regex/0004_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0005_test.yml.tt2
@@ -4,7 +4,7 @@ flow:
 sip_in:
   - '^SIP/2.0 180 Ringing'
   - 'CSeq: 2 INVITE'
-  - 'From: <sip:4311002@'
+  - 'From: <sip:1002@'
   - 'To: <sip:004321001@'
 sip_out:
   - [
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/0005_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0006_test.yml.tt2
similarity index 91%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/0005_test.yml.tt2
rename to scenarios/invite_peerout_rewrite_pv_regex/0006_test.yml.tt2
index 73a815a1..fb554e08 100644
--- a/scenarios_disabled/invite_peerout_rewrite_pv_regex/0005_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0006_test.yml.tt2
@@ -4,7 +4,7 @@ flow:
 sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: 2 INVITE'
-  - 'From: <sip:4311002@'
+  - 'From: <sip:1002@'
   - 'To: <sip:004321001@'
 sip_out:
   - [
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/0006_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0007_test.yml.tt2
similarity index 100%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/0006_test.yml.tt2
rename to scenarios/invite_peerout_rewrite_pv_regex/0007_test.yml.tt2
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/0007_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2
similarity index 100%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/0007_test.yml.tt2
rename to scenarios/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0009_test.yml.tt2
similarity index 92%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2
rename to scenarios/invite_peerout_rewrite_pv_regex/0009_test.yml.tt2
index 1171f4e1..b489f80a 100644
--- a/scenarios_disabled/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0009_test.yml.tt2
@@ -5,7 +5,7 @@ sip_in:
   - '^SIP/2.0 200 OK'
   - 'CSeq: 3 BYE'
   - 'Content-Length: 0'
-  - 'From: <sip:4311002@'
+  - 'From: <sip:1002@'
   - 'To: <sip:004321001@'
 sip_out:
   - [
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/peer.yml b/scenarios/invite_peerout_rewrite_pv_regex/peer.yml
similarity index 100%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/peer.yml
rename to scenarios/invite_peerout_rewrite_pv_regex/peer.yml
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/prefs.yml b/scenarios/invite_peerout_rewrite_pv_regex/prefs.yml
similarity index 100%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/prefs.yml
rename to scenarios/invite_peerout_rewrite_pv_regex/prefs.yml
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/rewrite.yml b/scenarios/invite_peerout_rewrite_pv_regex/rewrite.yml
similarity index 100%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/rewrite.yml
rename to scenarios/invite_peerout_rewrite_pv_regex/rewrite.yml
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/scenario.yml b/scenarios/invite_peerout_rewrite_pv_regex/scenario.yml
similarity index 100%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/scenario.yml
rename to scenarios/invite_peerout_rewrite_pv_regex/scenario.yml
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/sipp_scenario00.xml b/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario00.xml
similarity index 100%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/sipp_scenario00.xml
rename to scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario00.xml
diff --git a/scenarios_disabled/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00.xml b/scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00.xml
similarity index 100%
rename from scenarios_disabled/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00.xml
rename to scenarios/invite_peerout_rewrite_pv_regex/sipp_scenario_responder00.xml