Split out the template tests and rework both sets of tests.
Merge pull request #556 from apenney/unit-test-changes

Split out the template tests and rework both sets of tests.