Adds more tests and adapts the README