Clean up and re-organize Scraper specs
Add new specs and polish old ones; general cleanup