Updated README and unit tests

Updated readme and unit tests to fit new functionality