Some more unit test coverage