More test case tweaks