More unit test coverage