Fixed up the test suite to work with composer version of phpunit