distinguish templates and fix a test that broke by the change