Harden scraper and add test