Tests + readme + little cleanup