82 Fix comments, decrease tests