Readme changes and some test corrections