Updated tests with new Matcher