Fix Readme and update tests