Fix incorrect skipUnless statements in file tests
Merge branch 'issue_264' into 2.1