Some more test cases fixed