Fix the failed test cases