Make matching tests use new test graph type

No tests for edge-data matching yet, though.