Updated README and fixed tests

--