Tests & fix for log option