Fix tests
Solve issue in TCFetchProductTemplate
Solve small issue