* Add tests to cover more code
* Clean a bit info messages
* Fix typos