v2.2(master) fix test cases by modification on master