More fixes to make main module tests (for Step.get_prompt()) pass.
resolved merge conflict