More shortstep tests
Mehrotra in progress