Merge "Improvements in snapshot data integrity tests"