FS tests should not accumulate FS defines
Merge pull request #2939 from aidanhs/aphs-test-only-one-fs

Make tests of different filesystems actually test the different filesystems