Refactor validation matchers for maintainability