Fix tests
Cleanup, readme