Replaced changes in RemoteFilesystemTest with changes from main branch.