Updated unit tests
Updated README