Update README and tests