Fix a buch of shallow test failures.

Note: in test_fileinput.py, two tests are disabled until I figure out how
to replace these.