Fixed issue where before step was invoked on the wrong step class