Fix matching of edge data on circles and bare wires

Also: more tests!
Concrete matching test improvements