Update tests and Readme