Fixed failing cucumber specs