Fix tests + add hrnlabel when requested to OSM output