Issue #51: incorporate changes from Issue #50, to get the FileSystem tests to pass