Fix TemplateProvider tests due its changes.