Upgrading the test coverage by a lot, plus fix some minor issues and improve the readme a but.