Added StaticTemplateMatcher & tests