Fix all test cases