fix in testcases