more testcase fixes