Fix the other instances of test failures.