README + tests fixed