Expanded matcher set, adding some tests for harness