Added more test coverage for all basic use cases