Update README
Refactor tests