Improve tests
Update README