test case fixes