Update the scraper for the new schema and fix the scraper tests
Minor updates to the scraper script