design change, setup matchers as a class