Updated the test with all additional email templates, and corrected comments in the new system email template