Better test coverage