Improve coverage, close #8