Clean StepTester a bit more