Removed even more tests, updated phpunit.xml