Mostly matchers, happier testing