more test case fixes