Fix broken tests after updating templates