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