More test case fixes