Task #8721: SW-280: processed review comment: added some tests for the scraper Location class. made some minor changes to the scraper module. Not going to do a full refactoring; I agree some methods in scraper.py are too big, but they are self contained and not part of a public API. So it's good enough for now.