Further updates to the file tests.

Also change the mode of test.sh to now be u+x
Merge pull request #6093 from risaacson/devel

Further updates to the file tests.