Fix Cucumber step that handles command with option