Tweak readme and add missing tests

Nothing 0.6 specific in here.