More test case changes