get rid of clock_lo at end of step and fix failed tests
merge