introduced Matcher interface
organized Matchers tests
replaced dynamic matchers with Matcher interface