Update test to match code.
Use underscore as a field-name separator rather than dashes to be consistent with other tools like kibana or Elasticsearch core itself