Fix bug with arrival watch type and test wtih file feed (as opposed to
an http feed)