Updating display and equality tests to be eof-aware