diff --git a/test-files/ops/CookieCutterOp/CookieCutterOpTest.osm b/test-files/ops/CookieCutterOp/CookieCutterOpTest.osm
index 053fe1e..3931cb9 100644
--- a/test-files/ops/CookieCutterOp/CookieCutterOpTest.osm
+++ b/test-files/ops/CookieCutterOp/CookieCutterOpTest.osm
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<osm version="0.6" generator="hootenanny" srs="+epsg:4326">
<bounds minlat="38.8845" minlon="-77.0551" maxlat="38.90310000000001" maxlon="-77.02809999999999"/>
- <node visible="true" id="-4592" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8920831020386473" lon="-77.0330000000000013"/>
- <node visible="true" id="-4591" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8959998281793204" lon="-77.0394588999800476"/>
- <node visible="true" id="-4590" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8910000000011351" lon="-77.0394760115566015"/>
- <node visible="true" id="-4589" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8910002418899694" lon="-77.0335942118013719"/>
- <node visible="true" id="-4588" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8960000000069357" lon="-77.0336483828507852"/>
- <node visible="true" id="-4587" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8935348665361715" lon="-77.0399999999999920"/>
- <node visible="true" id="-4586" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8943356300488858" lon="-77.0399999999999920"/>
- <node visible="true" id="-4585" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8953979814597162" lon="-77.0399999999999920"/>
- <node visible="true" id="-4584" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8921001555062418" lon="-77.0399999999999920"/>
- <node visible="true" id="-4583" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8960000000000434" lon="-77.0350910898258974"/>
- <node visible="true" id="-4582" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8960000000039443" lon="-77.0379042842426713"/>
- <node visible="true" id="-4581" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8960000000000719" lon="-77.0351619549682738"/>
- <node visible="true" id="-4580" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8955059537231236" lon="-77.0330033483685810"/>
+ <node visible="true" id="-4606" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8920831020386473" lon="-77.0330000000000013"/>
+ <node visible="true" id="-4605" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8959998281793204" lon="-77.0394588999800476"/>
+ <node visible="true" id="-4604" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8910000000011351" lon="-77.0394760115566015"/>
+ <node visible="true" id="-4603" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8910002418899694" lon="-77.0335942118013719"/>
+ <node visible="true" id="-4602" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8960000000069357" lon="-77.0336483828507852"/>
+ <node visible="true" id="-4601" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8935348665361715" lon="-77.0399999999999920"/>
+ <node visible="true" id="-4600" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8943356300488858" lon="-77.0399999999999920"/>
+ <node visible="true" id="-4599" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8953979814597162" lon="-77.0399999999999920"/>
+ <node visible="true" id="-4598" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8921001555062418" lon="-77.0399999999999920"/>
+ <node visible="true" id="-4597" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8960000000000434" lon="-77.0350910898258974"/>
+ <node visible="true" id="-4596" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8960000000039443" lon="-77.0379042842426713"/>
+ <node visible="true" id="-4595" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8960000000000719" lon="-77.0351619549682738"/>
+ <node visible="true" id="-4594" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8955059537231236" lon="-77.0330033483685810"/>
<node visible="true" id="-4565" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8924649749583153" lon="-77.0529468792894363"/>
<node visible="true" id="-4564" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8925094484659937" lon="-77.0531718073631282"/>
<node visible="true" id="-4563" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8940808912438669" lon="-77.0532198850892769"/>
@@ -4329,19 +4329,19 @@
<node visible="true" id="-3" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8920900000000032" lon="-77.0336530000000010"/>
<node visible="true" id="-2" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8920860000000275" lon="-77.0334379999999896"/>
<node visible="true" id="-1" timestamp="1970-01-01T00:00:00Z" version="1" lat="38.8920839999999970" lon="-77.0332700000000017"/>
- <way visible="true" id="-496" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-497" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-2759"/>
<nd ref="-1435"/>
<nd ref="-1437"/>
<nd ref="-1439"/>
<nd ref="-1441"/>
- <nd ref="-4592"/>
+ <nd ref="-4606"/>
<tag k="highway" v="road"/>
<tag k="name" v="CONSTITUTION AVE NW"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-495" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-4591"/>
+ <way visible="true" id="-496" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-4605"/>
<nd ref="-3700"/>
<nd ref="-3701"/>
<nd ref="-3702"/>
@@ -4349,18 +4349,18 @@
<tag k="name" v="17TH ST NW"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-494" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-495" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-3929"/>
<nd ref="-3930"/>
<nd ref="-3931"/>
<nd ref="-3932"/>
<nd ref="-3934"/>
- <nd ref="-4590"/>
+ <nd ref="-4604"/>
<tag k="highway" v="road"/>
<tag k="name" v="17TH ST NW"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-493" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-494" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-1279"/>
<nd ref="-2426"/>
<nd ref="-2427"/>
@@ -4378,21 +4378,21 @@
<nd ref="-2439"/>
<nd ref="-2440"/>
<nd ref="-2442"/>
- <nd ref="-4589"/>
+ <nd ref="-4603"/>
<tag k="highway" v="road"/>
<tag k="name" v="15TH ST NW"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-492" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-4588"/>
+ <way visible="true" id="-493" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-4602"/>
<nd ref="-2476"/>
<nd ref="-2477"/>
<tag k="highway" v="road"/>
<tag k="name" v="15TH ST NW"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-491" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-4587"/>
+ <way visible="true" id="-492" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-4601"/>
<nd ref="-2906"/>
<nd ref="-2907"/>
<nd ref="-2908"/>
@@ -4401,8 +4401,8 @@
<tag k="name" v="C ST NW"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-490" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-4586"/>
+ <way visible="true" id="-491" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-4600"/>
<nd ref="-271"/>
<nd ref="-273"/>
<nd ref="-275"/>
@@ -4412,8 +4412,8 @@
<tag k="name" v="D ST NW"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-489" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-4585"/>
+ <way visible="true" id="-490" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-4599"/>
<nd ref="-3309"/>
<nd ref="-3310"/>
<nd ref="-3311"/>
@@ -4426,39 +4426,39 @@
<tag k="name" v="E ST NW"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-488" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-4584"/>
+ <way visible="true" id="-489" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-4598"/>
<nd ref="-280"/>
<nd ref="-281"/>
<tag k="highway" v="road"/>
<tag k="name" v="CONSTITUTION AVE NW"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-487" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-4583"/>
+ <way visible="true" id="-488" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-4597"/>
<nd ref="-2786"/>
<tag k="highway" v="road"/>
<tag k="name" v="EAST EXECUTIVE AVE NW"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-486" timestamp="1970-01-01T00:00:00Z" version="1">
- <nd ref="-4582"/>
+ <way visible="true" id="-487" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-4596"/>
<nd ref="-2817"/>
<nd ref="-2818"/>
<nd ref="-2819"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-485" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-486" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-2786"/>
<nd ref="-2787"/>
<nd ref="-2788"/>
- <nd ref="-4581"/>
+ <nd ref="-4595"/>
<tag k="error:circular" v="5"/>
</way>
- <way visible="true" id="-484" timestamp="1970-01-01T00:00:00Z" version="1">
+ <way visible="true" id="-485" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-2760"/>
<nd ref="-456"/>
- <nd ref="-4580"/>
+ <nd ref="-4594"/>
<tag k="highway" v="road"/>
<tag k="name" v="PENNSYLVANIA AVE NW"/>
<tag k="error:circular" v="5"/>
@@ -11577,8 +11577,8 @@
<tag k="error:circular" v="5"/>
</way>
<relation visible="true" id="-1" timestamp="1970-01-01T00:00:00Z" version="1">
- <member type="way" ref="-485" role=""/>
<member type="way" ref="-486" role=""/>
+ <member type="way" ref="-487" role=""/>
<tag k="highway" v="road"/>
<tag k="name" v="SOUTH EXECUTIVE AVE NW"/>
<tag k="error:circular" v="5"/>