Split template tests into logic groups, test for template without
tokens.
Merge pull request #1397 from tmcw/template-tests

Split template tests into logic groups, test for template without tokens.