Fix phpunit errors on master