Refactor cucumber tests