More scraper refactoring, more tests. Metadata update not working.