Readme edits, fixed tests