Merge "Template unit test fix"