Update the README and tidy the test