Fixed failing feature specs