fix api issues to run tests on stage/dev
Merge pull request #351 from vaidik/api_fix_for_stage

fix api issues to run tests on stage/dev