fix up tests for new template system