Updated email template and added test