WIP stabilize cucumber tests