Updated composer.json and phpunit.xml.dist