Added some cukes to set reminder
cukes up to getting email for confirmation of match
fixed unit tests