Updated tests and README.md