Code review fixes
More NSFileManager tests