Merge "Fix volume backup tests throwing BadRequest"