Improve README and add tests