Reworked unit tests to use new matcher