Update phpunit.xml reference
Update composer library
Make the code to be more applicable