Updated scraper test to be more DRY