Added NaiveTemplateMatcher and MultiTemplate tests