Added more tests for the basic API to increase test coverage