Refactored structure to test streaming and scraping differently