Merge "Change order of server/volume in snapshot test"