Merge "Add snapshot deletion test"