refactor Cucumber tests