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

please use `%r{}` to avoid toothpicks.