cleaned up phpunit.xml and tests
cleaned up phpunit.xml and tests