Merge "Make sure test use the latest volume clients"