Refactor more, add scrape tests
Remove unnecessary test indirection