Improve option names and update cucumber tests