Refactored cucumber tests