fix test cases after #15558 merge to master.