Merge pull request #554 from apenney/unit-test-changes

Unit test changes
Split out the template tests and rework both sets of tests.