refactored cucumber tests again