Refactor the tests
Update the README