Tweak scrape tests, add CHicago tests