Updated README and fixed unit tests after refactor