diff --git a/test-files/io/OsmPbfReaderTest/OsmPbfPartialReaderMultipleBlobsTest4.osm b/test-files/io/OsmPbfReaderTest/OsmPbfPartialReaderMultipleBlobsTest4.osm
index 42e840e..46f055c 100644
--- a/test-files/io/OsmPbfReaderTest/OsmPbfPartialReaderMultipleBlobsTest4.osm
+++ b/test-files/io/OsmPbfReaderTest/OsmPbfPartialReaderMultipleBlobsTest4.osm
@@ -1,127 +1,191 @@
<?xml version="1.0" encoding="UTF-8"?>
-<osm version="0.6" generator="hootenanny" srs="GEOGCS["WGS 84", DATUM["WGS_1984", SPHEROID["WGS 84",6378137,298.257223563, AUTHORITY["EPSG","7030"]], TOWGS84[0,0,0,0,0,0,0], AUTHORITY["EPSG","6326"]], PRIMEM["Greenwich",0, AUTHORITY["EPSG","8901"]], UNIT["degree",0.0174532925199433, AUTHORITY["EPSG","9108"]], AUTHORITY["EPSG","4326"]]">
- <node visible="true" id="-85" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0" lat="38.8535165999999990" lon="-104.8992698000000132"/>
- <node visible="true" id="-86" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0" lat="38.8535688999999991" lon="-104.8990568000000110"/>
- <node visible="true" id="-87" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0" lat="38.8535508000000007" lon="-104.8988321000000070"/>
- <node visible="true" id="-88" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0" lat="38.8536193999999995" lon="-104.8987070000000017"/>
- <way visible="true" id="-21" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0">
- <nd ref="-76"/>
- <nd ref="-106"/>
- <nd ref="-107"/>
- <tag k="note" v="1"/>
- <tag k="bbox" v="-104.899712,38.8549321,-104.897905,38.8549614"/>
+<osm version="0.6" generator="hootenanny" srs="+epsg:4326">
+ <bounds minlat="0" minlon="0" maxlat="0" maxlon="0"/>
+ <way visible="true" id="-15" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-72"/>
+ <nd ref="-89"/>
+ <nd ref="-90"/>
+ <nd ref="-91"/>
+ <nd ref="-92"/>
+ <nd ref="-93"/>
+ <nd ref="-94"/>
+ <nd ref="-77"/>
<tag k="highway" v="road"/>
+ <tag k="note" v="0"/>
+ <tag k="bbox" v="-104.902432,38.8532424,-104.896182,38.8549614"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-20" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0">
+ <way visible="true" id="-14" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-75"/>
- <nd ref="-100"/>
- <nd ref="-101"/>
- <tag k="note" v="3"/>
- <tag k="bbox" v="-104.90058,38.8542599,-104.900525,38.8549289"/>
+ <nd ref="-85"/>
+ <nd ref="-79"/>
+ <nd ref="-86"/>
+ <nd ref="-87"/>
+ <nd ref="-88"/>
+ <nd ref="-72"/>
<tag k="highway" v="road"/>
+ <tag k="note" v="0"/>
+ <tag k="bbox" v="-104.902432,38.8532424,-104.896182,38.8549614"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-19" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0">
- <nd ref="-114"/>
- <nd ref="-97"/>
- <nd ref="-98"/>
- <nd ref="-99"/>
+ <way visible="true" id="-13" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-73"/>
+ <nd ref="-83"/>
+ <nd ref="-84"/>
+ <nd ref="-75"/>
+ <tag k="highway" v="road"/>
<tag k="note" v="0"/>
<tag k="bbox" v="-104.902432,38.8532424,-104.896182,38.8549614"/>
- <tag k="highway" v="road"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-18" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0">
- <nd ref="-112"/>
- <nd ref="-93"/>
- <nd ref="-94"/>
- <nd ref="-95"/>
- <nd ref="-96"/>
- <nd ref="-114"/>
+ <way visible="true" id="-12" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-74"/>
+ <nd ref="-109"/>
+ <nd ref="-108"/>
+ <nd ref="-73"/>
+ <tag k="highway" v="road"/>
<tag k="note" v="0"/>
<tag k="bbox" v="-104.902432,38.8532424,-104.896182,38.8549614"/>
- <tag k="highway" v="road"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-17" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0">
- <nd ref="-113"/>
- <nd ref="-88"/>
- <nd ref="-89"/>
- <nd ref="-90"/>
- <nd ref="-91"/>
- <nd ref="-92"/>
+ <way visible="true" id="-11" timestamp="1970-01-01T00:00:00Z" version="1">
<nd ref="-112"/>
+ <nd ref="-111"/>
+ <nd ref="-110"/>
+ <nd ref="-74"/>
+ <tag k="highway" v="road"/>
<tag k="note" v="0"/>
<tag k="bbox" v="-104.902432,38.8532424,-104.896182,38.8549614"/>
+ <tag k="error:circular" v="15"/>
+ </way>
+ <way visible="true" id="-10" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-71"/>
+ <nd ref="-4"/>
+ <nd ref="-8"/>
+ <nd ref="-7"/>
+ <nd ref="-6"/>
+ <nd ref="-5"/>
<tag k="highway" v="road"/>
+ <tag k="bbox" v="-104.90242,38.8532676,-104.899703,38.8549614"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-16" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0">
- <nd ref="-108"/>
- <nd ref="-82"/>
- <nd ref="-83"/>
- <nd ref="-84"/>
- <nd ref="-85"/>
- <nd ref="-86"/>
- <nd ref="-87"/>
- <nd ref="-113"/>
- <tag k="note" v="0"/>
- <tag k="bbox" v="-104.902432,38.8532424,-104.896182,38.8549614"/>
+ <way visible="true" id="-9" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-69"/>
+ <nd ref="-50"/>
+ <nd ref="-9"/>
+ <nd ref="-71"/>
<tag k="highway" v="road"/>
+ <tag k="bbox" v="-104.90242,38.8532676,-104.899703,38.8549614"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-15" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0">
- <nd ref="-111"/>
- <nd ref="-78"/>
- <nd ref="-72"/>
- <nd ref="-79"/>
- <nd ref="-80"/>
- <nd ref="-81"/>
- <nd ref="-108"/>
- <tag k="note" v="0"/>
- <tag k="bbox" v="-104.902432,38.8532424,-104.896182,38.8549614"/>
+ <way visible="true" id="-8" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-70"/>
+ <nd ref="-55"/>
+ <nd ref="-54"/>
+ <nd ref="-53"/>
+ <nd ref="-52"/>
+ <nd ref="-51"/>
+ <nd ref="-69"/>
<tag k="highway" v="road"/>
+ <tag k="bbox" v="-104.90242,38.8532676,-104.899703,38.8549614"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-14" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0">
- <nd ref="-109"/>
- <nd ref="-76"/>
- <nd ref="-77"/>
- <nd ref="-111"/>
- <tag k="note" v="0"/>
- <tag k="bbox" v="-104.902432,38.8532424,-104.896182,38.8549614"/>
+ <way visible="true" id="-7" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-61"/>
+ <nd ref="-60"/>
+ <nd ref="-59"/>
+ <nd ref="-58"/>
+ <nd ref="-57"/>
+ <nd ref="-56"/>
+ <nd ref="-70"/>
<tag k="highway" v="road"/>
+ <tag k="bbox" v="-104.90242,38.8532676,-104.899703,38.8549614"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-13" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0">
- <nd ref="-110"/>
- <nd ref="-102"/>
- <nd ref="-101"/>
- <nd ref="-109"/>
- <tag k="note" v="0"/>
- <tag k="bbox" v="-104.902432,38.8532424,-104.896182,38.8549614"/>
+ <way visible="true" id="-6" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-68"/>
+ <nd ref="-44"/>
+ <nd ref="-45"/>
+ <nd ref="-46"/>
+ <nd ref="-47"/>
+ <nd ref="-48"/>
+ <nd ref="-49"/>
<tag k="highway" v="road"/>
+ <tag k="bbox" v="-104.899788,38.8532676,-104.896157,38.8549163"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-12" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0">
- <nd ref="-105"/>
- <nd ref="-104"/>
- <nd ref="-103"/>
- <nd ref="-110"/>
- <tag k="note" v="0"/>
- <tag k="bbox" v="-104.902432,38.8532424,-104.896182,38.8549614"/>
+ <way visible="true" id="-5" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-66"/>
+ <nd ref="-34"/>
+ <nd ref="-35"/>
+ <nd ref="-36"/>
+ <nd ref="-37"/>
+ <nd ref="-38"/>
+ <nd ref="-39"/>
+ <nd ref="-40"/>
+ <nd ref="-41"/>
+ <nd ref="-42"/>
+ <nd ref="-43"/>
+ <nd ref="-68"/>
<tag k="highway" v="road"/>
+ <tag k="bbox" v="-104.899788,38.8532676,-104.896157,38.8549163"/>
<tag k="error:circular" v="15"/>
</way>
- <way visible="true" id="-11" timestamp="1970-01-01T00:00:00Z" version="1" changeset="0">
- <nd ref="-73"/>
- <nd ref="-74"/>
- <nd ref="-75"/>
- <nd ref="-78"/>
- <tag k="note" v="2"/>
- <tag k="bbox" v="-104.901448,38.8540851,-104.899717,38.8542618"/>
+ <way visible="true" id="-4" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-67"/>
+ <nd ref="-20"/>
+ <nd ref="-21"/>
+ <nd ref="-22"/>
+ <nd ref="-23"/>
+ <nd ref="-24"/>
+ <nd ref="-25"/>
+ <nd ref="-26"/>
+ <nd ref="-27"/>
+ <nd ref="-28"/>
+ <nd ref="-29"/>
+ <nd ref="-30"/>
+ <nd ref="-31"/>
+ <nd ref="-32"/>
+ <nd ref="-33"/>
+ <nd ref="-66"/>
+ <tag k="highway" v="road"/>
+ <tag k="bbox" v="-104.899788,38.8532676,-104.896157,38.8549163"/>
+ <tag k="error:circular" v="15"/>
+ </way>
+ <way visible="true" id="-3" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-5"/>
+ <nd ref="-10"/>
+ <nd ref="-11"/>
+ <nd ref="-12"/>
+ <nd ref="-13"/>
+ <nd ref="-14"/>
+ <nd ref="-15"/>
+ <nd ref="-16"/>
+ <nd ref="-17"/>
+ <nd ref="-18"/>
+ <nd ref="-19"/>
+ <nd ref="-67"/>
+ <tag k="highway" v="road"/>
+ <tag k="bbox" v="-104.899788,38.8532676,-104.896157,38.8549163"/>
+ <tag k="error:circular" v="15"/>
+ </way>
+ <way visible="true" id="-2" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-9"/>
+ <nd ref="-65"/>
+ <nd ref="-62"/>
+ <nd ref="-63"/>
+ <nd ref="-64"/>
+ <tag k="highway" v="road"/>
+ <tag k="bbox" v="-104.89976,38.8549028,-104.897902,38.8549467"/>
+ <tag k="error:circular" v="15"/>
+ </way>
+ <way visible="true" id="-1" timestamp="1970-01-01T00:00:00Z" version="1">
+ <nd ref="-4"/>
+ <nd ref="-3"/>
+ <nd ref="-2"/>
+ <nd ref="-1"/>
<tag k="highway" v="road"/>
+ <tag k="bbox" v="-104.90143,38.85405,-104.89976,38.8543116"/>
<tag k="error:circular" v="15"/>
</way>
</osm>