Add unit tests for some api calls
Add more testcases