fix test cases after #15558 merge to master.
Merge pull request #15566 from kuldeepaggarwal/fix-build

fix test cases after #15558 merge to master.