Fix phpunit issues