This gates the step behind an unleash flag and updates the existing tests so they pass with the new step added.