Updated readme
Improve test coverage