T2DSingleTemplateMatcher fixed. Some tests added