Reorganize the testsuite

Splitting the testsuite in several components makes it easier to manage and comprehend.
This was also needed some some tests aren't passing on Alpine Linux, but we still want to run
as many of them as we can on this platform.

482 files changed, 69 insertions, 60 deletions

diff --git a/src/tests/broken_conf.phpt b/src/tests/broken_configuration/broken_conf.phpt
index 209e1bd..209e1bd 100644
--- a/src/tests/broken_conf.phpt
+++ b/src/tests/broken_configuration/broken_conf.phpt
diff --git a/src/tests/broken_conf2.phpt b/src/tests/broken_configuration/broken_conf2.phpt
index 47314d1..47314d1 100644
--- a/src/tests/broken_conf2.phpt
+++ b/src/tests/broken_configuration/broken_conf2.phpt
diff --git a/src/tests/broken_conf_allow_broken_disabled.phpt b/src/tests/broken_configuration/broken_conf_allow_broken_disabled.phpt
index 7aa0c82..7aa0c82 100644
--- a/src/tests/broken_conf_allow_broken_disabled.phpt
+++ b/src/tests/broken_configuration/broken_conf_allow_broken_disabled.phpt
diff --git a/src/tests/broken_conf_allow_broken_enabled.phpt b/src/tests/broken_configuration/broken_conf_allow_broken_enabled.phpt
index 452595b..452595b 100644
--- a/src/tests/broken_conf_allow_broken_enabled.phpt
+++ b/src/tests/broken_configuration/broken_conf_allow_broken_enabled.phpt
diff --git a/src/tests/broken_conf_config_regexp.phpt b/src/tests/broken_configuration/broken_conf_config_regexp.phpt
index 2977e3a..2977e3a 100644
--- a/src/tests/broken_conf_config_regexp.phpt
+++ b/src/tests/broken_configuration/broken_conf_config_regexp.phpt
diff --git a/src/tests/broken_conf_config_regexp_no_closing_paren.phpt b/src/tests/broken_configuration/broken_conf_config_regexp_no_closing_paren.phpt
index 77bb1b4..77bb1b4 100644
--- a/src/tests/broken_conf_config_regexp_no_closing_paren.phpt
+++ b/src/tests/broken_configuration/broken_conf_config_regexp_no_closing_paren.phpt
diff --git a/src/tests/broken_conf_cookie_encryption_without_encryption_key.phpt b/src/tests/broken_configuration/broken_conf_cookie_encryption_without_encryption_key.phpt
index d0b7c0d..d0b7c0d 100644
--- a/src/tests/broken_conf_cookie_encryption_without_encryption_key.phpt
+++ b/src/tests/broken_configuration/broken_conf_cookie_encryption_without_encryption_key.phpt
diff --git a/src/tests/broken_conf_cookie_encryption_without_env_var.phpt b/src/tests/broken_configuration/broken_conf_cookie_encryption_without_env_var.phpt
index af5d471..af5d471 100644
--- a/src/tests/broken_conf_cookie_encryption_without_env_var.phpt
+++ b/src/tests/broken_configuration/broken_conf_cookie_encryption_without_env_var.phpt
diff --git a/src/tests/broken_conf_cookie_name_and_regexp.phpt b/src/tests/broken_configuration/broken_conf_cookie_name_and_regexp.phpt
index b1e1318..b1e1318 100644
--- a/src/tests/broken_conf_cookie_name_and_regexp.phpt
+++ b/src/tests/broken_configuration/broken_conf_cookie_name_and_regexp.phpt
diff --git a/src/tests/broken_conf_enable_disable.phpt b/src/tests/broken_configuration/broken_conf_enable_disable.phpt
index a836f44..a836f44 100644
--- a/src/tests/broken_conf_enable_disable.phpt
+++ b/src/tests/broken_configuration/broken_conf_enable_disable.phpt
diff --git a/src/tests/broken_conf_eval.phpt b/src/tests/broken_configuration/broken_conf_eval.phpt
index 98da9c9..98da9c9 100644
--- a/src/tests/broken_conf_eval.phpt
+++ b/src/tests/broken_configuration/broken_conf_eval.phpt
diff --git a/src/tests/broken_conf_expecting_bool.phpt b/src/tests/broken_configuration/broken_conf_expecting_bool.phpt
index 6770c7c..6770c7c 100644
--- a/src/tests/broken_conf_expecting_bool.phpt
+++ b/src/tests/broken_configuration/broken_conf_expecting_bool.phpt
diff --git a/src/tests/broken_conf_invalid_cidr.phpt b/src/tests/broken_configuration/broken_conf_invalid_cidr.phpt
index 3e27050..3e27050 100644
--- a/src/tests/broken_conf_invalid_cidr.phpt
+++ b/src/tests/broken_configuration/broken_conf_invalid_cidr.phpt
diff --git a/src/tests/broken_conf_invalid_cidr6.phpt b/src/tests/broken_configuration/broken_conf_invalid_cidr6.phpt
index 8f96669..8f96669 100644
--- a/src/tests/broken_conf_invalid_cidr6.phpt
+++ b/src/tests/broken_configuration/broken_conf_invalid_cidr6.phpt
diff --git a/src/tests/broken_conf_invalid_cidr6_no_slash.phpt b/src/tests/broken_configuration/broken_conf_invalid_cidr6_no_slash.phpt
index 2d557ff..2d557ff 100644
--- a/src/tests/broken_conf_invalid_cidr6_no_slash.phpt
+++ b/src/tests/broken_configuration/broken_conf_invalid_cidr6_no_slash.phpt
diff --git a/src/tests/broken_conf_invalid_cidr6_too_big.phpt b/src/tests/broken_configuration/broken_conf_invalid_cidr6_too_big.phpt
index 47d4a5d..47d4a5d 100644
--- a/src/tests/broken_conf_invalid_cidr6_too_big.phpt
+++ b/src/tests/broken_configuration/broken_conf_invalid_cidr6_too_big.phpt
diff --git a/src/tests/broken_conf_invalid_cidr_value.phpt b/src/tests/broken_configuration/broken_conf_invalid_cidr_value.phpt
index ad60912..ad60912 100644
--- a/src/tests/broken_conf_invalid_cidr_value.phpt
+++ b/src/tests/broken_configuration/broken_conf_invalid_cidr_value.phpt
diff --git a/src/tests/broken_conf_invalid_filename.phpt b/src/tests/broken_configuration/broken_conf_invalid_filename.phpt
index 0ab138f..0ab138f 100644
--- a/src/tests/broken_conf_invalid_filename.phpt
+++ b/src/tests/broken_configuration/broken_conf_invalid_filename.phpt
diff --git a/src/tests/broken_conf_invalid_type.phpt b/src/tests/broken_configuration/broken_conf_invalid_type.phpt
index b140c25..b140c25 100644
--- a/src/tests/broken_conf_invalid_type.phpt
+++ b/src/tests/broken_configuration/broken_conf_invalid_type.phpt
diff --git a/src/tests/broken_conf_key_value.phpt b/src/tests/broken_configuration/broken_conf_key_value.phpt
index 8c455f8..8c455f8 100644
--- a/src/tests/broken_conf_key_value.phpt
+++ b/src/tests/broken_configuration/broken_conf_key_value.phpt
diff --git a/src/tests/broken_conf_line_empty_string.phpt b/src/tests/broken_configuration/broken_conf_line_empty_string.phpt
index 77bd46d..77bd46d 100644
--- a/src/tests/broken_conf_line_empty_string.phpt
+++ b/src/tests/broken_configuration/broken_conf_line_empty_string.phpt
diff --git a/src/tests/broken_conf_line_no_closing.phpt b/src/tests/broken_configuration/broken_conf_line_no_closing.phpt
index 19dd081..19dd081 100644
--- a/src/tests/broken_conf_line_no_closing.phpt
+++ b/src/tests/broken_configuration/broken_conf_line_no_closing.phpt
diff --git a/src/tests/broken_conf_local_var_1.phpt b/src/tests/broken_configuration/broken_conf_local_var_1.phpt
index 52494d3..52494d3 100644
--- a/src/tests/broken_conf_local_var_1.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_1.phpt
diff --git a/src/tests/broken_conf_local_var_10.phpt b/src/tests/broken_configuration/broken_conf_local_var_10.phpt
index d184286..d184286 100644
--- a/src/tests/broken_conf_local_var_10.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_10.phpt
diff --git a/src/tests/broken_conf_local_var_11.phpt b/src/tests/broken_configuration/broken_conf_local_var_11.phpt
index 105ef24..105ef24 100644
--- a/src/tests/broken_conf_local_var_11.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_11.phpt
diff --git a/src/tests/broken_conf_local_var_12.phpt b/src/tests/broken_configuration/broken_conf_local_var_12.phpt
index bfa79e1..bfa79e1 100644
--- a/src/tests/broken_conf_local_var_12.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_12.phpt
diff --git a/src/tests/broken_conf_local_var_13.phpt b/src/tests/broken_configuration/broken_conf_local_var_13.phpt
index b4e8dee..b4e8dee 100644
--- a/src/tests/broken_conf_local_var_13.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_13.phpt
diff --git a/src/tests/broken_conf_local_var_14.phpt b/src/tests/broken_configuration/broken_conf_local_var_14.phpt
index 3e21721..3e21721 100644
--- a/src/tests/broken_conf_local_var_14.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_14.phpt
diff --git a/src/tests/broken_conf_local_var_15.phpt b/src/tests/broken_configuration/broken_conf_local_var_15.phpt
index 6c9c4c3..6c9c4c3 100644
--- a/src/tests/broken_conf_local_var_15.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_15.phpt
diff --git a/src/tests/broken_conf_local_var_16.phpt b/src/tests/broken_configuration/broken_conf_local_var_16.phpt
index 85c6627..85c6627 100644
--- a/src/tests/broken_conf_local_var_16.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_16.phpt
diff --git a/src/tests/broken_conf_local_var_2.phpt b/src/tests/broken_configuration/broken_conf_local_var_2.phpt
index 7b0d36b..7b0d36b 100644
--- a/src/tests/broken_conf_local_var_2.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_2.phpt
diff --git a/src/tests/broken_conf_local_var_3.phpt b/src/tests/broken_configuration/broken_conf_local_var_3.phpt
index fb00c26..fb00c26 100644
--- a/src/tests/broken_conf_local_var_3.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_3.phpt
diff --git a/src/tests/broken_conf_local_var_4.phpt b/src/tests/broken_configuration/broken_conf_local_var_4.phpt
index 8d7e195..8d7e195 100644
--- a/src/tests/broken_conf_local_var_4.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_4.phpt
diff --git a/src/tests/broken_conf_local_var_5.phpt b/src/tests/broken_configuration/broken_conf_local_var_5.phpt
index 1c62e37..1c62e37 100644
--- a/src/tests/broken_conf_local_var_5.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_5.phpt
diff --git a/src/tests/broken_conf_local_var_6.phpt b/src/tests/broken_configuration/broken_conf_local_var_6.phpt
index 9a3fa02..9a3fa02 100644
--- a/src/tests/broken_conf_local_var_6.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_6.phpt
diff --git a/src/tests/broken_conf_local_var_7.phpt b/src/tests/broken_configuration/broken_conf_local_var_7.phpt
index 9f2548b..9f2548b 100644
--- a/src/tests/broken_conf_local_var_7.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_7.phpt
diff --git a/src/tests/broken_conf_local_var_8.phpt b/src/tests/broken_configuration/broken_conf_local_var_8.phpt
index d4d9d35..d4d9d35 100644
--- a/src/tests/broken_conf_local_var_8.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_8.phpt
diff --git a/src/tests/broken_conf_local_var_9.phpt b/src/tests/broken_configuration/broken_conf_local_var_9.phpt
index 972e398..972e398 100644
--- a/src/tests/broken_conf_local_var_9.phpt
+++ b/src/tests/broken_configuration/broken_conf_local_var_9.phpt
diff --git a/src/tests/broken_conf_lots_of_quotes.phpt b/src/tests/broken_configuration/broken_conf_lots_of_quotes.phpt
index afed2f8..afed2f8 100644
--- a/src/tests/broken_conf_lots_of_quotes.phpt
+++ b/src/tests/broken_configuration/broken_conf_lots_of_quotes.phpt
diff --git a/src/tests/broken_conf_missing_script.phpt b/src/tests/broken_configuration/broken_conf_missing_script.phpt
index 70e508d..70e508d 100644
--- a/src/tests/broken_conf_missing_script.phpt
+++ b/src/tests/broken_configuration/broken_conf_missing_script.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive.phpt
index 6cc9bd6..6cc9bd6 100644
--- a/src/tests/broken_conf_mutually_exclusive.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive10.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive10.phpt
index 0231c05..0231c05 100644
--- a/src/tests/broken_conf_mutually_exclusive10.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive10.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive11.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive11.phpt
index 507d7fa..507d7fa 100644
--- a/src/tests/broken_conf_mutually_exclusive11.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive11.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive12.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive12.phpt
index d823de9..d823de9 100644
--- a/src/tests/broken_conf_mutually_exclusive12.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive12.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive2.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive2.phpt
index 570b917..570b917 100644
--- a/src/tests/broken_conf_mutually_exclusive2.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive2.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive3.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive3.phpt
index e7387eb..e7387eb 100644
--- a/src/tests/broken_conf_mutually_exclusive3.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive3.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive4.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive4.phpt
index c979f56..c979f56 100644
--- a/src/tests/broken_conf_mutually_exclusive4.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive4.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive5.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive5.phpt
index b23fba6..b23fba6 100644
--- a/src/tests/broken_conf_mutually_exclusive5.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive5.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive6.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive6.phpt
index 1c4686b..1c4686b 100644
--- a/src/tests/broken_conf_mutually_exclusive6.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive6.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive7.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive7.phpt
index 22abf79..22abf79 100644
--- a/src/tests/broken_conf_mutually_exclusive7.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive7.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive8.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive8.phpt
index 6a95234..6a95234 100644
--- a/src/tests/broken_conf_mutually_exclusive8.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive8.phpt
diff --git a/src/tests/broken_conf_mutually_exclusive9.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive9.phpt
index 9436c24..9436c24 100644
--- a/src/tests/broken_conf_mutually_exclusive9.phpt
+++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive9.phpt
diff --git a/src/tests/broken_conf_no_cookie_action.phpt b/src/tests/broken_configuration/broken_conf_no_cookie_action.phpt
index a354b8b..a354b8b 100644
--- a/src/tests/broken_conf_no_cookie_action.phpt
+++ b/src/tests/broken_configuration/broken_conf_no_cookie_action.phpt
diff --git a/src/tests/broken_conf_no_cookie_name.phpt b/src/tests/broken_configuration/broken_conf_no_cookie_name.phpt
index e769edb..e769edb 100644
--- a/src/tests/broken_conf_no_cookie_name.phpt
+++ b/src/tests/broken_configuration/broken_conf_no_cookie_name.phpt
diff --git a/src/tests/broken_conf_no_file_specified.phpt b/src/tests/broken_configuration/broken_conf_no_file_specified.phpt
index 10314ec..10314ec 100644
--- a/src/tests/broken_conf_no_file_specified.phpt
+++ b/src/tests/broken_configuration/broken_conf_no_file_specified.phpt
diff --git a/src/tests/broken_conf_nonexisting_script.phpt b/src/tests/broken_configuration/broken_conf_nonexisting_script.phpt
index 16583d3..16583d3 100644
--- a/src/tests/broken_conf_nonexisting_script.phpt
+++ b/src/tests/broken_configuration/broken_conf_nonexisting_script.phpt
diff --git a/src/tests/broken_conf_quotes.phpt b/src/tests/broken_configuration/broken_conf_quotes.phpt
index 845f7ee..845f7ee 100644
--- a/src/tests/broken_conf_quotes.phpt
+++ b/src/tests/broken_configuration/broken_conf_quotes.phpt
diff --git a/src/tests/broken_conf_readonly_exec.phpt b/src/tests/broken_configuration/broken_conf_readonly_exec.phpt
index cc5758f..cc5758f 100644
--- a/src/tests/broken_conf_readonly_exec.phpt
+++ b/src/tests/broken_configuration/broken_conf_readonly_exec.phpt
diff --git a/src/tests/broken_conf_samesite.phpt b/src/tests/broken_configuration/broken_conf_samesite.phpt
index 99965d4..99965d4 100644
--- a/src/tests/broken_conf_samesite.phpt
+++ b/src/tests/broken_configuration/broken_conf_samesite.phpt
diff --git a/src/tests/broken_conf_session_encryption.phpt b/src/tests/broken_configuration/broken_conf_session_encryption.phpt
index b6a0ea7..b6a0ea7 100644
--- a/src/tests/broken_conf_session_encryption.phpt
+++ b/src/tests/broken_configuration/broken_conf_session_encryption.phpt
diff --git a/src/tests/broken_conf_session_encryption_without_encryption_key.phpt b/src/tests/broken_configuration/broken_conf_session_encryption_without_encryption_key.phpt
index c90a154..c90a154 100644
--- a/src/tests/broken_conf_session_encryption_without_encryption_key.phpt
+++ b/src/tests/broken_configuration/broken_conf_session_encryption_without_encryption_key.phpt
diff --git a/src/tests/broken_conf_session_encryption_without_env_var.phpt b/src/tests/broken_configuration/broken_conf_session_encryption_without_env_var.phpt
index c2654e4..c2654e4 100644
--- a/src/tests/broken_conf_session_encryption_without_env_var.phpt
+++ b/src/tests/broken_configuration/broken_conf_session_encryption_without_env_var.phpt
diff --git a/src/tests/broken_conf_shown_in_phpinfo.phpt b/src/tests/broken_configuration/broken_conf_shown_in_phpinfo.phpt
index eb7eae6..eb7eae6 100644
--- a/src/tests/broken_conf_shown_in_phpinfo.phpt
+++ b/src/tests/broken_configuration/broken_conf_shown_in_phpinfo.phpt
diff --git a/src/tests/broken_conf_truncated.phpt b/src/tests/broken_configuration/broken_conf_truncated.phpt
index f0c5887..f0c5887 100644
--- a/src/tests/broken_conf_truncated.phpt
+++ b/src/tests/broken_configuration/broken_conf_truncated.phpt
diff --git a/src/tests/broken_conf_unserialize.phpt b/src/tests/broken_configuration/broken_conf_unserialize.phpt
index d7a924a..d7a924a 100644
--- a/src/tests/broken_conf_unserialize.phpt
+++ b/src/tests/broken_configuration/broken_conf_unserialize.phpt
diff --git a/src/tests/broken_conf_upload_validation.phpt b/src/tests/broken_configuration/broken_conf_upload_validation.phpt
index 332a649..332a649 100644
--- a/src/tests/broken_conf_upload_validation.phpt
+++ b/src/tests/broken_configuration/broken_conf_upload_validation.phpt
diff --git a/src/tests/broken_conf_weird_keyword.phpt b/src/tests/broken_configuration/broken_conf_weird_keyword.phpt
index e3c1239..e3c1239 100644
--- a/src/tests/broken_conf_weird_keyword.phpt
+++ b/src/tests/broken_configuration/broken_conf_weird_keyword.phpt
diff --git a/src/tests/broken_conf_wrapper_whitelist.phpt b/src/tests/broken_configuration/broken_conf_wrapper_whitelist.phpt
index ea147ac..ea147ac 100644
--- a/src/tests/broken_conf_wrapper_whitelist.phpt
+++ b/src/tests/broken_configuration/broken_conf_wrapper_whitelist.phpt
diff --git a/src/tests/broken_conf_wrong_quotes.phpt b/src/tests/broken_configuration/broken_conf_wrong_quotes.phpt
index 119bbe7..119bbe7 100644
--- a/src/tests/broken_conf_wrong_quotes.phpt
+++ b/src/tests/broken_configuration/broken_conf_wrong_quotes.phpt
diff --git a/src/tests/broken_conf_wrong_type.phpt b/src/tests/broken_configuration/broken_conf_wrong_type.phpt
index b90d6ff..b90d6ff 100644
--- a/src/tests/broken_conf_wrong_type.phpt
+++ b/src/tests/broken_configuration/broken_conf_wrong_type.phpt
diff --git a/src/tests/broken_invalid_client_ip4.phpt b/src/tests/broken_configuration/broken_invalid_client_ip4.phpt
index e8a5260..e8a5260 100644
--- a/src/tests/broken_invalid_client_ip4.phpt
+++ b/src/tests/broken_configuration/broken_invalid_client_ip4.phpt
diff --git a/src/tests/broken_regexp.phpt b/src/tests/broken_configuration/broken_regexp.phpt
index 2fc130d..2fc130d 100644
--- a/src/tests/broken_regexp.phpt
+++ b/src/tests/broken_configuration/broken_regexp.phpt
diff --git a/src/tests/broken_unmatching_brackets.phpt b/src/tests/broken_configuration/broken_unmatching_brackets.phpt
index 33eaaa7..33eaaa7 100644
--- a/src/tests/broken_unmatching_brackets.phpt
+++ b/src/tests/broken_configuration/broken_unmatching_brackets.phpt
diff --git a/src/tests/config/borken_conf_enable_disable.ini b/src/tests/broken_configuration/config/borken_conf_enable_disable.ini
index 4e95294..4e95294 100644
--- a/src/tests/config/borken_conf_enable_disable.ini
+++ b/src/tests/broken_configuration/config/borken_conf_enable_disable.ini
diff --git a/src/tests/config/borken_conf_upload_validation.ini b/src/tests/broken_configuration/config/borken_conf_upload_validation.ini
index 7c94185..7c94185 100644
--- a/src/tests/config/borken_conf_upload_validation.ini
+++ b/src/tests/broken_configuration/config/borken_conf_upload_validation.ini
diff --git a/src/tests/config/broken_conf.ini b/src/tests/broken_configuration/config/broken_conf.ini
index 0595320..0595320 100644
--- a/src/tests/config/broken_conf.ini
+++ b/src/tests/broken_configuration/config/broken_conf.ini
diff --git a/src/tests/config/broken_conf2.ini b/src/tests/broken_configuration/config/broken_conf2.ini
index fdb6b8f..fdb6b8f 100644
--- a/src/tests/config/broken_conf2.ini
+++ b/src/tests/broken_configuration/config/broken_conf2.ini
diff --git a/src/tests/config/broken_conf_cookie_action.ini b/src/tests/broken_configuration/config/broken_conf_cookie_action.ini
index 5f07c28..5f07c28 100644
--- a/src/tests/config/broken_conf_cookie_action.ini
+++ b/src/tests/broken_configuration/config/broken_conf_cookie_action.ini
diff --git a/src/tests/config/broken_conf_cookie_encryption_without_encryption_key.ini b/src/tests/broken_configuration/config/broken_conf_cookie_encryption_without_encryption_key.ini
index a100bd8..a100bd8 100644
--- a/src/tests/config/broken_conf_cookie_encryption_without_encryption_key.ini
+++ b/src/tests/broken_configuration/config/broken_conf_cookie_encryption_without_encryption_key.ini
diff --git a/src/tests/config/broken_conf_cookie_encryption_without_env_var.ini b/src/tests/broken_configuration/config/broken_conf_cookie_encryption_without_env_var.ini
index 54cb101..54cb101 100644
--- a/src/tests/config/broken_conf_cookie_encryption_without_env_var.ini
+++ b/src/tests/broken_configuration/config/broken_conf_cookie_encryption_without_env_var.ini
diff --git a/src/tests/config/broken_conf_cookie_name_and_regexp.ini b/src/tests/broken_configuration/config/broken_conf_cookie_name_and_regexp.ini
index 503889b..503889b 100644
--- a/src/tests/config/broken_conf_cookie_name_and_regexp.ini
+++ b/src/tests/broken_configuration/config/broken_conf_cookie_name_and_regexp.ini
diff --git a/src/tests/config/broken_conf_cookie_samesite.ini b/src/tests/broken_configuration/config/broken_conf_cookie_samesite.ini
index acc4aa0..acc4aa0 100644
--- a/src/tests/config/broken_conf_cookie_samesite.ini
+++ b/src/tests/broken_configuration/config/broken_conf_cookie_samesite.ini
diff --git a/src/tests/config/broken_conf_eval.ini b/src/tests/broken_configuration/config/broken_conf_eval.ini
index 80ef7e5..80ef7e5 100644
--- a/src/tests/config/broken_conf_eval.ini
+++ b/src/tests/broken_configuration/config/broken_conf_eval.ini
diff --git a/src/tests/config/broken_conf_expecting_bool.ini b/src/tests/broken_configuration/config/broken_conf_expecting_bool.ini
index 51c28b2..51c28b2 100644
--- a/src/tests/config/broken_conf_expecting_bool.ini
+++ b/src/tests/broken_configuration/config/broken_conf_expecting_bool.ini
diff --git a/src/tests/config/broken_conf_invalid_cidr.ini b/src/tests/broken_configuration/config/broken_conf_invalid_cidr.ini
index b1929c1..b1929c1 100644
--- a/src/tests/config/broken_conf_invalid_cidr.ini
+++ b/src/tests/broken_configuration/config/broken_conf_invalid_cidr.ini
diff --git a/src/tests/config/broken_conf_invalid_cidr6.ini b/src/tests/broken_configuration/config/broken_conf_invalid_cidr6.ini
index 5e91faf..5e91faf 100644
--- a/src/tests/config/broken_conf_invalid_cidr6.ini
+++ b/src/tests/broken_configuration/config/broken_conf_invalid_cidr6.ini
diff --git a/src/tests/config/broken_conf_invalid_cidr6_no_slash.ini b/src/tests/broken_configuration/config/broken_conf_invalid_cidr6_no_slash.ini
index 067209f..067209f 100644
--- a/src/tests/config/broken_conf_invalid_cidr6_no_slash.ini
+++ b/src/tests/broken_configuration/config/broken_conf_invalid_cidr6_no_slash.ini
diff --git a/src/tests/config/broken_conf_invalid_cidr6_too_big.ini b/src/tests/broken_configuration/config/broken_conf_invalid_cidr6_too_big.ini
index f82b18b..f82b18b 100644
--- a/src/tests/config/broken_conf_invalid_cidr6_too_big.ini
+++ b/src/tests/broken_configuration/config/broken_conf_invalid_cidr6_too_big.ini
diff --git a/src/tests/config/broken_conf_invalid_cidr_value.ini b/src/tests/broken_configuration/config/broken_conf_invalid_cidr_value.ini
index 06a56bd..06a56bd 100644
--- a/src/tests/config/broken_conf_invalid_cidr_value.ini
+++ b/src/tests/broken_configuration/config/broken_conf_invalid_cidr_value.ini
diff --git a/src/tests/config/broken_conf_invalid_filename.ini b/src/tests/broken_configuration/config/broken_conf_invalid_filename.ini
index 1be3b51..1be3b51 100644
--- a/src/tests/config/broken_conf_invalid_filename.ini
+++ b/src/tests/broken_configuration/config/broken_conf_invalid_filename.ini
diff --git a/src/tests/config/broken_conf_invalid_type.ini b/src/tests/broken_configuration/config/broken_conf_invalid_type.ini
index c52994e..c52994e 100644
--- a/src/tests/config/broken_conf_invalid_type.ini
+++ b/src/tests/broken_configuration/config/broken_conf_invalid_type.ini
diff --git a/src/tests/config/broken_conf_key_value.ini b/src/tests/broken_configuration/config/broken_conf_key_value.ini
index a0edaf2..a0edaf2 100644
--- a/src/tests/config/broken_conf_key_value.ini
+++ b/src/tests/broken_configuration/config/broken_conf_key_value.ini
diff --git a/src/tests/config/broken_conf_line_empty_string.ini b/src/tests/broken_configuration/config/broken_conf_line_empty_string.ini
index dfa5520..dfa5520 100644
--- a/src/tests/config/broken_conf_line_empty_string.ini
+++ b/src/tests/broken_configuration/config/broken_conf_line_empty_string.ini
diff --git a/src/tests/config/broken_conf_line_no_closing.ini b/src/tests/broken_configuration/config/broken_conf_line_no_closing.ini
index 6a8c922..6a8c922 100644
--- a/src/tests/config/broken_conf_line_no_closing.ini
+++ b/src/tests/broken_configuration/config/broken_conf_line_no_closing.ini
diff --git a/src/tests/config/broken_conf_local_var_1.ini b/src/tests/broken_configuration/config/broken_conf_local_var_1.ini
index ae5165c..ae5165c 100644
--- a/src/tests/config/broken_conf_local_var_1.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_1.ini
diff --git a/src/tests/config/broken_conf_local_var_10.ini b/src/tests/broken_configuration/config/broken_conf_local_var_10.ini
index 93dd07f..93dd07f 100644
--- a/src/tests/config/broken_conf_local_var_10.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_10.ini
diff --git a/src/tests/config/broken_conf_local_var_11.ini b/src/tests/broken_configuration/config/broken_conf_local_var_11.ini
index 028b1bd..028b1bd 100644
--- a/src/tests/config/broken_conf_local_var_11.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_11.ini
diff --git a/src/tests/config/broken_conf_local_var_12.ini b/src/tests/broken_configuration/config/broken_conf_local_var_12.ini
index a151960..a151960 100644
--- a/src/tests/config/broken_conf_local_var_12.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_12.ini
diff --git a/src/tests/config/broken_conf_local_var_13.ini b/src/tests/broken_configuration/config/broken_conf_local_var_13.ini
index e7c9778..e7c9778 100644
--- a/src/tests/config/broken_conf_local_var_13.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_13.ini
diff --git a/src/tests/config/broken_conf_local_var_14.ini b/src/tests/broken_configuration/config/broken_conf_local_var_14.ini
index 6c98ec3..6c98ec3 100644
--- a/src/tests/config/broken_conf_local_var_14.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_14.ini
diff --git a/src/tests/config/broken_conf_local_var_15.ini b/src/tests/broken_configuration/config/broken_conf_local_var_15.ini
index a8dc5a4..a8dc5a4 100644
--- a/src/tests/config/broken_conf_local_var_15.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_15.ini
diff --git a/src/tests/config/broken_conf_local_var_16.ini b/src/tests/broken_configuration/config/broken_conf_local_var_16.ini
index 550719b..550719b 100644
--- a/src/tests/config/broken_conf_local_var_16.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_16.ini
diff --git a/src/tests/config/broken_conf_local_var_2.ini b/src/tests/broken_configuration/config/broken_conf_local_var_2.ini
index 145a3b5..145a3b5 100644
--- a/src/tests/config/broken_conf_local_var_2.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_2.ini
diff --git a/src/tests/config/broken_conf_local_var_3.ini b/src/tests/broken_configuration/config/broken_conf_local_var_3.ini
index 5d89076..5d89076 100644
--- a/src/tests/config/broken_conf_local_var_3.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_3.ini
diff --git a/src/tests/config/broken_conf_local_var_4.ini b/src/tests/broken_configuration/config/broken_conf_local_var_4.ini
index 3ec073b..3ec073b 100644
--- a/src/tests/config/broken_conf_local_var_4.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_4.ini
diff --git a/src/tests/config/broken_conf_local_var_5.ini b/src/tests/broken_configuration/config/broken_conf_local_var_5.ini
index cd350b6..cd350b6 100644
--- a/src/tests/config/broken_conf_local_var_5.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_5.ini
diff --git a/src/tests/config/broken_conf_local_var_6.ini b/src/tests/broken_configuration/config/broken_conf_local_var_6.ini
index 02f4f1a..02f4f1a 100644
--- a/src/tests/config/broken_conf_local_var_6.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_6.ini
diff --git a/src/tests/config/broken_conf_local_var_7.ini b/src/tests/broken_configuration/config/broken_conf_local_var_7.ini
index abbd223..abbd223 100644
--- a/src/tests/config/broken_conf_local_var_7.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_7.ini
diff --git a/src/tests/config/broken_conf_local_var_8.ini b/src/tests/broken_configuration/config/broken_conf_local_var_8.ini
index fd18487..fd18487 100644
--- a/src/tests/config/broken_conf_local_var_8.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_8.ini
diff --git a/src/tests/config/broken_conf_local_var_9.ini b/src/tests/broken_configuration/config/broken_conf_local_var_9.ini
index a311b86..a311b86 100644
--- a/src/tests/config/broken_conf_local_var_9.ini
+++ b/src/tests/broken_configuration/config/broken_conf_local_var_9.ini
diff --git a/src/tests/config/broken_conf_lots_of_quotes.ini b/src/tests/broken_configuration/config/broken_conf_lots_of_quotes.ini
index 189a10d..189a10d 100644
--- a/src/tests/config/broken_conf_lots_of_quotes.ini
+++ b/src/tests/broken_configuration/config/broken_conf_lots_of_quotes.ini
diff --git a/src/tests/config/broken_conf_missing_script.ini b/src/tests/broken_configuration/config/broken_conf_missing_script.ini
index a46f590..a46f590 100644
--- a/src/tests/config/broken_conf_missing_script.ini
+++ b/src/tests/broken_configuration/config/broken_conf_missing_script.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive.ini
index 7ea483f..7ea483f 100644
--- a/src/tests/config/broken_conf_mutually_exclusive.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive10.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive10.ini
index da8426e..da8426e 100644
--- a/src/tests/config/broken_conf_mutually_exclusive10.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive10.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive11.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive11.ini
index cab163f..cab163f 100644
--- a/src/tests/config/broken_conf_mutually_exclusive11.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive11.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive12.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive12.ini
index fe140db..fe140db 100644
--- a/src/tests/config/broken_conf_mutually_exclusive12.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive12.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive2.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive2.ini
index 3ff3ca7..3ff3ca7 100644
--- a/src/tests/config/broken_conf_mutually_exclusive2.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive2.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive3.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive3.ini
index f4f7604..f4f7604 100644
--- a/src/tests/config/broken_conf_mutually_exclusive3.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive3.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive4.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive4.ini
index c38a727..c38a727 100644
--- a/src/tests/config/broken_conf_mutually_exclusive4.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive4.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive5.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive5.ini
index 254b2a3..254b2a3 100644
--- a/src/tests/config/broken_conf_mutually_exclusive5.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive5.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive6.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive6.ini
index 7c6712c..7c6712c 100644
--- a/src/tests/config/broken_conf_mutually_exclusive6.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive6.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive7.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive7.ini
index feb3486..feb3486 100644
--- a/src/tests/config/broken_conf_mutually_exclusive7.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive7.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive8.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive8.ini
index c9c9ea2..c9c9ea2 100644
--- a/src/tests/config/broken_conf_mutually_exclusive8.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive8.ini
diff --git a/src/tests/config/broken_conf_mutually_exclusive9.ini b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive9.ini
index 7bf6a62..7bf6a62 100644
--- a/src/tests/config/broken_conf_mutually_exclusive9.ini
+++ b/src/tests/broken_configuration/config/broken_conf_mutually_exclusive9.ini
diff --git a/src/tests/config/broken_conf_nonexisting_script.ini b/src/tests/broken_configuration/config/broken_conf_nonexisting_script.ini
index 8327438..8327438 100644
--- a/src/tests/config/broken_conf_nonexisting_script.ini
+++ b/src/tests/broken_configuration/config/broken_conf_nonexisting_script.ini
diff --git a/src/tests/config/broken_conf_quotes.ini b/src/tests/broken_configuration/config/broken_conf_quotes.ini
index eac8739..eac8739 100644
--- a/src/tests/config/broken_conf_quotes.ini
+++ b/src/tests/broken_configuration/config/broken_conf_quotes.ini
diff --git a/src/tests/config/broken_conf_readonly_exec.ini b/src/tests/broken_configuration/config/broken_conf_readonly_exec.ini
index 9e11313..9e11313 100644
--- a/src/tests/config/broken_conf_readonly_exec.ini
+++ b/src/tests/broken_configuration/config/broken_conf_readonly_exec.ini
diff --git a/src/tests/config/broken_conf_session_encryption.ini b/src/tests/broken_configuration/config/broken_conf_session_encryption.ini
index 66b7956..66b7956 100644
--- a/src/tests/config/broken_conf_session_encryption.ini
+++ b/src/tests/broken_configuration/config/broken_conf_session_encryption.ini
diff --git a/src/tests/config/broken_conf_session_encryption_without_encryption_key.ini b/src/tests/broken_configuration/config/broken_conf_session_encryption_without_encryption_key.ini
index 2b6f674..2b6f674 100644
--- a/src/tests/config/broken_conf_session_encryption_without_encryption_key.ini
+++ b/src/tests/broken_configuration/config/broken_conf_session_encryption_without_encryption_key.ini
diff --git a/src/tests/config/broken_conf_session_encryption_without_env_var.ini b/src/tests/broken_configuration/config/broken_conf_session_encryption_without_env_var.ini
index 43caf4a..43caf4a 100644
--- a/src/tests/config/broken_conf_session_encryption_without_env_var.ini
+++ b/src/tests/broken_configuration/config/broken_conf_session_encryption_without_env_var.ini
diff --git a/src/tests/config/broken_conf_to_few_args.ini b/src/tests/broken_configuration/config/broken_conf_to_few_args.ini
index 89e19be..89e19be 100644
--- a/src/tests/config/broken_conf_to_few_args.ini
+++ b/src/tests/broken_configuration/config/broken_conf_to_few_args.ini
diff --git a/src/tests/config/broken_conf_unserialize.ini b/src/tests/broken_configuration/config/broken_conf_unserialize.ini
index 9cdc9a6..9cdc9a6 100644
--- a/src/tests/config/broken_conf_unserialize.ini
+++ b/src/tests/broken_configuration/config/broken_conf_unserialize.ini
diff --git a/src/tests/config/broken_conf_weird_keyword.ini b/src/tests/broken_configuration/config/broken_conf_weird_keyword.ini
index bf5e7f5..bf5e7f5 100644
--- a/src/tests/config/broken_conf_weird_keyword.ini
+++ b/src/tests/broken_configuration/config/broken_conf_weird_keyword.ini
diff --git a/src/tests/config/broken_conf_wrapper_whitelist.ini b/src/tests/broken_configuration/config/broken_conf_wrapper_whitelist.ini
index b8e08a8..b8e08a8 100644
--- a/src/tests/config/broken_conf_wrapper_whitelist.ini
+++ b/src/tests/broken_configuration/config/broken_conf_wrapper_whitelist.ini
diff --git a/src/tests/config/broken_conf_wrong_quotes.ini b/src/tests/broken_configuration/config/broken_conf_wrong_quotes.ini
index ff41f93..ff41f93 100644
--- a/src/tests/config/broken_conf_wrong_quotes.ini
+++ b/src/tests/broken_configuration/config/broken_conf_wrong_quotes.ini
diff --git a/src/tests/config/broken_conf_wrong_type.ini b/src/tests/broken_configuration/config/broken_conf_wrong_type.ini
index b2943db..b2943db 100644
--- a/src/tests/config/broken_conf_wrong_type.ini
+++ b/src/tests/broken_configuration/config/broken_conf_wrong_type.ini
diff --git a/src/tests/config/broken_config_regexp.ini b/src/tests/broken_configuration/config/broken_config_regexp.ini
index 62bed11..62bed11 100644
--- a/src/tests/config/broken_config_regexp.ini
+++ b/src/tests/broken_configuration/config/broken_config_regexp.ini
diff --git a/src/tests/config/broken_config_regexp_no_closing_paren.ini b/src/tests/broken_configuration/config/broken_config_regexp_no_closing_paren.ini
index 93e150b..93e150b 100644
--- a/src/tests/config/broken_config_regexp_no_closing_paren.ini
+++ b/src/tests/broken_configuration/config/broken_config_regexp_no_closing_paren.ini
diff --git a/src/tests/config/broken_regexp.ini b/src/tests/broken_configuration/config/broken_regexp.ini
index 8e4bf69..8e4bf69 100644
--- a/src/tests/config/broken_regexp.ini
+++ b/src/tests/broken_configuration/config/broken_regexp.ini
diff --git a/src/tests/config/config_broken_conf_truncated.ini b/src/tests/broken_configuration/config/config_broken_conf_truncated.ini
index bf05dfb..bf05dfb 100644
--- a/src/tests/config/config_broken_conf_truncated.ini
+++ b/src/tests/broken_configuration/config/config_broken_conf_truncated.ini
diff --git a/src/tests/config/config_encrypted_cookies_noname.ini b/src/tests/broken_configuration/config/config_encrypted_cookies_noname.ini
index 048e404..048e404 100644
--- a/src/tests/config/config_encrypted_cookies_noname.ini
+++ b/src/tests/broken_configuration/config/config_encrypted_cookies_noname.ini
diff --git a/src/tests/config/config_encrypted_regexp_cookies_bad_regexp.ini b/src/tests/broken_configuration/config/config_encrypted_regexp_cookies_bad_regexp.ini
index 4fe92fd..4fe92fd 100644
--- a/src/tests/config/config_encrypted_regexp_cookies_bad_regexp.ini
+++ b/src/tests/broken_configuration/config/config_encrypted_regexp_cookies_bad_regexp.ini
diff --git a/src/tests/config/config_unmatching_brackets.ini b/src/tests/broken_configuration/config/config_unmatching_brackets.ini
index 45fa4fe..45fa4fe 100644
--- a/src/tests/config/config_unmatching_brackets.ini
+++ b/src/tests/broken_configuration/config/config_unmatching_brackets.ini
diff --git a/src/tests/config/disabled_functions_cidr.ini b/src/tests/broken_configuration/config/disabled_functions_cidr.ini
index f69ce07..f69ce07 100644
--- a/src/tests/config/disabled_functions_cidr.ini
+++ b/src/tests/broken_configuration/config/disabled_functions_cidr.ini
diff --git a/src/tests/encrypt_regexp_cookies_bad_regexp.phpt b/src/tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt
index 8272148..8272148 100644
--- a/src/tests/encrypt_regexp_cookies_bad_regexp.phpt
+++ b/src/tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt
diff --git a/src/tests/config/config_disabled_functions_eval_filename.ini b/src/tests/config/config_disabled_functions_eval_filename.ini
deleted file mode 100644
index f66cef3..0000000
--- a/src/tests/config/config_disabled_functions_eval_filename.ini
+++ /dev/null
@@ -1 +0,0 @@
-sp.disable_function.function("eval").filename_r("^.*tests/disabled_functions_eval_filename.php$").drop();
diff --git a/src/tests/config/config_encrypted_cookies.ini b/src/tests/cookies_encryption/config/config_encrypted_cookies.ini
index 4b50440..4b50440 100644
--- a/src/tests/config/config_encrypted_cookies.ini
+++ b/src/tests/cookies_encryption/config/config_encrypted_cookies.ini
diff --git a/src/tests/config/config_encrypted_cookies_empty_env.ini b/src/tests/cookies_encryption/config/config_encrypted_cookies_empty_env.ini
index 8368d65..8368d65 100644
--- a/src/tests/config/config_encrypted_cookies_empty_env.ini
+++ b/src/tests/cookies_encryption/config/config_encrypted_cookies_empty_env.ini
diff --git a/src/tests/config/config_encrypted_cookies_simulation.ini b/src/tests/cookies_encryption/config/config_encrypted_cookies_simulation.ini
index 32e24a1..32e24a1 100644
--- a/src/tests/config/config_encrypted_cookies_simulation.ini
+++ b/src/tests/cookies_encryption/config/config_encrypted_cookies_simulation.ini
diff --git a/src/tests/config/config_encrypted_regexp_cookies.ini b/src/tests/cookies_encryption/config/config_encrypted_regexp_cookies.ini
index 8ea77f7..8ea77f7 100644
--- a/src/tests/config/config_encrypted_regexp_cookies.ini
+++ b/src/tests/cookies_encryption/config/config_encrypted_regexp_cookies.ini
diff --git a/src/tests/config/config_encrypted_regexp_cookies_empty_env.ini b/src/tests/cookies_encryption/config/config_encrypted_regexp_cookies_empty_env.ini
index da84df7..da84df7 100644
--- a/src/tests/config/config_encrypted_regexp_cookies_empty_env.ini
+++ b/src/tests/cookies_encryption/config/config_encrypted_regexp_cookies_empty_env.ini
diff --git a/src/tests/config/encryption_key_only.ini b/src/tests/cookies_encryption/config/encryption_key_only.ini
index 7de4438..7de4438 100644
--- a/src/tests/config/encryption_key_only.ini
+++ b/src/tests/cookies_encryption/config/encryption_key_only.ini
diff --git a/src/tests/encrypt_cookies.phpt b/src/tests/cookies_encryption/encrypt_cookies.phpt
index d581dbc..d581dbc 100644
--- a/src/tests/encrypt_cookies.phpt
+++ b/src/tests/cookies_encryption/encrypt_cookies.phpt
diff --git a/src/tests/encrypt_cookies2.phpt b/src/tests/cookies_encryption/encrypt_cookies2.phpt
index 195cb24..195cb24 100644
--- a/src/tests/encrypt_cookies2.phpt
+++ b/src/tests/cookies_encryption/encrypt_cookies2.phpt
diff --git a/src/tests/encrypt_cookies3.phpt b/src/tests/cookies_encryption/encrypt_cookies3.phpt
index ceb364c..ceb364c 100644
--- a/src/tests/encrypt_cookies3.phpt
+++ b/src/tests/cookies_encryption/encrypt_cookies3.phpt
diff --git a/src/tests/encrypt_cookies4.phpt b/src/tests/cookies_encryption/encrypt_cookies4.phpt
index 04d4076..b644680 100644
--- a/src/tests/encrypt_cookies4.phpt
+++ b/src/tests/cookies_encryption/encrypt_cookies4.phpt
@@ -23,6 +23,6 @@ if ($ret == TRUE) {
 var_dump($_COOKIE);
 ?>
 --EXPECTF--
-Warning: Cookie names must not be empty in %a/tests/encrypt_cookies4.php on line %d
+Warning: Cookie names must not be empty in %a/encrypt_cookies4.php on line %d
 array(0) {
 }
diff --git a/src/tests/encrypt_cookies_empty_env.phpt b/src/tests/cookies_encryption/encrypt_cookies_empty_env.phpt
index 23f1759..23f1759 100644
--- a/src/tests/encrypt_cookies_empty_env.phpt
+++ b/src/tests/cookies_encryption/encrypt_cookies_empty_env.phpt
diff --git a/src/tests/encrypt_cookies_invalid_decryption.phpt b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption.phpt
index d4a0b0f..d4a0b0f 100644
--- a/src/tests/encrypt_cookies_invalid_decryption.phpt
+++ b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption.phpt
diff --git a/src/tests/encrypt_cookies_invalid_decryption2.phpt b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption2.phpt
index b3a55dd..b3a55dd 100644
--- a/src/tests/encrypt_cookies_invalid_decryption2.phpt
+++ b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption2.phpt
diff --git a/src/tests/encrypt_cookies_invalid_decryption3.phpt b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption3.phpt
index f4afc32..f4afc32 100644
--- a/src/tests/encrypt_cookies_invalid_decryption3.phpt
+++ b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption3.phpt
diff --git a/src/tests/encrypt_cookies_invalid_decryption_short_cookie.phpt b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_short_cookie.phpt
index 39f189c..39f189c 100644
--- a/src/tests/encrypt_cookies_invalid_decryption_short_cookie.phpt
+++ b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_short_cookie.phpt
diff --git a/src/tests/encrypt_cookies_invalid_decryption_simulation.phpt b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_simulation.phpt
index d2004b9..d2004b9 100644
--- a/src/tests/encrypt_cookies_invalid_decryption_simulation.phpt
+++ b/src/tests/cookies_encryption/encrypt_cookies_invalid_decryption_simulation.phpt
diff --git a/src/tests/encrypt_regexp_cookies.phpt b/src/tests/cookies_encryption/encrypt_regexp_cookies.phpt
index 6bc187a..6bc187a 100644
--- a/src/tests/encrypt_regexp_cookies.phpt
+++ b/src/tests/cookies_encryption/encrypt_regexp_cookies.phpt
diff --git a/src/tests/encrypt_regexp_cookies2.phpt b/src/tests/cookies_encryption/encrypt_regexp_cookies2.phpt
index 195cb24..195cb24 100644
--- a/src/tests/encrypt_regexp_cookies2.phpt
+++ b/src/tests/cookies_encryption/encrypt_regexp_cookies2.phpt
diff --git a/src/tests/encrypt_regexp_cookies3.phpt b/src/tests/cookies_encryption/encrypt_regexp_cookies3.phpt
index ceb364c..ceb364c 100644
--- a/src/tests/encrypt_regexp_cookies3.phpt
+++ b/src/tests/cookies_encryption/encrypt_regexp_cookies3.phpt
diff --git a/src/tests/encrypt_regexp_cookies4.phpt b/src/tests/cookies_encryption/encrypt_regexp_cookies4.phpt
index 14d737a..14d737a 100644
--- a/src/tests/encrypt_regexp_cookies4.phpt
+++ b/src/tests/cookies_encryption/encrypt_regexp_cookies4.phpt
diff --git a/src/tests/encrypt_regexp_cookies_empty_env.phpt b/src/tests/cookies_encryption/encrypt_regexp_cookies_empty_env.phpt
index 852c32e..852c32e 100644
--- a/src/tests/encrypt_regexp_cookies_empty_env.phpt
+++ b/src/tests/cookies_encryption/encrypt_regexp_cookies_empty_env.phpt
diff --git a/src/tests/encrypt_regexp_cookies_invalid_decryption.phpt b/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption.phpt
index d2f9e3c..d2f9e3c 100644
--- a/src/tests/encrypt_regexp_cookies_invalid_decryption.phpt
+++ b/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption.phpt
diff --git a/src/tests/encrypt_regexp_cookies_invalid_decryption2.phpt b/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption2.phpt
index e75e036..e75e036 100644
--- a/src/tests/encrypt_regexp_cookies_invalid_decryption2.phpt
+++ b/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption2.phpt
diff --git a/src/tests/encrypt_regexp_cookies_invalid_decryption3.phpt b/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption3.phpt
index 28ffaad..28ffaad 100644
--- a/src/tests/encrypt_regexp_cookies_invalid_decryption3.phpt
+++ b/src/tests/cookies_encryption/encrypt_regexp_cookies_invalid_decryption3.phpt
diff --git a/src/tests/encryption_key_only.phpt b/src/tests/cookies_encryption/encryption_key_only.phpt
index bf5edb5..bf5edb5 100644
--- a/src/tests/encryption_key_only.phpt
+++ b/src/tests/cookies_encryption/encryption_key_only.phpt
diff --git a/src/tests/setcookie.phpt b/src/tests/cookies_encryption/setcookie.phpt
index ba1d1c1..ba1d1c1 100644
--- a/src/tests/setcookie.phpt
+++ b/src/tests/cookies_encryption/setcookie.phpt
diff --git a/src/tests/config/encrypt_cookies_no_env.ini b/src/tests/cookies_encryption_warning/config/encrypt_cookies_no_env.ini
index 845bd02..845bd02 100644
--- a/src/tests/config/encrypt_cookies_no_env.ini
+++ b/src/tests/cookies_encryption_warning/config/encrypt_cookies_no_env.ini
diff --git a/src/tests/config/encrypt_cookies_no_key.ini b/src/tests/cookies_encryption_warning/config/encrypt_cookies_no_key.ini
index a585e12..a585e12 100644
--- a/src/tests/config/encrypt_cookies_no_key.ini
+++ b/src/tests/cookies_encryption_warning/config/encrypt_cookies_no_key.ini
diff --git a/src/tests/config/encrypt_regexp_cookies_no_env.ini b/src/tests/cookies_encryption_warning/config/encrypt_regexp_cookies_no_env.ini
index 0e1fa30..0e1fa30 100644
--- a/src/tests/config/encrypt_regexp_cookies_no_env.ini
+++ b/src/tests/cookies_encryption_warning/config/encrypt_regexp_cookies_no_env.ini
diff --git a/src/tests/config/encrypt_regexp_cookies_no_key.ini b/src/tests/cookies_encryption_warning/config/encrypt_regexp_cookies_no_key.ini
index 52427f4..52427f4 100644
--- a/src/tests/config/encrypt_regexp_cookies_no_key.ini
+++ b/src/tests/cookies_encryption_warning/config/encrypt_regexp_cookies_no_key.ini
diff --git a/src/tests/encrypt_cookies_no_env.phpt b/src/tests/cookies_encryption_warning/encrypt_cookies_no_env.phpt
index d9d9138..d9d9138 100644
--- a/src/tests/encrypt_cookies_no_env.phpt
+++ b/src/tests/cookies_encryption_warning/encrypt_cookies_no_env.phpt
diff --git a/src/tests/encrypt_cookies_no_key.phpt b/src/tests/cookies_encryption_warning/encrypt_cookies_no_key.phpt
index 3eb726e..3eb726e 100644
--- a/src/tests/encrypt_cookies_no_key.phpt
+++ b/src/tests/cookies_encryption_warning/encrypt_cookies_no_key.phpt
diff --git a/src/tests/encrypt_regexp_cookies_no_env.phpt b/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_env.phpt
index 0c0dea5..0c0dea5 100644
--- a/src/tests/encrypt_regexp_cookies_no_env.phpt
+++ b/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_env.phpt
diff --git a/src/tests/encrypt_regexp_cookies_no_key.phpt b/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_key.phpt
index 1877dd6..1877dd6 100644
--- a/src/tests/encrypt_regexp_cookies_no_key.phpt
+++ b/src/tests/cookies_encryption_warning/encrypt_regexp_cookies_no_key.phpt
diff --git a/src/tests/config/config_disable_writable.ini b/src/tests/deny_writable/config/config_disable_writable.ini
index 9f90601..9f90601 100644
--- a/src/tests/config/config_disable_writable.ini
+++ b/src/tests/deny_writable/config/config_disable_writable.ini
diff --git a/src/tests/config/config_disable_writable_disabled.ini b/src/tests/deny_writable/config/config_disable_writable_disabled.ini
index 6a33437..6a33437 100644
--- a/src/tests/config/config_disable_writable_disabled.ini
+++ b/src/tests/deny_writable/config/config_disable_writable_disabled.ini
diff --git a/src/tests/config/config_disable_writable_simulation.ini b/src/tests/deny_writable/config/config_disable_writable_simulation.ini
index 52a43ba..52a43ba 100644
--- a/src/tests/config/config_disable_writable_simulation.ini
+++ b/src/tests/deny_writable/config/config_disable_writable_simulation.ini
diff --git a/src/tests/config/dump_deny_writable_execution.ini b/src/tests/deny_writable/config/dump_deny_writable_execution.ini
index c49f893..c49f893 100644
--- a/src/tests/config/dump_deny_writable_execution.ini
+++ b/src/tests/deny_writable/config/dump_deny_writable_execution.ini
diff --git a/src/tests/deny_writable_execution.phpt b/src/tests/deny_writable/deny_writable_execution.phpt
index 916328e..916328e 100644
--- a/src/tests/deny_writable_execution.phpt
+++ b/src/tests/deny_writable/deny_writable_execution.phpt
diff --git a/src/tests/deny_writable_execution_disabled.phpt b/src/tests/deny_writable/deny_writable_execution_disabled.phpt
index dd01f01..dd01f01 100644
--- a/src/tests/deny_writable_execution_disabled.phpt
+++ b/src/tests/deny_writable/deny_writable_execution_disabled.phpt
diff --git a/src/tests/deny_writable_execution_simulation.phpt b/src/tests/deny_writable/deny_writable_execution_simulation.phpt
index 7f3546a..7fc0c63 100644
--- a/src/tests/deny_writable_execution_simulation.phpt
+++ b/src/tests/deny_writable/deny_writable_execution_simulation.phpt
@@ -41,10 +41,10 @@ unlink("$dir/non_writable_file.txt");
 unlink("$dir/writable_file.txt");
 ?>
 --EXPECTF--
-Warning: [snuffleupagus][readonly_exec] Attempted execution of a writable file (%a/src/tests/deny_writable_execution_simulation.php). in %a/src/tests/deny_writable_execution_simulation.php on line 2
+Warning: [snuffleupagus][readonly_exec] Attempted execution of a writable file (%a/deny_writable_execution_simulation.php). in %a/deny_writable_execution_simulation.php on line 2
 
-Warning: [snuffleupagus][readonly_exec] Attempted execution of a writable file (%a/src/tests/writable_file.txt). in %a/src/tests/deny_writable_execution_simulation.php on line 12
+Warning: [snuffleupagus][readonly_exec] Attempted execution of a writable file (%a/writable_file.txt). in %a/deny_writable_execution_simulation.php on line 12
 
-Warning: [snuffleupagus][readonly_exec] Attempted execution of a writable file (%a/src/tests/writable_file.txt). in %a/src/tests/writable_file.txt on line 1
+Warning: [snuffleupagus][readonly_exec] Attempted execution of a writable file (%a/writable_file.txt). in %a/writable_file.txt on line 1
 Code execution within a writable file.
 Code execution within a non-writable file.
diff --git a/src/tests/dump_deny_writable_execution.phpt b/src/tests/deny_writable/dump_deny_writable_execution.phpt
index c6dd6cd..c6dd6cd 100644
--- a/src/tests/dump_deny_writable_execution.phpt
+++ b/src/tests/deny_writable/dump_deny_writable_execution.phpt
diff --git a/src/tests/config/config_disabled_functions_callback_called_file_r.ini b/src/tests/disable_function/config/config_disabled_functions_callback_called_file_r.ini
index daaee36..daaee36 100644
--- a/src/tests/config/config_disabled_functions_callback_called_file_r.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_callback_called_file_r.ini
diff --git a/src/tests/config/config_disabled_functions_called_file_r.ini b/src/tests/disable_function/config/config_disabled_functions_called_file_r.ini
index 17b019a..17b019a 100644
--- a/src/tests/config/config_disabled_functions_called_file_r.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_called_file_r.ini
diff --git a/src/tests/config/config_disabled_functions_chain.ini b/src/tests/disable_function/config/config_disabled_functions_chain.ini
index d5d9b62..d5d9b62 100644
--- a/src/tests/config/config_disabled_functions_chain.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_chain.ini
diff --git a/src/tests/config/config_disabled_functions_chain_call_user_func.ini b/src/tests/disable_function/config/config_disabled_functions_chain_call_user_func.ini
index 4f7a629..4f7a629 100644
--- a/src/tests/config/config_disabled_functions_chain_call_user_func.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_chain_call_user_func.ini
diff --git a/src/tests/config/config_disabled_functions_chain_call_user_func_ret.ini b/src/tests/disable_function/config/config_disabled_functions_chain_call_user_func_ret.ini
index f003b7d..f003b7d 100644
--- a/src/tests/config/config_disabled_functions_chain_call_user_func_ret.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_chain_call_user_func_ret.ini
diff --git a/src/tests/disable_function/config/config_disabled_functions_eval_filename.ini b/src/tests/disable_function/config/config_disabled_functions_eval_filename.ini
new file mode 100644
index 0000000..6c593fc
--- /dev/null
+++ b/src/tests/disable_function/config/config_disabled_functions_eval_filename.ini
@@ -0,0 +1 @@
+sp.disable_function.function("eval").filename_r("^.*/disabled_functions_eval_filename.php$").drop();
diff --git a/src/tests/config/config_disabled_functions_eval_user_func.ini b/src/tests/disable_function/config/config_disabled_functions_eval_user_func.ini
index 4d0d370..4d0d370 100644
--- a/src/tests/config/config_disabled_functions_eval_user_func.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_eval_user_func.ini
diff --git a/src/tests/config/config_disabled_functions_filename_r.ini b/src/tests/disable_function/config/config_disabled_functions_filename_r.ini
index fe79608..fe79608 100644
--- a/src/tests/config/config_disabled_functions_filename_r.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_filename_r.ini
diff --git a/src/tests/config/config_disabled_functions_include.ini b/src/tests/disable_function/config/config_disabled_functions_include.ini
index cee0d86..cee0d86 100644
--- a/src/tests/config/config_disabled_functions_include.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_include.ini
diff --git a/src/tests/config/config_disabled_functions_local_var_array.ini b/src/tests/disable_function/config/config_disabled_functions_local_var_array.ini
index 15dd5a1..15dd5a1 100644
--- a/src/tests/config/config_disabled_functions_local_var_array.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_local_var_array.ini
diff --git a/src/tests/config/config_disabled_functions_local_var_array_key.ini b/src/tests/disable_function/config/config_disabled_functions_local_var_array_key.ini
index 75c840d..75c840d 100644
--- a/src/tests/config/config_disabled_functions_local_var_array_key.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_local_var_array_key.ini
diff --git a/src/tests/config/config_disabled_functions_method.ini b/src/tests/disable_function/config/config_disabled_functions_method.ini
index 8fbce65..8fbce65 100644
--- a/src/tests/config/config_disabled_functions_method.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_method.ini
diff --git a/src/tests/config/config_disabled_functions_name_r.ini b/src/tests/disable_function/config/config_disabled_functions_name_r.ini
index 167d6f0..167d6f0 100644
--- a/src/tests/config/config_disabled_functions_name_r.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_name_r.ini
diff --git a/src/tests/config/config_disabled_functions_name_regexp_type.ini b/src/tests/disable_function/config/config_disabled_functions_name_regexp_type.ini
index 38f9657..38f9657 100644
--- a/src/tests/config/config_disabled_functions_name_regexp_type.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_name_regexp_type.ini
diff --git a/src/tests/config/config_disabled_functions_name_type.ini b/src/tests/disable_function/config/config_disabled_functions_name_type.ini
index 25bdf98..25bdf98 100644
--- a/src/tests/config/config_disabled_functions_name_type.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_name_type.ini
diff --git a/src/tests/config/config_disabled_functions_namespace.ini b/src/tests/disable_function/config/config_disabled_functions_namespace.ini
index 2926611..2926611 100644
--- a/src/tests/config/config_disabled_functions_namespace.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_namespace.ini
diff --git a/src/tests/config/config_disabled_functions_nul_byte.ini b/src/tests/disable_function/config/config_disabled_functions_nul_byte.ini
index 9ead077..9ead077 100644
--- a/src/tests/config/config_disabled_functions_nul_byte.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_nul_byte.ini
diff --git a/src/tests/config/config_disabled_functions_param.ini b/src/tests/disable_function/config/config_disabled_functions_param.ini
index 87f1b3c..87f1b3c 100644
--- a/src/tests/config/config_disabled_functions_param.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param.ini
diff --git a/src/tests/config/config_disabled_functions_param_alias.ini b/src/tests/disable_function/config/config_disabled_functions_param_alias.ini
index 2f06244..2f06244 100644
--- a/src/tests/config/config_disabled_functions_param_alias.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_alias.ini
diff --git a/src/tests/config/config_disabled_functions_param_allow.ini b/src/tests/disable_function/config/config_disabled_functions_param_allow.ini
index 8e139e4..8e139e4 100644
--- a/src/tests/config/config_disabled_functions_param_allow.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_allow.ini
diff --git a/src/tests/config/config_disabled_functions_param_array.ini b/src/tests/disable_function/config/config_disabled_functions_param_array.ini
index f676d76..f676d76 100644
--- a/src/tests/config/config_disabled_functions_param_array.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_array.ini
diff --git a/src/tests/config/config_disabled_functions_param_int.ini b/src/tests/disable_function/config/config_disabled_functions_param_int.ini
index 1c93c2f..1c93c2f 100644
--- a/src/tests/config/config_disabled_functions_param_int.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_int.ini
diff --git a/src/tests/config/config_disabled_functions_param_r.ini b/src/tests/disable_function/config/config_disabled_functions_param_r.ini
index 09a59fe..09a59fe 100644
--- a/src/tests/config/config_disabled_functions_param_r.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_r.ini
diff --git a/src/tests/config/config_disabled_functions_param_r_array.ini b/src/tests/disable_function/config/config_disabled_functions_param_r_array.ini
index fcac71d..fcac71d 100644
--- a/src/tests/config/config_disabled_functions_param_r_array.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_r_array.ini
diff --git a/src/tests/config/config_disabled_functions_param_runtime.ini b/src/tests/disable_function/config/config_disabled_functions_param_runtime.ini
index e7a011f..e7a011f 100644
--- a/src/tests/config/config_disabled_functions_param_runtime.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_runtime.ini
diff --git a/src/tests/config/config_disabled_functions_param_str_representation.ini b/src/tests/disable_function/config/config_disabled_functions_param_str_representation.ini
index 13b3974..13b3974 100644
--- a/src/tests/config/config_disabled_functions_param_str_representation.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_param_str_representation.ini
diff --git a/src/tests/config/config_disabled_functions_require.ini b/src/tests/disable_function/config/config_disabled_functions_require.ini
index 63a4eb2..63a4eb2 100644
--- a/src/tests/config/config_disabled_functions_require.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_require.ini
diff --git a/src/tests/config/config_disabled_functions_require_allow.ini b/src/tests/disable_function/config/config_disabled_functions_require_allow.ini
index ee2bb67..ee2bb67 100644
--- a/src/tests/config/config_disabled_functions_require_allow.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_require_allow.ini
diff --git a/src/tests/config/config_disabled_functions_ret_allow.ini b/src/tests/disable_function/config/config_disabled_functions_ret_allow.ini
index a97e21d..a97e21d 100644
--- a/src/tests/config/config_disabled_functions_ret_allow.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_ret_allow.ini
diff --git a/src/tests/config/config_disabled_functions_ret_allow_value.ini b/src/tests/disable_function/config/config_disabled_functions_ret_allow_value.ini
index b5d3bdd..b5d3bdd 100644
--- a/src/tests/config/config_disabled_functions_ret_allow_value.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_ret_allow_value.ini
diff --git a/src/tests/config/config_disabled_functions_ret_right_hash.ini b/src/tests/disable_function/config/config_disabled_functions_ret_right_hash.ini
index af4fdd4..af4fdd4 100644
--- a/src/tests/config/config_disabled_functions_ret_right_hash.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_ret_right_hash.ini
diff --git a/src/tests/config/config_disabled_functions_ret_simulation.ini b/src/tests/disable_function/config/config_disabled_functions_ret_simulation.ini
index bd0af4e..bd0af4e 100644
--- a/src/tests/config/config_disabled_functions_ret_simulation.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_ret_simulation.ini
diff --git a/src/tests/config/config_disabled_functions_ret_user.ini b/src/tests/disable_function/config/config_disabled_functions_ret_user.ini
index d214376..d214376 100644
--- a/src/tests/config/config_disabled_functions_ret_user.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_ret_user.ini
diff --git a/src/tests/config/config_disabled_functions_right_hash.ini b/src/tests/disable_function/config/config_disabled_functions_right_hash.ini
index 4e9b88c..4e9b88c 100644
--- a/src/tests/config/config_disabled_functions_right_hash.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_right_hash.ini
diff --git a/src/tests/config/config_disabled_functions_variadic.ini b/src/tests/disable_function/config/config_disabled_functions_variadic.ini
index cd1028d..cd1028d 100644
--- a/src/tests/config/config_disabled_functions_variadic.ini
+++ b/src/tests/disable_function/config/config_disabled_functions_variadic.ini
diff --git a/src/tests/config/config_disabled_user_functions.ini b/src/tests/disable_function/config/config_disabled_user_functions.ini
index 16ae4cb..16ae4cb 100644
--- a/src/tests/config/config_disabled_user_functions.ini
+++ b/src/tests/disable_function/config/config_disabled_user_functions.ini
diff --git a/src/tests/config/config_noncore_function_hooking.ini b/src/tests/disable_function/config/config_noncore_function_hooking.ini
index 341cbf9..341cbf9 100644
--- a/src/tests/config/config_noncore_function_hooking.ini
+++ b/src/tests/disable_function/config/config_noncore_function_hooking.ini
diff --git a/src/tests/config/disabled_function_curl_verify_certs.ini b/src/tests/disable_function/config/disabled_function_curl_verify_certs.ini
index 133e024..133e024 100644
--- a/src/tests/config/disabled_function_curl_verify_certs.ini
+++ b/src/tests/disable_function/config/disabled_function_curl_verify_certs.ini
diff --git a/src/tests/config/disabled_function_echo.ini b/src/tests/disable_function/config/disabled_function_echo.ini
index 39bc5e3..39bc5e3 100644
--- a/src/tests/config/disabled_function_echo.ini
+++ b/src/tests/disable_function/config/disabled_function_echo.ini
diff --git a/src/tests/config/disabled_function_local_var.ini b/src/tests/disable_function/config/disabled_function_local_var.ini
index 3d553c0..3d553c0 100644
--- a/src/tests/config/disabled_function_local_var.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var.ini
diff --git a/src/tests/config/disabled_function_local_var_2.ini b/src/tests/disable_function/config/disabled_function_local_var_2.ini
index 6c0ae66..6c0ae66 100644
--- a/src/tests/config/disabled_function_local_var_2.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var_2.ini
diff --git a/src/tests/config/disabled_function_local_var_array_not_array.ini b/src/tests/disable_function/config/disabled_function_local_var_array_not_array.ini
index ea25d1f..ea25d1f 100644
--- a/src/tests/config/disabled_function_local_var_array_not_array.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var_array_not_array.ini
diff --git a/src/tests/config/disabled_function_local_var_const.ini b/src/tests/disable_function/config/disabled_function_local_var_const.ini
index 8450de5..8450de5 100644
--- a/src/tests/config/disabled_function_local_var_const.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var_const.ini
diff --git a/src/tests/config/disabled_function_local_var_obj.ini b/src/tests/disable_function/config/disabled_function_local_var_obj.ini
index df6b617..df6b617 100644
--- a/src/tests/config/disabled_function_local_var_obj.ini
+++ b/src/tests/disable_function/config/disabled_function_local_var_obj.ini
diff --git a/src/tests/config/disabled_function_param.ini b/src/tests/disable_function/config/disabled_function_param.ini
index 6dbae6b..6dbae6b 100644
--- a/src/tests/config/disabled_function_param.ini
+++ b/src/tests/disable_function/config/disabled_function_param.ini
diff --git a/src/tests/config/disabled_function_print.ini b/src/tests/disable_function/config/disabled_function_print.ini
index 22d957f..22d957f 100644
--- a/src/tests/config/disabled_function_print.ini
+++ b/src/tests/disable_function/config/disabled_function_print.ini
diff --git a/src/tests/config/disabled_function_super_global_var.ini b/src/tests/disable_function/config/disabled_function_super_global_var.ini
index 178a01a..178a01a 100644
--- a/src/tests/config/disabled_function_super_global_var.ini
+++ b/src/tests/disable_function/config/disabled_function_super_global_var.ini
diff --git a/src/tests/config/disabled_functions.ini b/src/tests/disable_function/config/disabled_functions.ini
index df7013f..df7013f 100644
--- a/src/tests/config/disabled_functions.ini
+++ b/src/tests/disable_function/config/disabled_functions.ini
diff --git a/src/tests/config/disabled_functions_broken_line.ini b/src/tests/disable_function/config/disabled_functions_broken_line.ini
index 01229c5..01229c5 100644
--- a/src/tests/config/disabled_functions_broken_line.ini
+++ b/src/tests/disable_function/config/disabled_functions_broken_line.ini
diff --git a/src/tests/disable_function/config/disabled_functions_cidr.ini b/src/tests/disable_function/config/disabled_functions_cidr.ini
new file mode 100644
index 0000000..f69ce07
--- /dev/null
+++ b/src/tests/disable_function/config/disabled_functions_cidr.ini
@@ -0,0 +1,9 @@
+sp.disable_function.function("system").drop().cidr("2001:ab9:a::123/64");
+sp.disable_function.function("system").drop().cidr("192.168.0.1/16");
+sp.disable_function.function("system").drop().cidr("127.0.0.1/8");
+sp.disable_function.function("printf").drop().cidr("10.0.0.1/8");
+sp.disable_function.function("strpos").drop().cidr("127.0.0.2/4");
+sp.disable_function.function("strpos").drop().cidr("::ffff:192.0.2.128/128");
+sp.disable_function.function("strpos").drop().cidr("2001:ab9:a::123/64");
+sp.disable_function.function("strpos").drop().cidr("2001:0db8:f000:f000:f000:ff00:0042:8329/124");
+sp.disable_function.function("printf").drop().cidr("2002:0db8:0000:0000:0000:ff00:0042:8329/24");
diff --git a/src/tests/config/disabled_functions_die.ini b/src/tests/disable_function/config/disabled_functions_die.ini
index 4f070b9..4f070b9 100644
--- a/src/tests/config/disabled_functions_die.ini
+++ b/src/tests/disable_function/config/disabled_functions_die.ini
diff --git a/src/tests/config/disabled_functions_drop_include.ini b/src/tests/disable_function/config/disabled_functions_drop_include.ini
index 0b10f65..0b10f65 100644
--- a/src/tests/config/disabled_functions_drop_include.ini
+++ b/src/tests/disable_function/config/disabled_functions_drop_include.ini
diff --git a/src/tests/config/disabled_functions_drop_include_simulation.ini b/src/tests/disable_function/config/disabled_functions_drop_include_simulation.ini
index 4064da1..4064da1 100644
--- a/src/tests/config/disabled_functions_drop_include_simulation.ini
+++ b/src/tests/disable_function/config/disabled_functions_drop_include_simulation.ini
diff --git a/src/tests/config/disabled_functions_eval.ini b/src/tests/disable_function/config/disabled_functions_eval.ini
index f761259..f761259 100644
--- a/src/tests/config/disabled_functions_eval.ini
+++ b/src/tests/disable_function/config/disabled_functions_eval.ini
diff --git a/src/tests/config/disabled_functions_eval_simulation.ini b/src/tests/disable_function/config/disabled_functions_eval_simulation.ini
index f1dc58c..f1dc58c 100644
--- a/src/tests/config/disabled_functions_eval_simulation.ini
+++ b/src/tests/disable_function/config/disabled_functions_eval_simulation.ini
diff --git a/src/tests/config/disabled_functions_exit.ini b/src/tests/disable_function/config/disabled_functions_exit.ini
index 905296e..905296e 100644
--- a/src/tests/config/disabled_functions_exit.ini
+++ b/src/tests/disable_function/config/disabled_functions_exit.ini
diff --git a/src/tests/config/disabled_functions_invalid_pos.ini b/src/tests/disable_function/config/disabled_functions_invalid_pos.ini
index 42988e4..42988e4 100644
--- a/src/tests/config/disabled_functions_invalid_pos.ini
+++ b/src/tests/disable_function/config/disabled_functions_invalid_pos.ini
diff --git a/src/tests/config/disabled_functions_line.ini b/src/tests/disable_function/config/disabled_functions_line.ini
index b00cab6..b00cab6 100644
--- a/src/tests/config/disabled_functions_line.ini
+++ b/src/tests/disable_function/config/disabled_functions_line.ini
diff --git a/src/tests/config/disabled_functions_mb.ini b/src/tests/disable_function/config/disabled_functions_mb.ini
index 36eae40..36eae40 100644
--- a/src/tests/config/disabled_functions_mb.ini
+++ b/src/tests/disable_function/config/disabled_functions_mb.ini
diff --git a/src/tests/config/disabled_functions_pos.ini b/src/tests/disable_function/config/disabled_functions_pos.ini
index 7f7c04d..7f7c04d 100644
--- a/src/tests/config/disabled_functions_pos.ini
+++ b/src/tests/disable_function/config/disabled_functions_pos.ini
diff --git a/src/tests/config/disabled_functions_regexp.ini b/src/tests/disable_function/config/disabled_functions_regexp.ini
index 0276039..0276039 100644
--- a/src/tests/config/disabled_functions_regexp.ini
+++ b/src/tests/disable_function/config/disabled_functions_regexp.ini
diff --git a/src/tests/config/disabled_functions_ret.ini b/src/tests/disable_function/config/disabled_functions_ret.ini
index 60cea82..60cea82 100644
--- a/src/tests/config/disabled_functions_ret.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret.ini
diff --git a/src/tests/config/disabled_functions_ret_type.ini b/src/tests/disable_function/config/disabled_functions_ret_type.ini
index bf88402..bf88402 100644
--- a/src/tests/config/disabled_functions_ret_type.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type.ini
diff --git a/src/tests/config/disabled_functions_ret_type_array.ini b/src/tests/disable_function/config/disabled_functions_ret_type_array.ini
index f72dd82..f72dd82 100644
--- a/src/tests/config/disabled_functions_ret_type_array.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_array.ini
diff --git a/src/tests/config/disabled_functions_ret_type_double.ini b/src/tests/disable_function/config/disabled_functions_ret_type_double.ini
index a5a6ce3..a5a6ce3 100644
--- a/src/tests/config/disabled_functions_ret_type_double.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_double.ini
diff --git a/src/tests/config/disabled_functions_ret_type_long.ini b/src/tests/disable_function/config/disabled_functions_ret_type_long.ini
index 03abf8a..03abf8a 100644
--- a/src/tests/config/disabled_functions_ret_type_long.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_long.ini
diff --git a/src/tests/config/disabled_functions_ret_type_null.ini b/src/tests/disable_function/config/disabled_functions_ret_type_null.ini
index 70c4d69..70c4d69 100644
--- a/src/tests/config/disabled_functions_ret_type_null.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_null.ini
diff --git a/src/tests/config/disabled_functions_ret_type_object.ini b/src/tests/disable_function/config/disabled_functions_ret_type_object.ini
index 8fe240b..8fe240b 100644
--- a/src/tests/config/disabled_functions_ret_type_object.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_object.ini
diff --git a/src/tests/config/disabled_functions_ret_type_resource.ini b/src/tests/disable_function/config/disabled_functions_ret_type_resource.ini
index a9c9acf..a9c9acf 100644
--- a/src/tests/config/disabled_functions_ret_type_resource.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_resource.ini
diff --git a/src/tests/config/disabled_functions_ret_type_str.ini b/src/tests/disable_function/config/disabled_functions_ret_type_str.ini
index 2d306b0..2d306b0 100644
--- a/src/tests/config/disabled_functions_ret_type_str.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_str.ini
diff --git a/src/tests/config/disabled_functions_ret_type_true.ini b/src/tests/disable_function/config/disabled_functions_ret_type_true.ini
index df5db0e..df5db0e 100644
--- a/src/tests/config/disabled_functions_ret_type_true.ini
+++ b/src/tests/disable_function/config/disabled_functions_ret_type_true.ini
diff --git a/src/tests/config/disabled_functions_retval.ini b/src/tests/disable_function/config/disabled_functions_retval.ini
index 25a99f0..25a99f0 100644
--- a/src/tests/config/disabled_functions_retval.ini
+++ b/src/tests/disable_function/config/disabled_functions_retval.ini
diff --git a/src/tests/config/disabled_functions_retval_dump.ini b/src/tests/disable_function/config/disabled_functions_retval_dump.ini
index 97df351..97df351 100644
--- a/src/tests/config/disabled_functions_retval_dump.ini
+++ b/src/tests/disable_function/config/disabled_functions_retval_dump.ini
diff --git a/src/tests/config/disabled_functions_retval_rx.ini b/src/tests/disable_function/config/disabled_functions_retval_rx.ini
index 2352941..2352941 100644
--- a/src/tests/config/disabled_functions_retval_rx.ini
+++ b/src/tests/disable_function/config/disabled_functions_retval_rx.ini
diff --git a/src/tests/config/disabled_functions_zero_cidr.ini b/src/tests/disable_function/config/disabled_functions_zero_cidr.ini
index e0bf2d6..e0bf2d6 100644
--- a/src/tests/config/disabled_functions_zero_cidr.ini
+++ b/src/tests/disable_function/config/disabled_functions_zero_cidr.ini
diff --git a/src/tests/disable_function/config/empty.ini b/src/tests/disable_function/config/empty.ini
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/tests/disable_function/config/empty.ini
diff --git a/src/tests/disabled_function_echo.phpt b/src/tests/disable_function/disabled_function_echo.phpt
index 21e2002..21e2002 100644
--- a/src/tests/disabled_function_echo.phpt
+++ b/src/tests/disable_function/disabled_function_echo.phpt
diff --git a/src/tests/disabled_function_echo_2.phpt b/src/tests/disable_function/disabled_function_echo_2.phpt
index 66cace3..66cace3 100644
--- a/src/tests/disabled_function_echo_2.phpt
+++ b/src/tests/disable_function/disabled_function_echo_2.phpt
diff --git a/src/tests/disabled_function_echo_local_var.phpt b/src/tests/disable_function/disabled_function_echo_local_var.phpt
index 300f38e..300f38e 100644
--- a/src/tests/disabled_function_echo_local_var.phpt
+++ b/src/tests/disable_function/disabled_function_echo_local_var.phpt
diff --git a/src/tests/disabled_function_ensure_client_valid_certs.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt
index 374ee42..513b650 100644
--- a/src/tests/disabled_function_ensure_client_valid_certs.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt
@@ -15,4 +15,4 @@ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, '0');
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/tests/disabled_function_ensure_client_valid_certs.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs.php on line %d
diff --git a/src/tests/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt
index 9696876..a854558 100644
--- a/src/tests/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt
@@ -14,4 +14,4 @@ curl_multi_setopt($mch, CURLOPT_SSL_VERIFYPEER, 0);
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/tests/disabled_function_ensure_client_valid_certs_curl_multi_setopt.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (64) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs_curl_multi_setopt.php on line %d
diff --git a/src/tests/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt
index 6d2153a..86f95d2 100644
--- a/src/tests/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt
@@ -16,4 +16,4 @@ curl_setopt_array($ch, $options);
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/tests/disabled_function_ensure_client_valid_certs_curl_setopt_array.php on line 5
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYPEER off.' in %s/disabled_function_ensure_client_valid_certs_curl_setopt_array.php on line 5
diff --git a/src/tests/disabled_function_ensure_server_valid_certs.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt
index 01a4406..8a50c97 100644
--- a/src/tests/disabled_function_ensure_server_valid_certs.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt
@@ -15,4 +15,4 @@ curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, '0');
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/tests/disabled_function_ensure_server_valid_certs.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs.php on line %d
diff --git a/src/tests/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt
index e5c090f..4513848 100644
--- a/src/tests/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt
@@ -14,4 +14,4 @@ curl_multi_setopt($mch, CURLOPT_SSL_VERIFYHOST, 0);
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/tests/disabled_function_ensure_server_valid_certs_curl_multi_setopt.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_multi_setopt', because its argument '$option' content (81) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs_curl_multi_setopt.php on line %d
diff --git a/src/tests/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt
index 1d4bcc2..c10d9b0 100644
--- a/src/tests/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt
@@ -16,4 +16,4 @@ curl_setopt_array($ch, $options);
 echo "1337";
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/tests/disabled_function_ensure_server_valid_certs_curl_setopt_array.php on line 5
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'curl_setopt_array', because its argument '$options' content (0) matched the rule 'Please don't turn CURLOPT_SSL_VERIFYHOST off.' in %s/disabled_function_ensure_server_valid_certs_curl_setopt_array.php on line 5
diff --git a/src/tests/disabled_function_local_var.phpt b/src/tests/disable_function/disabled_function_local_var.phpt
index 99b2b08..99b2b08 100644
--- a/src/tests/disabled_function_local_var.phpt
+++ b/src/tests/disable_function/disabled_function_local_var.phpt
diff --git a/src/tests/disabled_function_local_var_10.phpt b/src/tests/disable_function/disabled_function_local_var_10.phpt
index 4902972..4902972 100644
--- a/src/tests/disabled_function_local_var_10.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_10.phpt
diff --git a/src/tests/disabled_function_local_var_2.phpt b/src/tests/disable_function/disabled_function_local_var_2.phpt
index 5b21d07..5b21d07 100644
--- a/src/tests/disabled_function_local_var_2.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_2.phpt
diff --git a/src/tests/disabled_function_local_var_3.phpt b/src/tests/disable_function/disabled_function_local_var_3.phpt
index 597be1d..597be1d 100644
--- a/src/tests/disabled_function_local_var_3.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_3.phpt
diff --git a/src/tests/disabled_function_local_var_4.phpt b/src/tests/disable_function/disabled_function_local_var_4.phpt
index b441576..b441576 100644
--- a/src/tests/disabled_function_local_var_4.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_4.phpt
diff --git a/src/tests/disabled_function_local_var_5.phpt b/src/tests/disable_function/disabled_function_local_var_5.phpt
index 602e96e..602e96e 100644
--- a/src/tests/disabled_function_local_var_5.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_5.phpt
diff --git a/src/tests/disabled_function_local_var_6.phpt b/src/tests/disable_function/disabled_function_local_var_6.phpt
index 1866353..1866353 100644
--- a/src/tests/disabled_function_local_var_6.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_6.phpt
diff --git a/src/tests/disabled_function_local_var_7.phpt b/src/tests/disable_function/disabled_function_local_var_7.phpt
index e615a80..e615a80 100644
--- a/src/tests/disabled_function_local_var_7.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_7.phpt
diff --git a/src/tests/disabled_function_local_var_8.phpt b/src/tests/disable_function/disabled_function_local_var_8.phpt
index 1f1a0dc..1f1a0dc 100644
--- a/src/tests/disabled_function_local_var_8.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_8.phpt
diff --git a/src/tests/disabled_function_local_var_9.phpt b/src/tests/disable_function/disabled_function_local_var_9.phpt
index 458d878..458d878 100644
--- a/src/tests/disabled_function_local_var_9.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_9.phpt
diff --git a/src/tests/disabled_function_local_var_const.phpt b/src/tests/disable_function/disabled_function_local_var_const.phpt
index 8d9d58a..8d9d58a 100644
--- a/src/tests/disabled_function_local_var_const.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_const.phpt
diff --git a/src/tests/disabled_function_local_var_crash.phpt b/src/tests/disable_function/disabled_function_local_var_crash.phpt
index 8dec946..8dec946 100644
--- a/src/tests/disabled_function_local_var_crash.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_crash.phpt
diff --git a/src/tests/disabled_function_local_var_obj.phpt b/src/tests/disable_function/disabled_function_local_var_obj.phpt
index 29d57cc..29d57cc 100644
--- a/src/tests/disabled_function_local_var_obj.phpt
+++ b/src/tests/disable_function/disabled_function_local_var_obj.phpt
diff --git a/src/tests/disabled_function_param.phpt b/src/tests/disable_function/disabled_function_param.phpt
index 9b8b942..9b8b942 100644
--- a/src/tests/disabled_function_param.phpt
+++ b/src/tests/disable_function/disabled_function_param.phpt
diff --git a/src/tests/disabled_function_print.phpt b/src/tests/disable_function/disabled_function_print.phpt
index a8b10b4..a8b10b4 100644
--- a/src/tests/disabled_function_print.phpt
+++ b/src/tests/disable_function/disabled_function_print.phpt
diff --git a/src/tests/disabled_function_super_global_var.phpt b/src/tests/disable_function/disabled_function_super_global_var.phpt
index 771052a..d97194a 100644
--- a/src/tests/disabled_function_super_global_var.phpt
+++ b/src/tests/disable_function/disabled_function_super_global_var.phpt
@@ -18,4 +18,4 @@ test();
 --EXPECTF--
 4
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/src/tests/disabled_function_super_global_var.php on line 3
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'strlen' in %a/disabled_function_super_global_var.php on line 3
diff --git a/src/tests/disabled_functions.phpt b/src/tests/disable_function/disabled_functions.phpt
index 6e57dba..6e57dba 100644
--- a/src/tests/disabled_functions.phpt
+++ b/src/tests/disable_function/disabled_functions.phpt
diff --git a/src/tests/disabled_functions_callback_called_file_r.phpt b/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt
index 9c25f9d..9c25f9d 100644
--- a/src/tests/disabled_functions_callback_called_file_r.phpt
+++ b/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt
diff --git a/src/tests/disabled_functions_called_file_r.phpt b/src/tests/disable_function/disabled_functions_called_file_r.phpt
index b361dc8..b361dc8 100644
--- a/src/tests/disabled_functions_called_file_r.phpt
+++ b/src/tests/disable_function/disabled_functions_called_file_r.phpt
diff --git a/src/tests/disabled_functions_chain.phpt b/src/tests/disable_function/disabled_functions_chain.phpt
index 5aee085..5aee085 100644
--- a/src/tests/disabled_functions_chain.phpt
+++ b/src/tests/disable_function/disabled_functions_chain.phpt
diff --git a/src/tests/disabled_functions_chain_call_user_func.phpt b/src/tests/disable_function/disabled_functions_chain_call_user_func.phpt
index 90c1f32..90c1f32 100644
--- a/src/tests/disabled_functions_chain_call_user_func.phpt
+++ b/src/tests/disable_function/disabled_functions_chain_call_user_func.phpt
diff --git a/src/tests/disabled_functions_chain_call_user_func_ret.phpt b/src/tests/disable_function/disabled_functions_chain_call_user_func_ret.phpt
index d0ee389..6a4cca6 100644
--- a/src/tests/disabled_functions_chain_call_user_func_ret.phpt
+++ b/src/tests/disable_function/disabled_functions_chain_call_user_func_ret.phpt
@@ -28,7 +28,7 @@ not matching_one
 one
 two
 
