Fixed failing tests. Updated README