update user mailer and test
merge mailers test fix