Fix management of volumes in tests