Merge "Fix test_flavor_extra_specs"