Fix failing cucumber tests