fix all test cases