Organizing test matchers a bit