Design improvements to the Template\Template class.
Add missing Template\Name test.