API test fixes
Merge pull request #2757 from jitendrapurohit/API_Testfix

API test fixes