Fix broken cucumber tests