Fixing up the failing spec for distributor changes, reworking a method to SharedHelper