SOC-3472 | Notification Emails - Fix test failed and wrong email templates