Merge "Add tests to cover flavor_service_profile"