Changed tests to use matchers