testcases updated / fixed