Moved tests to test; tidy phpunit.xml