More test cases pass