JC: added expire_date as presence=>true. Spec passes.