Fixed testcase issues