Update README.md, improve tests