New Matcher and improved unit test