Fix issues with phpunit