Fix tests / Add comments