Added functions and tests for stepping