Merge "Add "delete the volume-attached server" tests"