make sure that we set the expire date if a date is adefault date is set
add unit test