Improved test converage
Made scrubber tooltip the default