More tests using mocks. Moved stepsRemaining check so it isn't
repeatedly tested.