Cleanup a bit StepTester