Merge "Fix volume type test extra_specs"