Fix the test cases