Changed tests for templating to force more congruity to template method