TemplateEditor2 now passes all tests