Fixing expect tests