Work on refactor of stepMultiple and its tests