Cleaning up scraper, adding tests