Merge "Improve snapshot data integrity test"