Better test coverage and more