More changes for CI/PHPUnit