Bundle Scrubber code and tests