Fix in testcases