Some additional unit test coverage