Updated phpunit.xml and composer.json