Increasing code coverage

Covering more of the API