Fixes for phpunit