Added more test coverage