Improve test coverage, close #10