Merge "Add Snapshot data integrity test"