Fix the test issues.