Merge "Add tests to ensure snapshots across replicas"