Fix the test failures