(PUP-716) Fix up tests after FileSystem API change

One fixed test still failing on expectations