Tests, changes to scraper.rb, etc