Re-structure test suite
Add support for plain PHP config files
Add support for plain-php
Adjust constraints, loosen them a bit