Better test coverage, improved UI