Fixing the test suite