Fix the template tests