-Warning: [snuffleupagus][disabled_function] Aborted execution on return of the function 'two', because the function returned 'matching_two', which matched a rule in %a/tests/disabled_functions_chain_call_user_func_ret.php on line %d
+Warning: [snuffleupagus][disabled_function] Aborted execution on return of the function 'two', because the function returned 'matching_two', which matched a rule in %a/disabled_functions_chain_call_user_func_ret.php on line %d
 matching_one
 one
 two
diff --git a/src/tests/disabled_functions_chain_not_matching.phpt b/src/tests/disable_function/disabled_functions_chain_not_matching.phpt
index 3a0400a..3a0400a 100644
--- a/src/tests/disabled_functions_chain_not_matching.phpt
+++ b/src/tests/disable_function/disabled_functions_chain_not_matching.phpt
diff --git a/src/tests/disabled_functions_cidr.phpt b/src/tests/disable_function/disabled_functions_cidr.phpt
index dcd4189..dcd4189 100644
--- a/src/tests/disabled_functions_cidr.phpt
+++ b/src/tests/disable_function/disabled_functions_cidr.phpt
diff --git a/src/tests/disabled_functions_cidr_6.phpt b/src/tests/disable_function/disabled_functions_cidr_6.phpt
index 17822cd..17822cd 100644
--- a/src/tests/disabled_functions_cidr_6.phpt
+++ b/src/tests/disable_function/disabled_functions_cidr_6.phpt
diff --git a/src/tests/disabled_functions_die.phpt b/src/tests/disable_function/disabled_functions_die.phpt
index bfabaee..bfabaee 100644
--- a/src/tests/disabled_functions_die.phpt
+++ b/src/tests/disable_function/disabled_functions_die.phpt
diff --git a/src/tests/disabled_functions_drop_include.phpt b/src/tests/disable_function/disabled_functions_drop_include.phpt
index e18dd73..e18dd73 100644
--- a/src/tests/disabled_functions_drop_include.phpt
+++ b/src/tests/disable_function/disabled_functions_drop_include.phpt
diff --git a/src/tests/disabled_functions_drop_include_simulation.phpt b/src/tests/disable_function/disabled_functions_drop_include_simulation.phpt
index 07c3e98..07c3e98 100644
--- a/src/tests/disabled_functions_drop_include_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_drop_include_simulation.phpt
diff --git a/src/tests/disabled_functions_eval.phpt b/src/tests/disable_function/disabled_functions_eval.phpt
index a5d1489..a5d1489 100644
--- a/src/tests/disabled_functions_eval.phpt
+++ b/src/tests/disable_function/disabled_functions_eval.phpt
diff --git a/src/tests/disabled_functions_eval_filename.phpt b/src/tests/disable_function/disabled_functions_eval_filename.phpt
index 4491e9e..4491e9e 100644
--- a/src/tests/disabled_functions_eval_filename.phpt
+++ b/src/tests/disable_function/disabled_functions_eval_filename.phpt
diff --git a/src/tests/disabled_functions_eval_simulation.phpt b/src/tests/disable_function/disabled_functions_eval_simulation.phpt
index 2df04a9..2df04a9 100644
--- a/src/tests/disabled_functions_eval_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_eval_simulation.phpt
diff --git a/src/tests/disabled_functions_eval_user.phpt b/src/tests/disable_function/disabled_functions_eval_user.phpt
index 30ba1d5..30ba1d5 100644
--- a/src/tests/disabled_functions_eval_user.phpt
+++ b/src/tests/disable_function/disabled_functions_eval_user.phpt
diff --git a/src/tests/disabled_functions_exit.phpt b/src/tests/disable_function/disabled_functions_exit.phpt
index b204fcd..b204fcd 100644
--- a/src/tests/disabled_functions_exit.phpt
+++ b/src/tests/disable_function/disabled_functions_exit.phpt
diff --git a/src/tests/disabled_functions_filename_r.phpt b/src/tests/disable_function/disabled_functions_filename_r.phpt
index 0eb5f7d..0eb5f7d 100644
--- a/src/tests/disabled_functions_filename_r.phpt
+++ b/src/tests/disable_function/disabled_functions_filename_r.phpt
diff --git a/src/tests/disabled_functions_include_once.phpt b/src/tests/disable_function/disabled_functions_include_once.phpt
index 26b7ecc..26b7ecc 100644
--- a/src/tests/disabled_functions_include_once.phpt
+++ b/src/tests/disable_function/disabled_functions_include_once.phpt
diff --git a/src/tests/disabled_functions_include_simulation.phpt b/src/tests/disable_function/disabled_functions_include_simulation.phpt
index 199e91a..199e91a 100644
--- a/src/tests/disabled_functions_include_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_include_simulation.phpt
diff --git a/src/tests/disabled_functions_local_var_array.phpt b/src/tests/disable_function/disabled_functions_local_var_array.phpt
index 2c55a6e..2c55a6e 100644
--- a/src/tests/disabled_functions_local_var_array.phpt
+++ b/src/tests/disable_function/disabled_functions_local_var_array.phpt
diff --git a/src/tests/disabled_functions_local_var_array_key.phpt b/src/tests/disable_function/disabled_functions_local_var_array_key.phpt
index 777611b..777611b 100644
--- a/src/tests/disabled_functions_local_var_array_key.phpt
+++ b/src/tests/disable_function/disabled_functions_local_var_array_key.phpt
diff --git a/src/tests/disabled_functions_local_var_array_not_array.phpt b/src/tests/disable_function/disabled_functions_local_var_array_not_array.phpt
index 54e8719..54e8719 100644
--- a/src/tests/disabled_functions_local_var_array_not_array.phpt
+++ b/src/tests/disable_function/disabled_functions_local_var_array_not_array.phpt
diff --git a/src/tests/disabled_functions_mb.phpt b/src/tests/disable_function/disabled_functions_mb.phpt
index a2fd99e..a2fd99e 100644
--- a/src/tests/disabled_functions_mb.phpt
+++ b/src/tests/disable_function/disabled_functions_mb.phpt
diff --git a/src/tests/disabled_functions_method.phpt b/src/tests/disable_function/disabled_functions_method.phpt
index 72e633e..72e633e 100644
--- a/src/tests/disabled_functions_method.phpt
+++ b/src/tests/disable_function/disabled_functions_method.phpt
diff --git a/src/tests/disabled_functions_name_r.phpt b/src/tests/disable_function/disabled_functions_name_r.phpt
index 1ecee14..1ecee14 100644
--- a/src/tests/disabled_functions_name_r.phpt
+++ b/src/tests/disable_function/disabled_functions_name_r.phpt
diff --git a/src/tests/disabled_functions_name_regexp_type.phpt b/src/tests/disable_function/disabled_functions_name_regexp_type.phpt
index 2ceadbf..2ceadbf 100644
--- a/src/tests/disabled_functions_name_regexp_type.phpt
+++ b/src/tests/disable_function/disabled_functions_name_regexp_type.phpt
diff --git a/src/tests/disabled_functions_name_type.phpt b/src/tests/disable_function/disabled_functions_name_type.phpt
index 2d14d12..2d14d12 100644
--- a/src/tests/disabled_functions_name_type.phpt
+++ b/src/tests/disable_function/disabled_functions_name_type.phpt
diff --git a/src/tests/disabled_functions_namespace.phpt b/src/tests/disable_function/disabled_functions_namespace.phpt
index 1acfce2..1acfce2 100644
--- a/src/tests/disabled_functions_namespace.phpt
+++ b/src/tests/disable_function/disabled_functions_namespace.phpt
diff --git a/src/tests/disabled_functions_noconf.phpt b/src/tests/disable_function/disabled_functions_noconf.phpt
index cb13413..cb13413 100644
--- a/src/tests/disabled_functions_noconf.phpt
+++ b/src/tests/disable_function/disabled_functions_noconf.phpt
diff --git a/src/tests/disabled_functions_nul_byte.phpt b/src/tests/disable_function/disabled_functions_nul_byte.phpt
index 984541d..984541d 100644
--- a/src/tests/disabled_functions_nul_byte.phpt
+++ b/src/tests/disable_function/disabled_functions_nul_byte.phpt
diff --git a/src/tests/disabled_functions_param.phpt b/src/tests/disable_function/disabled_functions_param.phpt
index fb6dcbb..fb6dcbb 100644
--- a/src/tests/disabled_functions_param.phpt
+++ b/src/tests/disable_function/disabled_functions_param.phpt
diff --git a/src/tests/disabled_functions_param_alias.phpt b/src/tests/disable_function/disabled_functions_param_alias.phpt
index 9c249d9..9c249d9 100644
--- a/src/tests/disabled_functions_param_alias.phpt
+++ b/src/tests/disable_function/disabled_functions_param_alias.phpt
diff --git a/src/tests/disabled_functions_param_allow.phpt b/src/tests/disable_function/disabled_functions_param_allow.phpt
index f570415..f570415 100644
--- a/src/tests/disabled_functions_param_allow.phpt
+++ b/src/tests/disable_function/disabled_functions_param_allow.phpt
diff --git a/src/tests/disabled_functions_param_array.phpt b/src/tests/disable_function/disabled_functions_param_array.phpt
index 37a02e0..37a02e0 100644
--- a/src/tests/disabled_functions_param_array.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array.phpt
diff --git a/src/tests/disabled_functions_param_array_deref.phpt b/src/tests/disable_function/disabled_functions_param_array_deref.phpt
index 3305965..3305965 100644
--- a/src/tests/disabled_functions_param_array_deref.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_deref.phpt
diff --git a/src/tests/disabled_functions_param_array_no_value.phpt b/src/tests/disable_function/disabled_functions_param_array_no_value.phpt
index dfb67a2..dfb67a2 100644
--- a/src/tests/disabled_functions_param_array_no_value.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_no_value.phpt
diff --git a/src/tests/disabled_functions_param_array_r.phpt b/src/tests/disable_function/disabled_functions_param_array_r.phpt
index 1773bbe..1773bbe 100644
--- a/src/tests/disabled_functions_param_array_r.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_r.phpt
diff --git a/src/tests/disabled_functions_param_array_r_keys.phpt b/src/tests/disable_function/disabled_functions_param_array_r_keys.phpt
index 0748e92..0748e92 100644
--- a/src/tests/disabled_functions_param_array_r_keys.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_r_keys.phpt
diff --git a/src/tests/disabled_functions_param_array_several_levels.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels.phpt
index cbe845b..cbe845b 100644
--- a/src/tests/disabled_functions_param_array_several_levels.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_several_levels.phpt
diff --git a/src/tests/disabled_functions_param_array_several_levels_int.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels_int.phpt
index d957acf..d957acf 100644
--- a/src/tests/disabled_functions_param_array_several_levels_int.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_several_levels_int.phpt
diff --git a/src/tests/disabled_functions_param_array_several_levels_keys.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys.phpt
index 59d27c0..59d27c0 100644
--- a/src/tests/disabled_functions_param_array_several_levels_keys.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys.phpt
diff --git a/src/tests/disabled_functions_param_array_several_levels_keys_int.phpt b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys_int.phpt
index 647c394..647c394 100644
--- a/src/tests/disabled_functions_param_array_several_levels_keys_int.phpt
+++ b/src/tests/disable_function/disabled_functions_param_array_several_levels_keys_int.phpt
diff --git a/src/tests/disabled_functions_param_broken_line.phpt b/src/tests/disable_function/disabled_functions_param_broken_line.phpt
index 4fc3c45..4fc3c45 100644
--- a/src/tests/disabled_functions_param_broken_line.phpt
+++ b/src/tests/disable_function/disabled_functions_param_broken_line.phpt
diff --git a/src/tests/disabled_functions_param_int.phpt b/src/tests/disable_function/disabled_functions_param_int.phpt
index e8b0a42..e8b0a42 100644
--- a/src/tests/disabled_functions_param_int.phpt
+++ b/src/tests/disable_function/disabled_functions_param_int.phpt
diff --git a/src/tests/disabled_functions_param_invalid_pos.phpt b/src/tests/disable_function/disabled_functions_param_invalid_pos.phpt
index c52443d..c52443d 100644
--- a/src/tests/disabled_functions_param_invalid_pos.phpt
+++ b/src/tests/disable_function/disabled_functions_param_invalid_pos.phpt
diff --git a/src/tests/disabled_functions_param_line.phpt b/src/tests/disable_function/disabled_functions_param_line.phpt
index 75bfedd..75bfedd 100644
--- a/src/tests/disabled_functions_param_line.phpt
+++ b/src/tests/disable_function/disabled_functions_param_line.phpt
diff --git a/src/tests/disabled_functions_param_pos.phpt b/src/tests/disable_function/disabled_functions_param_pos.phpt
index 9127929..348d34b 100644
--- a/src/tests/disabled_functions_param_pos.phpt
+++ b/src/tests/disable_function/disabled_functions_param_pos.phpt
@@ -11,4 +11,4 @@ system("id");
 --EXPECTF--
 Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1337th argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_param_pos.php on line 2
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (id) matched a rule in %a/tests/disabled_functions_param_pos.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (id) matched a rule in %a/disabled_functions_param_pos.php on line %d
diff --git a/src/tests/disabled_functions_param_pos2.phpt b/src/tests/disable_function/disabled_functions_param_pos2.phpt
index 87e18c0..87e18c0 100644
--- a/src/tests/disabled_functions_param_pos2.phpt
+++ b/src/tests/disable_function/disabled_functions_param_pos2.phpt
diff --git a/src/tests/disabled_functions_param_r.phpt b/src/tests/disable_function/disabled_functions_param_r.phpt
index 722f126..722f126 100644
--- a/src/tests/disabled_functions_param_r.phpt
+++ b/src/tests/disable_function/disabled_functions_param_r.phpt
diff --git a/src/tests/disabled_functions_param_str_representation.phpt b/src/tests/disable_function/disabled_functions_param_str_representation.phpt
index 7cbdc0f..7cbdc0f 100644
--- a/src/tests/disabled_functions_param_str_representation.phpt
+++ b/src/tests/disable_function/disabled_functions_param_str_representation.phpt
diff --git a/src/tests/disabled_functions_parse_class.phpt b/src/tests/disable_function/disabled_functions_parse_class.phpt
index af9ed88..af9ed88 100644
--- a/src/tests/disabled_functions_parse_class.phpt
+++ b/src/tests/disable_function/disabled_functions_parse_class.phpt
diff --git a/src/tests/disabled_functions_pos_type.phpt b/src/tests/disable_function/disabled_functions_pos_type.phpt
index 7739dfb..30aef8f 100644
--- a/src/tests/disabled_functions_pos_type.phpt
+++ b/src/tests/disable_function/disabled_functions_pos_type.phpt
@@ -9,8 +9,8 @@ sp.configuration_file={PWD}/config/disabled_functions_pos.ini
 system([123, 456]);
 ?>
 --EXPECTF--
-Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1337th argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/tests/disabled_functions_pos_type.php on line %d
+Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1337th argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_pos_type.php on line %d
 
-Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1st argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/tests/disabled_functions_pos_type.php on line %d
+Warning: [snuffleupagus][config] It seems that you wrote a rule filtering on the 1st argument of the function 'system', but it takes only 1 arguments. Matching on _all_ arguments instead. in %a/disabled_functions_pos_type.php on line %d
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (?) matched the rule '1' in %a/tests/disabled_functions_pos_type.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system', because its argument 'command' content (?) matched the rule '1' in %a/disabled_functions_pos_type.php on line %d
diff --git a/src/tests/disabled_functions_regexp_multiple.phpt b/src/tests/disable_function/disabled_functions_regexp_multiple.phpt
index 79f1fc7..79f1fc7 100644
--- a/src/tests/disabled_functions_regexp_multiple.phpt
+++ b/src/tests/disable_function/disabled_functions_regexp_multiple.phpt
diff --git a/src/tests/disabled_functions_register_shutdown_function.phpt b/src/tests/disable_function/disabled_functions_register_shutdown_function.phpt
index b6f1a10..b6f1a10 100644
--- a/src/tests/disabled_functions_register_shutdown_function.phpt
+++ b/src/tests/disable_function/disabled_functions_register_shutdown_function.phpt
diff --git a/src/tests/disabled_functions_register_tick_function.phpt b/src/tests/disable_function/disabled_functions_register_tick_function.phpt
index 6e3fb6f..6e3fb6f 100644
--- a/src/tests/disabled_functions_register_tick_function.phpt
+++ b/src/tests/disable_function/disabled_functions_register_tick_function.phpt
diff --git a/src/tests/disabled_functions_require.phpt b/src/tests/disable_function/disabled_functions_require.phpt
index 77dfbf5..77dfbf5 100644
--- a/src/tests/disabled_functions_require.phpt
+++ b/src/tests/disable_function/disabled_functions_require.phpt
diff --git a/src/tests/disabled_functions_require_allow.phpt b/src/tests/disable_function/disabled_functions_require_allow.phpt
index 1e3bc56..1e3bc56 100644
--- a/src/tests/disabled_functions_require_allow.phpt
+++ b/src/tests/disable_function/disabled_functions_require_allow.phpt
diff --git a/src/tests/disabled_functions_require_once.phpt b/src/tests/disable_function/disabled_functions_require_once.phpt
index 84e93cd..84e93cd 100644
--- a/src/tests/disabled_functions_require_once.phpt
+++ b/src/tests/disable_function/disabled_functions_require_once.phpt
diff --git a/src/tests/disabled_functions_require_simulation.phpt b/src/tests/disable_function/disabled_functions_require_simulation.phpt
index 6c97480..6c97480 100644
--- a/src/tests/disabled_functions_require_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_require_simulation.phpt
diff --git a/src/tests/disabled_functions_ret.phpt b/src/tests/disable_function/disabled_functions_ret.phpt
index 7c5d596..7c5d596 100644
--- a/src/tests/disabled_functions_ret.phpt
+++ b/src/tests/disable_function/disabled_functions_ret.phpt
diff --git a/src/tests/disabled_functions_ret2.phpt b/src/tests/disable_function/disabled_functions_ret2.phpt
index e32c585..e32c585 100644
--- a/src/tests/disabled_functions_ret2.phpt
+++ b/src/tests/disable_function/disabled_functions_ret2.phpt
diff --git a/src/tests/disabled_functions_ret3.phpt b/src/tests/disable_function/disabled_functions_ret3.phpt
index dc60c43..dc60c43 100644
--- a/src/tests/disabled_functions_ret3.phpt
+++ b/src/tests/disable_function/disabled_functions_ret3.phpt
diff --git a/src/tests/disabled_functions_ret_allow.phpt b/src/tests/disable_function/disabled_functions_ret_allow.phpt
index 1690995..1690995 100644
--- a/src/tests/disabled_functions_ret_allow.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_allow.phpt
diff --git a/src/tests/disabled_functions_ret_allow_value.phpt b/src/tests/disable_function/disabled_functions_ret_allow_value.phpt
index 881a006..881a006 100644
--- a/src/tests/disabled_functions_ret_allow_value.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_allow_value.phpt
diff --git a/src/tests/disabled_functions_ret_right_hash.phpt b/src/tests/disable_function/disabled_functions_ret_right_hash.phpt
index 1307172..1307172 100644
--- a/src/tests/disabled_functions_ret_right_hash.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_right_hash.phpt
diff --git a/src/tests/disabled_functions_ret_simulation.phpt b/src/tests/disable_function/disabled_functions_ret_simulation.phpt
index bd4cea0..bd4cea0 100644
--- a/src/tests/disabled_functions_ret_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_simulation.phpt
diff --git a/src/tests/disabled_functions_ret_type.phpt b/src/tests/disable_function/disabled_functions_ret_type.phpt
index 88401ca..88401ca 100644
--- a/src/tests/disabled_functions_ret_type.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type.phpt
diff --git a/src/tests/disabled_functions_ret_type_array.phpt b/src/tests/disable_function/disabled_functions_ret_type_array.phpt
index 3ceac9e..3ceac9e 100644
--- a/src/tests/disabled_functions_ret_type_array.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_array.phpt
diff --git a/src/tests/disabled_functions_ret_type_double.phpt b/src/tests/disable_function/disabled_functions_ret_type_double.phpt
index b0e895c..b0e895c 100644
--- a/src/tests/disabled_functions_ret_type_double.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_double.phpt
diff --git a/src/tests/disabled_functions_ret_type_long.phpt b/src/tests/disable_function/disabled_functions_ret_type_long.phpt
index c389533..c389533 100644
--- a/src/tests/disabled_functions_ret_type_long.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_long.phpt
diff --git a/src/tests/disabled_functions_ret_type_null.phpt b/src/tests/disable_function/disabled_functions_ret_type_null.phpt
index 894b3f5..894b3f5 100644
--- a/src/tests/disabled_functions_ret_type_null.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_null.phpt
diff --git a/src/tests/disabled_functions_ret_type_object.phpt b/src/tests/disable_function/disabled_functions_ret_type_object.phpt
index 171cd4b..171cd4b 100644
--- a/src/tests/disabled_functions_ret_type_object.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_object.phpt
diff --git a/src/tests/disabled_functions_ret_type_resource.phpt b/src/tests/disable_function/disabled_functions_ret_type_resource.phpt
index 4ae38b6..4ae38b6 100644
--- a/src/tests/disabled_functions_ret_type_resource.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_resource.phpt
diff --git a/src/tests/disabled_functions_ret_type_str.phpt b/src/tests/disable_function/disabled_functions_ret_type_str.phpt
index 356ff43..356ff43 100644
--- a/src/tests/disabled_functions_ret_type_str.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_str.phpt
diff --git a/src/tests/disabled_functions_ret_type_true.phpt b/src/tests/disable_function/disabled_functions_ret_type_true.phpt
index 8ddb1f7..8ddb1f7 100644
--- a/src/tests/disabled_functions_ret_type_true.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_type_true.phpt
diff --git a/src/tests/disabled_functions_ret_user.phpt b/src/tests/disable_function/disabled_functions_ret_user.phpt
index 89c1bce..8caa9bd 100644
--- a/src/tests/disabled_functions_ret_user.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_user.phpt
@@ -13,4 +13,4 @@ qwe();
 echo 1;
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/tests/disabled_functions_ret_user.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/disabled_functions_ret_user.php on line %d
diff --git a/src/tests/disabled_functions_ret_user_used.phpt b/src/tests/disable_function/disabled_functions_ret_user_used.phpt
index 7524b45..5857905 100644
--- a/src/tests/disabled_functions_ret_user_used.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_user_used.phpt
@@ -12,4 +12,4 @@ function qwe() {
 echo qwe();
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/tests/disabled_functions_ret_user_used.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'qwe', because the function returned 'asd', which matched a rule in %a/disabled_functions_ret_user_used.php on line %d
diff --git a/src/tests/disabled_functions_ret_val.phpt b/src/tests/disable_function/disabled_functions_ret_val.phpt
index 40a3be9..40a3be9 100644
--- a/src/tests/disabled_functions_ret_val.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_val.phpt
diff --git a/src/tests/disabled_functions_ret_val_dump.phpt b/src/tests/disable_function/disabled_functions_ret_val_dump.phpt
index 9fff77b..51e4f29 100644
--- a/src/tests/disabled_functions_ret_val_dump.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_val_dump.phpt
@@ -20,4 +20,4 @@ echo str_repeat("fufufu",1);
 --EXPECTF--
 fufu
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'str_repeat', because the function returned 'fufufu', which matched a rule in %a/src/tests/disabled_functions_ret_val_dump.php on line 3
\ No newline at end of file
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on return of the function 'str_repeat', because the function returned 'fufufu', which matched a rule in %a/disabled_functions_ret_val_dump.php on line 3
diff --git a/src/tests/disabled_functions_ret_val_rx.phpt b/src/tests/disable_function/disabled_functions_ret_val_rx.phpt
index ba06649..ba06649 100644
--- a/src/tests/disabled_functions_ret_val_rx.phpt
+++ b/src/tests/disable_function/disabled_functions_ret_val_rx.phpt
diff --git a/src/tests/disabled_functions_right_hash.phpt b/src/tests/disable_function/disabled_functions_right_hash.phpt
index f3c5fb3..f3c5fb3 100644
--- a/src/tests/disabled_functions_right_hash.phpt
+++ b/src/tests/disable_function/disabled_functions_right_hash.phpt
diff --git a/src/tests/disabled_functions_runtime.phpt b/src/tests/disable_function/disabled_functions_runtime.phpt
index 4ba1a53..4ba1a53 100644
--- a/src/tests/disabled_functions_runtime.phpt
+++ b/src/tests/disable_function/disabled_functions_runtime.phpt
diff --git a/src/tests/disabled_functions_upper.phpt b/src/tests/disable_function/disabled_functions_upper.phpt
index 8fa8ea3..8fa8ea3 100644
--- a/src/tests/disabled_functions_upper.phpt
+++ b/src/tests/disable_function/disabled_functions_upper.phpt
diff --git a/src/tests/disabled_functions_variadic.phpt b/src/tests/disable_function/disabled_functions_variadic.phpt
index 1e2a0dd..95d308e 100644
--- a/src/tests/disabled_functions_variadic.phpt
+++ b/src/tests/disable_function/disabled_functions_variadic.phpt
@@ -13,6 +13,6 @@ function foo(...$b) {
 echo foo(5, 4, 3, 2, 1);
 ?>
 --EXPECTF--
-Warning: [snuffleupagus][disable_function] Snuffleupagus doesn't support variadic functions yet, sorry. Check https://github.com/nbs-system/snuffleupagus/issues/164 for details. in %a/tests/disabled_functions_variadic.php on line %d
+Warning: [snuffleupagus][disable_function] Snuffleupagus doesn't support variadic functions yet, sorry. Check https://github.com/nbs-system/snuffleupagus/issues/164 for details. in %a/disabled_functions_variadic.php on line %d
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo' in %a/tests/disabled_functions_variadic.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'foo' in %a/disabled_functions_variadic.php on line %d
diff --git a/src/tests/disabled_functions_zero_cidr.phpt b/src/tests/disable_function/disabled_functions_zero_cidr.phpt
index 4e5f930..4e5f930 100644
--- a/src/tests/disabled_functions_zero_cidr.phpt
+++ b/src/tests/disable_function/disabled_functions_zero_cidr.phpt
diff --git a/src/tests/disabled_native_functions_indirect.phpt b/src/tests/disable_function/disabled_native_functions_indirect.phpt
index ba355d6..ba355d6 100644
--- a/src/tests/disabled_native_functions_indirect.phpt
+++ b/src/tests/disable_function/disabled_native_functions_indirect.phpt
diff --git a/src/tests/disabled_user_functions.phpt b/src/tests/disable_function/disabled_user_functions.phpt
index 9c17b79..9c17b79 100644
--- a/src/tests/disabled_user_functions.phpt
+++ b/src/tests/disable_function/disabled_user_functions.phpt
diff --git a/src/tests/disabled_user_functions_indirect.phpt b/src/tests/disable_function/disabled_user_functions_indirect.phpt
index f663ded..f663ded 100644
--- a/src/tests/disabled_user_functions_indirect.phpt
+++ b/src/tests/disable_function/disabled_user_functions_indirect.phpt
diff --git a/src/tests/noncore_function_hooking.phpt b/src/tests/disable_function/noncore_function_hooking.phpt
index 52bb114..52bb114 100644
--- a/src/tests/noncore_function_hooking.phpt
+++ b/src/tests/disable_function/noncore_function_hooking.phpt
diff --git a/src/tests/config/config_dump_segfault1.ini b/src/tests/dump_request/config/config_dump_segfault1.ini
index 1ea139a..1ea139a 100644
--- a/src/tests/config/config_dump_segfault1.ini
+++ b/src/tests/dump_request/config/config_dump_segfault1.ini
diff --git a/src/tests/config/dump_eval_blacklist.ini b/src/tests/dump_request/config/dump_eval_blacklist.ini
index 503143a..503143a 100644
--- a/src/tests/config/dump_eval_blacklist.ini
+++ b/src/tests/dump_request/config/dump_eval_blacklist.ini
diff --git a/src/tests/config/dump_eval_whitelist.ini b/src/tests/dump_request/config/dump_eval_whitelist.ini
index 2a6c909..2a6c909 100644
--- a/src/tests/config/dump_eval_whitelist.ini
+++ b/src/tests/dump_request/config/dump_eval_whitelist.ini
diff --git a/src/tests/config/dump_request.ini b/src/tests/dump_request/config/dump_request.ini
index 974601d..974601d 100644
--- a/src/tests/config/dump_request.ini
+++ b/src/tests/dump_request/config/dump_request.ini
diff --git a/src/tests/config/dump_request_invalid_folder.ini b/src/tests/dump_request/config/dump_request_invalid_folder.ini
index 60604d0..60604d0 100644
--- a/src/tests/config/dump_request_invalid_folder.ini
+++ b/src/tests/dump_request/config/dump_request_invalid_folder.ini
diff --git a/src/tests/config/dump_request_nonwriteable_folder.ini b/src/tests/dump_request/config/dump_request_nonwriteable_folder.ini
index 91991bb..91991bb 100644
--- a/src/tests/config/dump_request_nonwriteable_folder.ini
+++ b/src/tests/dump_request/config/dump_request_nonwriteable_folder.ini
diff --git a/src/tests/dump_eval_blacklist.phpt b/src/tests/dump_request/dump_eval_blacklist.phpt
index 3ae402c..a28f34b 100644
--- a/src/tests/dump_eval_blacklist.phpt
+++ b/src/tests/dump_request/dump_eval_blacklist.phpt
@@ -36,5 +36,5 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") {
 --EXPECTF--
 Outside of eval: 14
 
-Warning: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/src/tests/dump_eval_blacklist.php:1, logging it. in %a/src/tests/dump_eval_blacklist.php(9) : eval()'d code on line 1
-After eval: 4
\ No newline at end of file
+Warning: [snuffleupagus][eval] A call to strlen was tried in eval, in %a/dump_eval_blacklist.php:1, logging it. in %a/dump_eval_blacklist.php(9) : eval()'d code on line 1
+After eval: 4
diff --git a/src/tests/dump_eval_whitelist.phpt b/src/tests/dump_request/dump_eval_whitelist.phpt
index cf24dba..88bfcf6 100644
--- a/src/tests/dump_eval_whitelist.phpt
+++ b/src/tests/dump_request/dump_eval_whitelist.phpt
@@ -48,5 +48,5 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") {
 Outside of eval: my_fun: 1337 1337 1337
 After allowed eval: my_fun: 1234
 
-Warning: [snuffleupagus][Eval_whitelist] The function 'my_other_fun' isn't in the eval whitelist, logging its call. in %a/tests/dump_eval_whitelist.php on line 12
+Warning: [snuffleupagus][Eval_whitelist] The function 'my_other_fun' isn't in the eval whitelist, logging its call. in %a/dump_eval_whitelist.php on line 12
 After eval: my_other_fun: 1234
diff --git a/src/tests/dump_request.phpt b/src/tests/dump_request/dump_request.phpt
index a946c92..dae1dd7 100644
--- a/src/tests/dump_request.phpt
+++ b/src/tests/dump_request/dump_request.phpt
@@ -40,5 +40,5 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") {
 --EXPECTF--
 1
 
-Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/src/tests/dump_request.php on line 7
-1337
\ No newline at end of file
+Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request.php on line 7
+1337
diff --git a/src/tests/dump_request_invalid_folder.phpt b/src/tests/dump_request/dump_request_invalid_folder.phpt
index 0f45b41..3d1ce10 100644
--- a/src/tests/dump_request_invalid_folder.phpt
+++ b/src/tests/dump_request/dump_request_invalid_folder.phpt
@@ -21,6 +21,6 @@ echo "2\n";
 --EXPECTF--
 1
 
-Warning: [snuffleupagus][request_logging] Unable to create the folder '/root/NON_EXISTENT/FOLDER/PLEASE/' in %a/tests/dump_request_invalid_folder.php on line %d
+Warning: [snuffleupagus][request_logging] Unable to create the folder '/root/NON_EXISTENT/FOLDER/PLEASE/' in %a/dump_request_invalid_folder.php on line %d
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/tests/dump_request_invalid_folder.php on line %d
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request_invalid_folder.php on line %d
diff --git a/src/tests/dump_request_nonwriteable_folder.phpt b/src/tests/dump_request/dump_request_nonwriteable_folder.phpt
index 9d2b189..8052bc3 100644
--- a/src/tests/dump_request_nonwriteable_folder.phpt
+++ b/src/tests/dump_request/dump_request_nonwriteable_folder.phpt
@@ -33,6 +33,6 @@ echo "2\n";
 --EXPECTF--
 1
 
-Warning: [snuffleupagus][request_logging] Unable to open %a: Permission denied in %a/tests/dump_request_nonwriteable_folder.php on line %d
+Warning: [snuffleupagus][request_logging] Unable to open %a: Permission denied in %a/dump_request_nonwriteable_folder.php on line %d
 
-Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/tests/dump_request_nonwriteable_folder.php on line 3
+Fatal error: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request_nonwriteable_folder.php on line 3
diff --git a/src/tests/dump_request_too_big.phpt b/src/tests/dump_request/dump_request_too_big.phpt
index f236882..48cb1c5 100644
--- a/src/tests/dump_request_too_big.phpt
+++ b/src/tests/dump_request/dump_request_too_big.phpt
@@ -40,5 +40,5 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' get_c='aaaaaaaaaaaaaaa
 --EXPECTF--
 1
 
-Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/src/tests/dump_request_too_big.php on line 8
-1337
\ No newline at end of file
+Warning: [snuffleupagus][disabled_function] Aborted execution on call of the function 'system' in %a/dump_request_too_big.php on line 8
+1337
diff --git a/src/tests/dump_segfault1.phpt b/src/tests/dump_request/dump_segfault1.phpt
index bb35aa6..bb35aa6 100644
--- a/src/tests/dump_segfault1.phpt
+++ b/src/tests/dump_request/dump_segfault1.phpt
diff --git a/src/tests/config/eval_backlist.ini b/src/tests/eval_blacklist/config/eval_backlist.ini
index b181598..b181598 100644
--- a/src/tests/config/eval_backlist.ini
+++ b/src/tests/eval_blacklist/config/eval_backlist.ini
diff --git a/src/tests/config/eval_backlist_list.ini b/src/tests/eval_blacklist/config/eval_backlist_list.ini
index b395d03..b395d03 100644
--- a/src/tests/config/eval_backlist_list.ini
+++ b/src/tests/eval_blacklist/config/eval_backlist_list.ini
diff --git a/src/tests/config/eval_backlist_simulation.ini b/src/tests/eval_blacklist/config/eval_backlist_simulation.ini
index 2d8dc73..2d8dc73 100644
--- a/src/tests/config/eval_backlist_simulation.ini
+++ b/src/tests/eval_blacklist/config/eval_backlist_simulation.ini
diff --git a/src/tests/config/eval_whitelist.ini b/src/tests/eval_blacklist/config/eval_whitelist.ini
index 7a8f6ef..7a8f6ef 100644
--- a/src/tests/config/eval_whitelist.ini
+++ b/src/tests/eval_blacklist/config/eval_whitelist.ini
diff --git a/src/tests/config/eval_whitelist_blacklist.ini b/src/tests/eval_blacklist/config/eval_whitelist_blacklist.ini
index 4e7bc8e..4e7bc8e 100644
--- a/src/tests/config/eval_whitelist_blacklist.ini
+++ b/src/tests/eval_blacklist/config/eval_whitelist_blacklist.ini
diff --git a/src/tests/config/eval_whitelist_simulation.ini b/src/tests/eval_blacklist/config/eval_whitelist_simulation.ini
index 9d94db3..9d94db3 100644
--- a/src/tests/config/eval_whitelist_simulation.ini
+++ b/src/tests/eval_blacklist/config/eval_whitelist_simulation.ini
diff --git a/src/tests/eval_backlist.phpt b/src/tests/eval_blacklist/eval_backlist.phpt
index f24af96..f24af96 100644
--- a/src/tests/eval_backlist.phpt
+++ b/src/tests/eval_blacklist/eval_backlist.phpt
diff --git a/src/tests/eval_backlist_call_user_func.phpt b/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt
index 47e8d71..47e8d71 100644
--- a/src/tests/eval_backlist_call_user_func.phpt
+++ b/src/tests/eval_blacklist/eval_backlist_call_user_func.phpt
diff --git a/src/tests/eval_backlist_chained.phpt b/src/tests/eval_blacklist/eval_backlist_chained.phpt
index 2360e06..2360e06 100644
--- a/src/tests/eval_backlist_chained.phpt
+++ b/src/tests/eval_blacklist/eval_backlist_chained.phpt
diff --git a/src/tests/eval_backlist_list.phpt b/src/tests/eval_blacklist/eval_backlist_list.phpt
index 5bf0ea8..5bf0ea8 100644
--- a/src/tests/eval_backlist_list.phpt
+++ b/src/tests/eval_blacklist/eval_backlist_list.phpt
diff --git a/src/tests/eval_backlist_simulation.phpt b/src/tests/eval_blacklist/eval_backlist_simulation.phpt
index 3089c2d..3089c2d 100644
--- a/src/tests/eval_backlist_simulation.phpt
+++ b/src/tests/eval_blacklist/eval_backlist_simulation.phpt
diff --git a/src/tests/eval_backlist_whitelist.phpt b/src/tests/eval_blacklist/eval_backlist_whitelist.phpt
index e5650b2..e5650b2 100644
--- a/src/tests/eval_backlist_whitelist.phpt
+++ b/src/tests/eval_blacklist/eval_backlist_whitelist.phpt
diff --git a/src/tests/eval_backlist_whitelist_builtin.phpt b/src/tests/eval_blacklist/eval_backlist_whitelist_builtin.phpt
index 2f8bc19..2f8bc19 100644
--- a/src/tests/eval_backlist_whitelist_builtin.phpt
+++ b/src/tests/eval_blacklist/eval_backlist_whitelist_builtin.phpt
diff --git a/src/tests/eval_whitelist.phpt b/src/tests/eval_blacklist/eval_whitelist.phpt
index a602d0d..a602d0d 100644
--- a/src/tests/eval_whitelist.phpt
+++ b/src/tests/eval_blacklist/eval_whitelist.phpt
diff --git a/src/tests/eval_whitelist_builtin.phpt b/src/tests/eval_blacklist/eval_whitelist_builtin.phpt
index 5ed383d..5ed383d 100644
--- a/src/tests/eval_whitelist_builtin.phpt
+++ b/src/tests/eval_blacklist/eval_whitelist_builtin.phpt
diff --git a/src/tests/eval_whitelist_include_then_user.phpt b/src/tests/eval_blacklist/eval_whitelist_include_then_user.phpt
index 5ff3bff..5ff3bff 100644
--- a/src/tests/eval_whitelist_include_then_user.phpt
+++ b/src/tests/eval_blacklist/eval_whitelist_include_then_user.phpt
diff --git a/src/tests/eval_whitelist_simulation.phpt b/src/tests/eval_blacklist/eval_whitelist_simulation.phpt
index c4a3efa..c4a3efa 100644
--- a/src/tests/eval_whitelist_simulation.phpt
+++ b/src/tests/eval_blacklist/eval_whitelist_simulation.phpt
diff --git a/src/tests/eval_whitelist_user_then_builtin.phpt b/src/tests/eval_blacklist/eval_whitelist_user_then_builtin.phpt
index dbc7d93..dbc7d93 100644
--- a/src/tests/eval_whitelist_user_then_builtin.phpt
+++ b/src/tests/eval_blacklist/eval_whitelist_user_then_builtin.phpt
diff --git a/src/tests/nested_eval_blacklist.phpt b/src/tests/eval_blacklist/nested_eval_blacklist.phpt
index 9671a65..9671a65 100644
--- a/src/tests/nested_eval_blacklist.phpt
+++ b/src/tests/eval_blacklist/nested_eval_blacklist.phpt
diff --git a/src/tests/nested_eval_blacklist2.phpt b/src/tests/eval_blacklist/nested_eval_blacklist2.phpt
index aee41db..aee41db 100644
--- a/src/tests/nested_eval_blacklist2.phpt
+++ b/src/tests/eval_blacklist/nested_eval_blacklist2.phpt
diff --git a/src/tests/config/global_strict.ini b/src/tests/global_strict/config/global_strict.ini
index 2bc2bdc..2bc2bdc 100644
--- a/src/tests/config/global_strict.ini
+++ b/src/tests/global_strict/config/global_strict.ini
diff --git a/src/tests/config/global_strict_disabled.ini b/src/tests/global_strict/config/global_strict_disabled.ini
index 2e68471..2e68471 100644
--- a/src/tests/config/global_strict_disabled.ini
+++ b/src/tests/global_strict/config/global_strict_disabled.ini
diff --git a/src/tests/global_strict.phpt b/src/tests/global_strict/global_strict.phpt
index e06721c..e06721c 100644
--- a/src/tests/global_strict.phpt
+++ b/src/tests/global_strict/global_strict.phpt
diff --git a/src/tests/global_strict_disabled.phpt b/src/tests/global_strict/global_strict_disabled.phpt
index ca3ddfa..ca3ddfa 100644
--- a/src/tests/global_strict_disabled.phpt
+++ b/src/tests/global_strict/global_strict_disabled.phpt
diff --git a/src/tests/config/config_rand_harden_disabled.ini b/src/tests/harden_rand/config/config_rand_harden_disabled.ini
index b9cd227..b9cd227 100644
--- a/src/tests/config/config_rand_harden_disabled.ini
+++ b/src/tests/harden_rand/config/config_rand_harden_disabled.ini
diff --git a/src/tests/config/harden_rand.ini b/src/tests/harden_rand/config/harden_rand.ini
index 89e19be..89e19be 100644
--- a/src/tests/config/harden_rand.ini
+++ b/src/tests/harden_rand/config/harden_rand.ini
diff --git a/src/tests/disabled_option.phpt b/src/tests/harden_rand/disable_handen_rand.phpt
index 70e1382..70e1382 100644
--- a/src/tests/disabled_option.phpt
+++ b/src/tests/harden_rand/disable_handen_rand.phpt
diff --git a/src/tests/harden_mt_rand.phpt b/src/tests/harden_rand/harden_mt_rand.phpt
index da1ac16..da1ac16 100644
--- a/src/tests/harden_mt_rand.phpt
+++ b/src/tests/harden_rand/harden_mt_rand.phpt
diff --git a/src/tests/harden_mt_rand_range.phpt b/src/tests/harden_rand/harden_mt_rand_range.phpt
index 0d5a5bf..0d5a5bf 100644
--- a/src/tests/harden_mt_rand_range.phpt
+++ b/src/tests/harden_rand/harden_mt_rand_range.phpt
diff --git a/src/tests/harden_rand.phpt b/src/tests/harden_rand/harden_rand.phpt
index 336f5a7..336f5a7 100644
--- a/src/tests/harden_rand.phpt
+++ b/src/tests/harden_rand/harden_rand.phpt
diff --git a/src/tests/harden_rand_noargs.phpt b/src/tests/harden_rand/harden_rand_noargs.phpt
index fdf8124..dc7d832 100644
--- a/src/tests/harden_rand_noargs.phpt
+++ b/src/tests/harden_rand/harden_rand_noargs.phpt
@@ -36,27 +36,27 @@ echo "Absolutely everything\n";
 echo 'Even with single quotes';
 ?>
 --EXPECTF--
-Warning: rand() expects exactly 2 parameters, 1 given in %s/tests/harden_rand_noargs.php on line %d
+Warning: rand() expects exactly 2 parameters, 1 given in %s/harden_rand_noargs.php on line %d
 
-Warning: mt_rand() expects exactly 2 parameters, 1 given in %s/tests/harden_rand_noargs.php on line %d
+Warning: mt_rand() expects exactly 2 parameters, 1 given in %s/harden_rand_noargs.php on line %d
 
-Warning: mt_rand(): max(1) is smaller than min(2) in %s/tests/harden_rand_noargs.php on line %d
+Warning: mt_rand(): max(1) is smaller than min(2) in %s/harden_rand_noargs.php on line %d
 
-Warning: rand() expects exactly 2 parameters, 3 given in %s/tests/harden_rand_noargs.php on line %d
+Warning: rand() expects exactly 2 parameters, 3 given in %s/harden_rand_noargs.php on line %d
 
-Warning: mt_rand() expects exactly 2 parameters, 3 given in %s/tests/harden_rand_noargs.php on line %d
+Warning: mt_rand() expects exactly 2 parameters, 3 given in %s/harden_rand_noargs.php on line %d
 
-Warning: rand() expects parameter 1 to be in%s, string given in %s/tests/harden_rand_noargs.php on line %d
+Warning: rand() expects parameter 1 to be in%s, string given in %s/harden_rand_noargs.php on line %d
 
-Warning: mt_rand() expects parameter 1 to be in%s, string given in %s/tests/harden_rand_noargs.php on line %d
+Warning: mt_rand() expects parameter 1 to be in%s, string given in %s/harden_rand_noargs.php on line %d
 
-Warning: rand() expects parameter 2 to be in%s, string given in %s/tests/harden_rand_noargs.php on line %d
+Warning: rand() expects parameter 2 to be in%s, string given in %s/harden_rand_noargs.php on line %d
 
-Warning: mt_rand() expects parameter 2 to be in%s, string given in %s/tests/harden_rand_noargs.php on line %d
+Warning: mt_rand() expects parameter 2 to be in%s, string given in %s/harden_rand_noargs.php on line %d
 
-Warning: rand() expects exactly 2 parameters, 3 given in %s/tests/harden_rand_noargs.php on line %d
+Warning: rand() expects exactly 2 parameters, 3 given in %s/harden_rand_noargs.php on line %d
 
-Warning: mt_rand() expects exactly 2 parameters, 3 given in %s/tests/harden_rand_noargs.php on line %d
+Warning: mt_rand() expects exactly 2 parameters, 3 given in %s/harden_rand_noargs.php on line %d
 Everything is fine
 Absolutely everything
 Even with single quotes
diff --git a/src/tests/phpinfo_presence.phpt b/src/tests/phpinfo_presence.phpt
index 35ed0ed..c1388ed 100644
--- a/src/tests/phpinfo_presence.phpt
+++ b/src/tests/phpinfo_presence.phpt
@@ -3,7 +3,7 @@ Unserialize fail
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
 --INI--
-sp.configuration_file={PWD}/config/config_serialize.ini
+sp.configuration_file={PWD}/../../config/default.rules
 --FILE--
 <?php 
 ob_start () ;
diff --git a/src/tests/config/config_crypt_session.ini b/src/tests/session_encryption/config/config_crypt_session.ini
index 14b0c2c..14b0c2c 100644
--- a/src/tests/config/config_crypt_session.ini
+++ b/src/tests/session_encryption/config/config_crypt_session.ini
diff --git a/src/tests/config/config_crypt_session_simul.ini b/src/tests/session_encryption/config/config_crypt_session_simul.ini
index fbd43eb..fbd43eb 100644
--- a/src/tests/config/config_crypt_session_simul.ini
+++ b/src/tests/session_encryption/config/config_crypt_session_simul.ini
diff --git a/src/tests/crypt_session_corrupted_session.phpt b/src/tests/session_encryption/crypt_session_corrupted_session.phpt
index 6ab6612..5853efd 100644
--- a/src/tests/crypt_session_corrupted_session.phpt
+++ b/src/tests/session_encryption/crypt_session_corrupted_session.phpt
@@ -27,4 +27,4 @@ session_start();
 var_dump($_SESSION);
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling in %s/tests/crypt_session_corrupted_session.php on line %s
+Fatal error: [snuffleupagus][cookie_encryption] Buffer underflow tentative detected in cookie encryption handling in %s/crypt_session_corrupted_session.php on line %s
diff --git a/src/tests/crypt_session_invalid.phpt b/src/tests/session_encryption/crypt_session_invalid.phpt
index 4b0f4d2..8a57149 100644
--- a/src/tests/crypt_session_invalid.phpt
+++ b/src/tests/session_encryption/crypt_session_invalid.phpt
@@ -21,4 +21,4 @@ session_start(); 			// Re start the session, It will read and decrypt the non em
 var_dump($_SESSION);            // Dump the session
 ?>
 --EXPECTF--
-Warning: [snuffleupagus][cookie_encryption] Something went wrong with the decryption of the session in %s/tests/crypt_session_invalid.php on line %d
+Warning: [snuffleupagus][cookie_encryption] Something went wrong with the decryption of the session in %s/crypt_session_invalid.php on line %d
diff --git a/src/tests/crypt_session_invalid_simul.phpt b/src/tests/session_encryption/crypt_session_invalid_simul.phpt
index 7bfefcb..7bfefcb 100644
--- a/src/tests/crypt_session_invalid_simul.phpt
+++ b/src/tests/session_encryption/crypt_session_invalid_simul.phpt
diff --git a/src/tests/crypt_session_read_uncrypt.phpt b/src/tests/session_encryption/crypt_session_read_uncrypt.phpt
index f15d8b6..f15d8b6 100644
--- a/src/tests/crypt_session_read_uncrypt.phpt
+++ b/src/tests/session_encryption/crypt_session_read_uncrypt.phpt
diff --git a/src/tests/crypt_session_valid.phpt b/src/tests/session_encryption/crypt_session_valid.phpt
index bf9fea0..bf9fea0 100644
--- a/src/tests/crypt_session_valid.phpt
+++ b/src/tests/session_encryption/crypt_session_valid.phpt
diff --git a/src/tests/crypt_session_valid_simul.phpt b/src/tests/session_encryption/crypt_session_valid_simul.phpt
index 28083cf..28083cf 100644
--- a/src/tests/crypt_session_valid_simul.phpt
+++ b/src/tests/session_encryption/crypt_session_valid_simul.phpt
diff --git a/src/tests/set_custom_session_handler.phpt b/src/tests/session_encryption/set_custom_session_handler.phpt
index 5b46fbc..5b46fbc 100644
--- a/src/tests/set_custom_session_handler.phpt
+++ b/src/tests/session_encryption/set_custom_session_handler.phpt
diff --git a/src/tests/set_custom_session_handler2.phpt b/src/tests/session_encryption/set_custom_session_handler2.phpt
index 18bc3f7..18bc3f7 100644
--- a/src/tests/set_custom_session_handler2.phpt
+++ b/src/tests/session_encryption/set_custom_session_handler2.phpt
diff --git a/src/tests/set_custom_session_handler_ini.phpt b/src/tests/session_encryption/set_custom_session_handler_ini.phpt
index 7ed56d6..7ed56d6 100644
--- a/src/tests/set_custom_session_handler_ini.phpt
+++ b/src/tests/session_encryption/set_custom_session_handler_ini.phpt
diff --git a/src/tests/config/sloppy_comparison.ini b/src/tests/sloppy_comparison/config/sloppy_comparison.ini
index ab2d32a..ab2d32a 100644
--- a/src/tests/config/sloppy_comparison.ini
+++ b/src/tests/sloppy_comparison/config/sloppy_comparison.ini
diff --git a/src/tests/sloppy_comparison.phpt b/src/tests/sloppy_comparison/sloppy_comparison.phpt
index da28e3d..da28e3d 100644
--- a/src/tests/sloppy_comparison.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison.phpt
diff --git a/src/tests/sloppy_comparison_array.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array.phpt
index 79f9ed6..79f9ed6 100644
--- a/src/tests/sloppy_comparison_array.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array.phpt
diff --git a/src/tests/sloppy_comparison_array_disabled.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array_disabled.phpt
index e8cd77b..e8cd77b 100644
--- a/src/tests/sloppy_comparison_array_disabled.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array_disabled.phpt
diff --git a/src/tests/sloppy_comparison_array_keys.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array_keys.phpt
index 934f3ba..934f3ba 100644
--- a/src/tests/sloppy_comparison_array_keys.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array_keys.phpt
diff --git a/src/tests/sloppy_comparison_array_keys_disabled.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array_keys_disabled.phpt
index 8841b4c..8841b4c 100644
--- a/src/tests/sloppy_comparison_array_keys_disabled.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array_keys_disabled.phpt
diff --git a/src/tests/sloppy_comparison_array_search.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array_search.phpt
index 60d11d1..60d11d1 100644
--- a/src/tests/sloppy_comparison_array_search.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array_search.phpt
diff --git a/src/tests/sloppy_comparison_array_search_disabled.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array_search_disabled.phpt
index bee3752..bee3752 100644
--- a/src/tests/sloppy_comparison_array_search_disabled.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array_search_disabled.phpt
diff --git a/src/tests/sloppy_comparison_array_search_keys.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array_search_keys.phpt
index 031708b..031708b 100644
--- a/src/tests/sloppy_comparison_array_search_keys.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array_search_keys.phpt
diff --git a/src/tests/sloppy_comparison_disable.phpt b/src/tests/sloppy_comparison/sloppy_comparison_disable.phpt
index e42c919..e42c919 100644
--- a/src/tests/sloppy_comparison_disable.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_disable.phpt
diff --git a/src/tests/config/config_stream_wrapper.ini b/src/tests/stream_wrapper/config/config_stream_wrapper.ini
index 0cd7f77..0cd7f77 100644
--- a/src/tests/config/config_stream_wrapper.ini
+++ b/src/tests/stream_wrapper/config/config_stream_wrapper.ini
diff --git a/src/tests/config/config_stream_wrapper_register.ini b/src/tests/stream_wrapper/config/config_stream_wrapper_register.ini
index ee273a1..ee273a1 100644
--- a/src/tests/config/config_stream_wrapper_register.ini
+++ b/src/tests/stream_wrapper/config/config_stream_wrapper_register.ini
diff --git a/src/tests/stream_wrapper.phpt b/src/tests/stream_wrapper/stream_wrapper.phpt
index efd4160..fdea50c 100644
--- a/src/tests/stream_wrapper.phpt
+++ b/src/tests/stream_wrapper/stream_wrapper.phpt
@@ -18,14 +18,14 @@ Warning: Unknown: Unable to find the wrapper "php" - did you forget to enable it
 
 Warning: Unknown: Unable to find the wrapper "php" - did you forget to enable it when you configured PHP? in Unknown on line 0
 
-Warning: file_get_contents(): Unable to find the wrapper "http" - did you forget to enable it when you configured PHP? in %a/tests/stream_wrapper.php on line %d
+Warning: file_get_contents(): Unable to find the wrapper "http" - did you forget to enable it when you configured PHP? in %a/stream_wrapper.php on line %d
 
 Warning: file_get_contents(): php_network_getaddresses: getaddrinfo failed: %s
 
 Warning: file_get_contents(https://qweqwezxc): failed to open stream: php_network_getaddresses: getaddrinfo failed: %s
 
-Warning: file_get_contents(ftp://qweqwezxc): failed to open stream: operation failed in %a/tests/stream_wrapper.php on line %d
+Warning: file_get_contents(ftp://qweqwezxc): failed to open stream: operation failed in %a/stream_wrapper.php on line %d
 
-Warning: file_get_contents(): Unable to find the wrapper "lelel" - did you forget to enable it when you configured PHP? in %a/tests/stream_wrapper.php on line %d
+Warning: file_get_contents(): Unable to find the wrapper "lelel" - did you forget to enable it when you configured PHP? in %a/stream_wrapper.php on line %d
 
-Warning: file_get_contents(lelel://qweqwezxc): failed to open stream: No such file or directory in %a/tests/stream_wrapper.php on line %d
+Warning: file_get_contents(lelel://qweqwezxc): failed to open stream: No such file or directory in %a/stream_wrapper.php on line %d
diff --git a/src/tests/stream_wrapper_register.phpt b/src/tests/stream_wrapper/stream_wrapper_register.phpt
index 31e53ea..39514e9 100644
--- a/src/tests/stream_wrapper_register.phpt
+++ b/src/tests/stream_wrapper/stream_wrapper_register.phpt
@@ -18,8 +18,8 @@ fopen("lelel://asdasd", "r");
 fopen("lolol://asdasd", "r");
 ?>
 --EXPECTF--
-Warning: fopen(): Unable to find the wrapper "lolol" - did you forget to enable it when you configured PHP? in %a/tests/stream_wrapper_register.php on line %d
+Warning: fopen(): Unable to find the wrapper "lolol" - did you forget to enable it when you configured PHP? in %a/stream_wrapper_register.php on line %d
 
-Warning: fopen(): file:// wrapper is disabled in the server configuration in %a/tests/stream_wrapper_register.php on line %d
+Warning: fopen(): file:// wrapper is disabled in the server configuration in %a/stream_wrapper_register.php on line %d
 
-Warning: fopen(lolol://asdasd): failed to open stream: no suitable wrapper could be found in %a/tests/stream_wrapper_register.php on line %d
+Warning: fopen(lolol://asdasd): failed to open stream: no suitable wrapper could be found in %a/stream_wrapper_register.php on line %d
diff --git a/src/tests/stream_wrapper_restore.phpt b/src/tests/stream_wrapper/stream_wrapper_restore.phpt
index c1bce3b..b4a29c8 100644
--- a/src/tests/stream_wrapper_restore.phpt
+++ b/src/tests/stream_wrapper/stream_wrapper_restore.phpt
@@ -10,8 +10,8 @@ stream_wrapper_restore("file");
 fopen("file://asdasd", "r");
 ?>
 --EXPECTF--
-Notice: stream_wrapper_restore(): file:// was never changed, nothing to restore in %a/tests/stream_wrapper_restore.php on line %d
+Notice: stream_wrapper_restore(): file:// was never changed, nothing to restore in %a/stream_wrapper_restore.php on line %d
 
-Warning: fopen(): Unable to find the wrapper "file" - did you forget to enable it when you configured PHP? in %a/tests/stream_wrapper_restore.php on line %d
+Warning: fopen(): Unable to find the wrapper "file" - did you forget to enable it when you configured PHP? in %a/stream_wrapper_restore.php on line %d
 
-Warning: fopen(file://asdasd): failed to open stream: No such file or directory in %a/tests/stream_wrapper_restore.php on line %d
+Warning: fopen(file://asdasd): failed to open stream: No such file or directory in %a/stream_wrapper_restore.php on line %d
diff --git a/src/tests/config/config_serialize.ini b/src/tests/unserialize/config/config_serialize.ini
index f2c1699..f2c1699 100644
--- a/src/tests/config/config_serialize.ini
+++ b/src/tests/unserialize/config/config_serialize.ini
diff --git a/src/tests/config/config_serialize_sim.ini b/src/tests/unserialize/config/config_serialize_sim.ini
index 7f015e0..7f015e0 100644
--- a/src/tests/config/config_serialize_sim.ini
+++ b/src/tests/unserialize/config/config_serialize_sim.ini
diff --git a/src/tests/config/dump_unserialize.ini b/src/tests/unserialize/config/dump_unserialize.ini
index 4352a3e..4352a3e 100644
--- a/src/tests/config/dump_unserialize.ini
+++ b/src/tests/unserialize/config/dump_unserialize.ini
diff --git a/src/tests/dump_unserialize.phpt b/src/tests/unserialize/dump_unserialize.phpt
index 592e9b0..4b54cbb 100644
--- a/src/tests/dump_unserialize.phpt
+++ b/src/tests/unserialize/dump_unserialize.phpt
@@ -36,4 +36,4 @@ if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") {
 --EXPECTF--
 1
 
-Fatal error: [snuffleupagus][unserialize] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/src/tests/dump_unserialize.php on line 8
\ No newline at end of file
+Fatal error: [snuffleupagus][unserialize] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/dump_unserialize.php on line 8
diff --git a/src/tests/serialize.phpt b/src/tests/unserialize/serialize.phpt
index e93dbaf..e93dbaf 100644
--- a/src/tests/serialize.phpt
+++ b/src/tests/unserialize/serialize.phpt
diff --git a/src/tests/unserialize.phpt b/src/tests/unserialize/unserialize.phpt
index b1db915..b1db915 100644
--- a/src/tests/unserialize.phpt
+++ b/src/tests/unserialize/unserialize.phpt
diff --git a/src/tests/unserialize_fail.phpt b/src/tests/unserialize/unserialize_fail.phpt
index c6411a5..c6411a5 100644
--- a/src/tests/unserialize_fail.phpt
+++ b/src/tests/unserialize/unserialize_fail.phpt
diff --git a/src/tests/unserialize_sim.phpt b/src/tests/unserialize/unserialize_sim.phpt
index 68f8172..d919af1 100644
--- a/src/tests/unserialize_sim.phpt
+++ b/src/tests/unserialize/unserialize_sim.phpt
@@ -14,5 +14,5 @@ var_dump(unserialize('s:1:"a";alyualskdufyhalkdjsfhalkjdhflaksjdfhlkasdhflkahdaw
 --EXPECTF--
 s:1:"a";650609b417904d0d9bbf1fc44a975d13ecdf6b02b715c1a06271fb3b673f25b1string(1) "a"
 
-Warning: [snuffleupagus][unserialize] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/src/tests/unserialize_sim.php on line 5
+Warning: [snuffleupagus][unserialize] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/unserialize_sim.php on line 5
 string(1) "a"
diff --git a/src/tests/unserialize_wrong_call.phpt b/src/tests/unserialize/unserialize_wrong_call.phpt
index c4c158c..729d020 100644
--- a/src/tests/unserialize_wrong_call.phpt
+++ b/src/tests/unserialize/unserialize_wrong_call.phpt
@@ -10,5 +10,5 @@ $a=serialize("a");
 var_dump(unserialize($a, "too", "many", "aaaaaaaarguments!"));
 ?>
 --EXPECTF--
-Warning: unserialize() expects at most 2 parameters, 4 given in %a/tests/unserialize_wrong_call.php on line %d
+Warning: unserialize() expects at most 2 parameters, 4 given in %a/unserialize_wrong_call.php on line %d
 bool(false)
diff --git a/src/tests/config/upload_validation.ini b/src/tests/upload_validation/config/upload_validation.ini
index 0646134..0646134 100644
--- a/src/tests/config/upload_validation.ini
+++ b/src/tests/upload_validation/config/upload_validation.ini
diff --git a/src/tests/config/upload_validation_invalid.ini b/src/tests/upload_validation/config/upload_validation_invalid.ini
index 7a638a1..7a638a1 100644
--- a/src/tests/config/upload_validation_invalid.ini
+++ b/src/tests/upload_validation/config/upload_validation_invalid.ini
diff --git a/src/tests/config/upload_validation_ko.ini b/src/tests/upload_validation/config/upload_validation_ko.ini
index b15977f..b15977f 100644
--- a/src/tests/config/upload_validation_ko.ini
+++ b/src/tests/upload_validation/config/upload_validation_ko.ini
diff --git a/src/tests/config/upload_validation_ko_simulation.ini b/src/tests/upload_validation/config/upload_validation_ko_simulation.ini
index da56439..da56439 100644
--- a/src/tests/config/upload_validation_ko_simulation.ini
+++ b/src/tests/upload_validation/config/upload_validation_ko_simulation.ini
diff --git a/src/tests/config/upload_validation_no_exist.ini b/src/tests/upload_validation/config/upload_validation_no_exist.ini
index 24f81a5..24f81a5 100644
--- a/src/tests/config/upload_validation_no_exist.ini
+++ b/src/tests/upload_validation/config/upload_validation_no_exist.ini
diff --git a/src/tests/config/upload_validation_non_exec.ini b/src/tests/upload_validation/config/upload_validation_non_exec.ini
index bdf0a57..bdf0a57 100644
--- a/src/tests/config/upload_validation_non_exec.ini
+++ b/src/tests/upload_validation/config/upload_validation_non_exec.ini
diff --git a/src/tests/config/upload_validation_ok.ini b/src/tests/upload_validation/config/upload_validation_ok.ini
index 5df8db8..5df8db8 100644
--- a/src/tests/config/upload_validation_ok.ini
+++ b/src/tests/upload_validation/config/upload_validation_ok.ini
diff --git a/src/tests/config/upload_validation_real.ini b/src/tests/upload_validation/config/upload_validation_real.ini
index 690e9bf..690e9bf 100644
--- a/src/tests/config/upload_validation_real.ini
+++ b/src/tests/upload_validation/config/upload_validation_real.ini
diff --git a/src/tests/upload_validation.phpt b/src/tests/upload_validation/upload_validation.phpt
index 1daebb6..1daebb6 100644
--- a/src/tests/upload_validation.phpt
+++ b/src/tests/upload_validation/upload_validation.phpt
diff --git a/src/tests/upload_validation_invalid.phpt b/src/tests/upload_validation/upload_validation_invalid.phpt
index 0dbdbbb..0dbdbbb 100644
--- a/src/tests/upload_validation_invalid.phpt
+++ b/src/tests/upload_validation/upload_validation_invalid.phpt
diff --git a/src/tests/upload_validation_ko.phpt b/src/tests/upload_validation/upload_validation_ko.phpt
index d632e60..d632e60 100644
--- a/src/tests/upload_validation_ko.phpt
+++ b/src/tests/upload_validation/upload_validation_ko.phpt
diff --git a/src/tests/upload_validation_ko_simulation.phpt b/src/tests/upload_validation/upload_validation_ko_simulation.phpt
index b47c405..b47c405 100644
--- a/src/tests/upload_validation_ko_simulation.phpt
+++ b/src/tests/upload_validation/upload_validation_ko_simulation.phpt
diff --git a/src/tests/upload_validation_no_exec.phpt b/src/tests/upload_validation/upload_validation_no_exec.phpt
index a6cde10..a6cde10 100644
--- a/src/tests/upload_validation_no_exec.phpt
+++ b/src/tests/upload_validation/upload_validation_no_exec.phpt
diff --git a/src/tests/upload_validation_nocrash.phpt b/src/tests/upload_validation/upload_validation_nocrash.phpt
index 6fa50d0..6fa50d0 100644
--- a/src/tests/upload_validation_nocrash.phpt
+++ b/src/tests/upload_validation/upload_validation_nocrash.phpt
diff --git a/src/tests/upload_validation_ok.phpt b/src/tests/upload_validation/upload_validation_ok.phpt
index f9b5015..f9b5015 100644
--- a/src/tests/upload_validation_ok.phpt
+++ b/src/tests/upload_validation/upload_validation_ok.phpt
diff --git a/src/tests/upload_validation_real.phpt b/src/tests/upload_validation/upload_validation_real.phpt
index a945c5f..a945c5f 100644
--- a/src/tests/upload_validation_real.phpt
+++ b/src/tests/upload_validation/upload_validation_real.phpt
diff --git a/src/tests/config/disable_xxe.ini b/src/tests/xxe/config/disable_xxe.ini
index bc9d1f2..bc9d1f2 100644
--- a/src/tests/config/disable_xxe.ini
+++ b/src/tests/xxe/config/disable_xxe.ini
diff --git a/src/tests/config/disable_xxe_disable.ini b/src/tests/xxe/config/disable_xxe_disable.ini
index bb1e432..bb1e432 100644
--- a/src/tests/config/disable_xxe_disable.ini
+++ b/src/tests/xxe/config/disable_xxe_disable.ini
diff --git a/src/tests/disable_xxe_dom.phpt b/src/tests/xxe/disable_xxe_dom.phpt
index e1459e3..e1459e3 100644
--- a/src/tests/disable_xxe_dom.phpt
+++ b/src/tests/xxe/disable_xxe_dom.phpt
diff --git a/src/tests/disable_xxe_dom_disabled.phpt b/src/tests/xxe/disable_xxe_dom_disabled.phpt
index a791ebc..a791ebc 100644
--- a/src/tests/disable_xxe_dom_disabled.phpt
+++ b/src/tests/xxe/disable_xxe_dom_disabled.phpt
diff --git a/src/tests/disable_xxe_simplexml.phpt b/src/tests/xxe/disable_xxe_simplexml.phpt
index 88396c0..88396c0 100644
--- a/src/tests/disable_xxe_simplexml.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml.phpt
diff --git a/src/tests/disable_xxe_simplexml_oop.phpt b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
index 43c4fbf..43c4fbf 100644
--- a/src/tests/disable_xxe_simplexml_oop.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
diff --git a/src/tests/disable_xxe_xml_parse.phpt b/src/tests/xxe/disable_xxe_xml_parse.phpt
index ca77729..ca77729 100644
--- a/src/tests/disable_xxe_xml_parse.phpt
+++ b/src/tests/xxe/disable_xxe_xml_parse.phpt