Merge "Enhance tests for flavor_extra_spec API"