Start towards making scrapes configurable. Also moar unit tests