Fix phpunit, and the tests that were failing