refactor builders to use matchers