Fix the testing issues.