Updated Readme and tests