Updated Scrape Services and test