Tests and small fixes to the scrapers.