fix-testcase-bugs