Improve test coverage, Update version