Fix a couple of file-test fails on Mac