EZP-20438 - Fixed Matcher unit tests