Simplified version and rewrite tests.
Remove old tests, improve readme.