Reorganize scrape queueing for easier testing