Fix some test cases