Update emailtemplateservice to prevent failing tests