Passing buf-id, and added test-snapshot-restore.