Refactoring fix cukes