updating to use matchers