Just a hair more unit test coverage