Refactor cucumber test