Add TemplateCommands tests