Merge pull request #6222 from jitendrapurohit/apitestfix