Fixes with phpunit