Updated README and tests