Fix also cucumber tests