fixed testcases problems