fixes to testcases