More test cases fixed