Working on Step util subclasses in refactored module (to pass tests).