Merge #10047: [tests] Remove unused variables and imports