Update notification mailer with new content and improve tests