Merge "Fix class inheritance for volume_types tests"