Preparing for latest phpunit