Fix expect tests