Bug/116 expect and with