Finally fixed the tests (for real now)