some test cases fixed