Merge "Modify the response in test_snapshots_client"