Testing TableSaveFile for @SnapshotRestore
Added other changes for @SnapshotRestore