scrape specification refactor, unit test refactor