More test cases fixes