Rewrite tests
Add wanted in readme