fix some test cases