fix the test cases on master