Fixed proper setup, execution, and teardown of step.