Fixed failing tests for osm downloader and more code cleanups.