Improve coverage, close #9