Fix failing cucumber specs