testcases modified / fixed