bug fix with step controll and update test case