Work on matcher unit tests