Rearrange step order in feature, define last step of scenario 2