More test case fixes.