Fixing the test suite...