diff --git a/mslverify/README.md b/mslverify/README.md
index 612561e..4e568bf 100644
--- a/mslverify/README.md
+++ b/mslverify/README.md
@@ -6,5 +6,5 @@
 
 The application first determines if MSL validation is disabled and if not,
 searches the D-Bus object namespace for any MeetsMSL interfaces and exits with
-non-zero status if any inventory items implementing the interface are found
-that do not meet the MSL.
+non-zero status if any inventory items implementing the interface are found that
+do not meet the MSL.
diff --git a/src/example/example.yaml b/src/example/example.yaml
index 68b54c1..ac53c0e 100644
--- a/src/example/example.yaml
+++ b/src/example/example.yaml
@@ -2,65 +2,63 @@
 
 - name: example path group
   description: >
-    'A path group is a named collection of D-Bus object
-    paths and associated metadata.  These collections
-    serve only to be referenced by other configuration
-    directives.
+      'A path group is a named collection of D-Bus object paths and associated
+      metadata.  These collections serve only to be referenced by other
+      configuration directives.
 
-    The metadata element has different uses depending
-    on the referencing directive.
+      The metadata element has different uses depending on the referencing
+      directive.
 
-    Within a single configuration file path group names
-    must be unique.  The same name can appear in multiple
-    configuration files; however, the referencing directive
-    will only search for the group in the same configuration
-    file.'
+      Within a single configuration file path group names must be unique.  The
+      same name can appear in multiple configuration files; however, the
+      referencing directive will only search for the group in the same
+      configuration file.'
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst1
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst2
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst3
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst1
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst2
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst3
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
 
 - name: example property group
   description: >
-    'Like path groups, a property group is a named collection
-    of D-Bus property names and associated metadata.
+      'Like path groups, a property group is a named collection of D-Bus
+      property names and associated metadata.
 
-    Properties in a group must all have the same D-Bus type signature
-    and must be explicitly declared.'
+      Properties in a group must all have the same D-Bus type signature and must
+      be explicitly declared.'
   class: group
   group: property
   type: uint32
   members:
-    - interface: xyz.openbmc_project.Sensor.Value
-      meta: PROPERTY
-      property: ValueA
-    - interface: xyz.openbmc_project.Sensor.Value
-      meta: PROPERTY
-      property: ValueB
+      - interface: xyz.openbmc_project.Sensor.Value
+        meta: PROPERTY
+        property: ValueA
+      - interface: xyz.openbmc_project.Sensor.Value
+        meta: PROPERTY
+        property: ValueB
 
 - name: example property watch
   description: >
-    'A property watch instructs PDM to maintain a cache of the state
-    of the specified properties on the specified D-Bus objects.
+      'A property watch instructs PDM to maintain a cache of the state of the
+      specified properties on the specified D-Bus objects.
 
-    An optional set of filters can be applied to the specified properties,
-    where each property's cache is cleared when it fails to pass
-    any one filter. The property's cache is cleared so it will not have an
-    affect on any optional callback that may be triggered.
+      An optional set of filters can be applied to the specified properties,
+      where each property's cache is cleared when it fails to pass any one
+      filter. The property's cache is cleared so it will not have an affect on
+      any optional callback that may be triggered.
 
-    An optional callback can be triggered when property values change and
-    those values pass all filters that may be defined.
+      An optional callback can be triggered when property values change and
+      those values pass all filters that may be defined.
 
-    By default the callback is called when the monitor starts.
-    An optional `ignore_start_callback` can be set to true so that the
-    callback will not be called when the monitor starts.'
+      By default the callback is called when the monitor starts. An optional
+      `ignore_start_callback` can be set to true so that the callback will not
+      be called when the monitor starts.'
 
   class: watch
   watch: property
@@ -68,26 +66,26 @@
   properties: example property group
   callback: example count condition
   filters:
-    - op: '>='
-      bound: 0
-    - op: '<='
-      bound: 100
+      - op: ">="
+        bound: 0
+      - op: "<="
+        bound: 100
   ignore_start_callback: true
 
 - name: example journal callback
   description: >
-    'Callbacks are actions PDM should take when instructed to do so.
+      'Callbacks are actions PDM should take when instructed to do so.
 
-    Some callback types refer to a group of paths and group of properties
-    in a similar fashion as the property watch directive.
+      Some callback types refer to a group of paths and group of properties in a
+      similar fashion as the property watch directive.
 
-    The journal callback logs the specified message to the systemd journal
-    with the specified severity.
+      The journal callback logs the specified message to the systemd journal
+      with the specified severity.
 
-    Additionally, the journal callback will add to the journal key value
-    pair metadata for each property in the specified property group with
-    the key being the property element metadata and the value being the
-    property value.'
+      Additionally, the journal callback will add to the journal key value pair
+      metadata for each property in the specified property group with the key
+      being the property element metadata and the value being the property
+      value.'
   class: callback
   callback: journal
   paths: example path group
@@ -97,41 +95,41 @@
 
 - name: example elog callback
   description: >
-    'Callbacks are actions PDM should take when instructed to do so.
+      'Callbacks are actions PDM should take when instructed to do so.
 
-    Some callback types refer to a group of paths and group of properties
-    in a similar fashion as the property watch directive.
+      Some callback types refer to a group of paths and group of properties in a
+      similar fashion as the property watch directive.
 
-    The elog callback logs the elog and elog metadata.'
+      The elog callback logs the elog and elog metadata.'
   class: callback
   callback: elog
   paths: example path group
   properties: example property group
   error: xyz::openbmc_project::Common::Error::InvalidArgument
   metadata:
-    - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_NAME
-      value: testing...
-      type: string
-    - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_VALUE
-      value: testing...
-      type: string
+      - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_NAME
+        value: testing...
+        type: string
+      - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_VALUE
+        value: testing...
+        type: string
 
 - name: example elog with metadata capture callback
   description: >
-    'Callbacks are actions pdm should take when instructed to do so.
+      'Callbacks are actions pdm should take when instructed to do so.
 
-    This callback creates an elog, and it will capture the values of the
-    properties that passed its condition check in the metadata field
-    (that must be a string type) in the form:
+      This callback creates an elog, and it will capture the values of the
+      properties that passed its condition check in the metadata field (that
+      must be a string type) in the form:
 
-        |path1:property1=value1|path2:property2=value2|
+          |path1:property1=value1|path2:property2=value2|
 
-    Note that as this callback depends on the condition that called it to
-    fill in the result of its checks on each property, this callback should
-    use the same properties and paths keywords as the condition that calls it.
+      Note that as this callback depends on the condition that called it to fill
+      in the result of its checks on each property, this callback should use the
+      same properties and paths keywords as the condition that calls it.
 
-    Currently an error log with only 1 metadata entry of type string is
-    supported.'
+      Currently an error log with only 1 metadata entry of type string is
+      supported.'
 
   class: callback
   callback: elog_with_metadata
@@ -142,14 +140,13 @@
 
 - name: example event callback
   description: >
-    'Callbacks are actions PDM should take when instructed to do so.
+      'Callbacks are actions PDM should take when instructed to do so.
 
-    Some callback types refer to a group of paths and group of properties
-    in a similar fashion as the property watch directive.
+      Some callback types refer to a group of paths and group of properties in a
+      similar fashion as the property watch directive.
 
-    The event callback creates the event D-Bus object with the given name
-    and the event message.
-    eg /xyz/openbmc_project/events/test/<id>'
+      The event callback creates the event D-Bus object with the given name and
+      the event message. eg /xyz/openbmc_project/events/test/<id>'
   class: callback
   callback: event
   paths: example path group
@@ -159,7 +156,7 @@
 
 - name: example method callback
   description: >
-    'The method callback invokes the specified D-Bus method.'
+      'The method callback invokes the specified D-Bus method.'
   class: callback
   callback: method
   service: org.freedesktop.systemd1
@@ -167,20 +164,20 @@
   interface: org.freedesktop.systemd1.Manager
   method: StartUnit
   args:
-    - value: foo.unit
-      type: string
-    - value: replace
-      type: string
+      - value: foo.unit
+        type: string
+      - value: replace
+        type: string
 
 - name: example resolve callouts callback
   description: >
-    'The resolve callout callback resolves all error log entries that
-    are associated with the inventory path specified by setting the
-    Resolved property in the entries to true.
+      'The resolve callout callback resolves all error log entries that are
+      associated with the inventory path specified by setting the Resolved
+      property in the entries to true.
 
-    A use case could be to watch the Present property on the inventory
-    item and resolve all errors for it when a new one is plugged in and
-    the property changes to true.'
+      A use case could be to watch the Present property on the inventory item
+      and resolve all errors for it when a new one is plugged in and the
+      property changes to true.'
 
   class: callback
   callback: resolve callout
@@ -190,66 +187,67 @@
 
 - name: example callback group
   description: >
-    'Callbacks groups are simply named collections of other callbacks.
-    Configuration file directives can only refer to a single callback.
-    Through use of a group, these configuration file directives can
-    refer to more than one callback.
+      'Callbacks groups are simply named collections of other callbacks.
+      Configuration file directives can only refer to a single callback. Through
+      use of a group, these configuration file directives can refer to more than
+      one callback.
 
-    For example for a given event, one may wish to trace multiple
-    messages to the systemd journal.  The journal callback does not
-    support tracing multiple messages.  To do that, define a callback
-    group composed of multiple journal callbacks.'
+      For example for a given event, one may wish to trace multiple messages to
+      the systemd journal.  The journal callback does not support tracing
+      multiple messages.  To do that, define a callback group composed of
+      multiple journal callbacks.'
 
   class: callback
   callback: group
   members:
-    - example journal callback
-    - example deferred condition
-    - example elog callback
+      - example journal callback
+      - example deferred condition
+      - example elog callback
 
 - name: example count condition
   description: >
-    'Conditions or conditional callbacks apply a test prior to invoking
-    the callback function.
+      'Conditions or conditional callbacks apply a test prior to invoking the
+      callback function.
 
-    All conditional callbacks must specify the callback to issue if
-    the condition evaluates.
+      All conditional callbacks must specify the callback to issue if the
+      condition evaluates.
 
-    The count condition applies the op comparison operator to the value of each
-    property in the specified groups.  It then counts the number of properties
-    that pass the comparison, and applies another comparison on the result
-    against the specified bound.
+      The count condition applies the op comparison operator to the value of
+      each property in the specified groups.  It then counts the number of
+      properties that pass the comparison, and applies another comparison on the
+      result against the specified bound.
 
-    For example, a callback that requires at least three temperature sensors
-    in the group to be higher than 115 degrees might use a count condition
-    with an op of >, a count op of >=, a bound of 115, and a countbound of 3.
+      For example, a callback that requires at least three temperature sensors
+      in the group to be higher than 115 degrees might use a count condition
+      with an op of >, a count op of >=, a bound of 115, and a countbound of 3.
 
-    The optional oneshot parameter defaults to false.  If it is specified and
-    set to true, then the callback will only be called once for as long as the
-    condition is repeatedly passing.  The condition needs to fail at least
-    once to rearm the callback.'
+      The optional oneshot parameter defaults to false.  If it is specified and
+      set to true, then the callback will only be called once for as long as the
+      condition is repeatedly passing.  The condition needs to fail at least
+      once to rearm the callback.'
 
   class: condition
   condition: count
   paths: example path group
   properties: example property group
   callback: example callback group
-  countop: '>='
+  countop: ">="
   countbound: 3
-  op: '>='
+  op: ">="
   bound: 115
   oneshot: true
 
 - name: example deferred condition
   description: >
-    'Deferred conditions operate in the same fashion as conditional callbacks
-    with the added behavior that when the condition is tested and is met,
-    invocation of the callback is deferred by the interval specified.
+      'Deferred conditions operate in the same fashion as conditional callbacks
+      with the added behavior that when the condition is tested and is met,
+      invocation of the callback is deferred by the interval specified.
 
-    When the configured time has elapsed, if the condition has not been reevaluated
-    the callback is invoked.
+      When the configured time has elapsed, if the condition has not been
+      reevaluated the callback is invoked.
 
-    Any condition type can be deferred in this way by setting the defer attribute.'
+      Any condition type can be deferred in this way by setting the defer
+      attribute.'
 
   class: condition
   condition: count
@@ -257,22 +255,22 @@
   properties: example property group
   defer: 1000us
   callback: example callback group
-  countop: '>='
+  countop: ">="
   countbound: 3
-  op: '>='
+  op: ">="
   bound: 115
 
 - name: errorlog path group
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/logging
+      - meta: PATH
+        path: /xyz/openbmc_project/logging
 
 - name: pathwatch errorlog
   description: >
-    'A pathwatch watches on the specified object path goup.
-    pathcallback are actions PDM should take when instructed to do so.'
+      'A pathwatch watches on the specified object path goup. pathcallback are
+      actions PDM should take when instructed to do so.'
 
   class: pathwatch
   pathwatch: path
@@ -281,7 +279,7 @@
 
 - name: create errorlog event
   description: >
-    'eventType specifies the type of the SNMP notification.'
+      'eventType specifies the type of the SNMP notification.'
   class: pathcallback
   pathcallback: eventpath
   paths: errorlog path group
diff --git a/src/example/test.yaml b/src/example/test.yaml
index b37ff72..2345d70 100644
--- a/src/example/test.yaml
+++ b/src/example/test.yaml
@@ -7,95 +7,95 @@
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst1
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst2
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst3
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst1
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst2
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst3
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
 
 - name: test byte property group
   class: group
   group: property
   type: byte
   members:
-    - interface: xyz.openbmc_project.byteIface
-      meta: PROPERTY
-      property: byteValue
+      - interface: xyz.openbmc_project.byteIface
+        meta: PROPERTY
+        property: byteValue
 
 - name: test u16 property group
   class: group
   group: property
   type: uint16
   members:
-    - interface: xyz.openbmc_project.U16Iface
-      meta: PROPERTY
-      property: u16Value
+      - interface: xyz.openbmc_project.U16Iface
+        meta: PROPERTY
+        property: u16Value
 
 - name: test u32 property group
   class: group
   group: property
   type: uint32
   members:
-    - interface: xyz.openbmc_project.U32Iface
-      meta: PROPERTY
-      property: u32Value
+      - interface: xyz.openbmc_project.U32Iface
+        meta: PROPERTY
+        property: u32Value
 
 - name: test u64 property group
   class: group
   group: property
   type: uint64
   members:
-    - interface: xyz.openbmc_project.U64Iface
-      meta: PROPERTY
-      property: u64Value
+      - interface: xyz.openbmc_project.U64Iface
+        meta: PROPERTY
+        property: u64Value
 
 - name: test s16 property group
   class: group
   group: property
   type: int16
   members:
-    - interface: xyz.openbmc_project.S16Iface
-      meta: PROPERTY
-      property: s16Value
+      - interface: xyz.openbmc_project.S16Iface
+        meta: PROPERTY
+        property: s16Value
 
 - name: test s32 property group
   class: group
   group: property
   type: int32
   members:
-    - interface: xyz.openbmc_project.S32Iface
-      meta: PROPERTY
-      property: s32Value
+      - interface: xyz.openbmc_project.S32Iface
+        meta: PROPERTY
+        property: s32Value
 
 - name: test s64 property group
   class: group
   group: property
   type: int64
   members:
-    - interface: xyz.openbmc_project.S64Iface
-      meta: PROPERTY
-      property: s64Value
+      - interface: xyz.openbmc_project.S64Iface
+        meta: PROPERTY
+        property: s64Value
 
 - name: test string property group
   class: group
   group: property
   type: string
   members:
-    - interface: xyz.openbmc_project.StringIface
-      meta: PROPERTY
-      property: StringValue
+      - interface: xyz.openbmc_project.StringIface
+        meta: PROPERTY
+        property: StringValue
 
 - name: test bool property group
   class: group
   group: property
   type: boolean
   members:
-    - interface: xyz.openbmc_project.BoolIface
-      meta: PROPERTY
-      property: BoolValue
+      - interface: xyz.openbmc_project.BoolIface
+        meta: PROPERTY
+        property: BoolValue
 
 - name: test byte watch
   class: watch
@@ -230,12 +230,12 @@
   properties: test string property group
   error: xyz::openbmc_project::Common::Error::InvalidArgument
   metadata:
-    - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_NAME
-      value: testing...
-      type: string
-    - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_VALUE
-      value: testing...
-      type: string
+      - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_NAME
+        value: testing...
+        type: string
+      - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_VALUE
+        value: testing...
+        type: string
 
 - name: test int32 elog
   class: callback
@@ -244,12 +244,12 @@
   properties: test string property group
   error: xyz::openbmc_project::Common::Callout::Error::Device
   metadata:
-    - name: xyz::openbmc_project::Common::Callout::Device::CALLOUT_ERRNO
-      value: 123
-      type: int32
-    - name: xyz::openbmc_project::Common::Callout::Device::CALLOUT_DEVICE_PATH
-      value: testing...
-      type: string
+      - name: xyz::openbmc_project::Common::Callout::Device::CALLOUT_ERRNO
+        value: 123
+        type: int32
+      - name: xyz::openbmc_project::Common::Callout::Device::CALLOUT_DEVICE_PATH
+        value: testing...
+        type: string
 
 - name: test int64 elog
   class: callback
@@ -258,18 +258,18 @@
   properties: test string property group
   error: xyz::openbmc_project::Common::File::Error::Seek
   metadata:
-    - name: xyz::openbmc_project::Common::File::Seek::OFFSET
-      value: 123
-      type: int64
-    - name: xyz::openbmc_project::Common::File::Seek::WHENCE
-      value: 123
-      type: int32
-    - name: xyz::openbmc_project::Common::File::Seek::ERRNO
-      value: 123
-      type: int32
-    - name: xyz::openbmc_project::Common::File::Seek::PATH
-      value: testing...
-      type: string
+      - name: xyz::openbmc_project::Common::File::Seek::OFFSET
+        value: 123
+        type: int64
+      - name: xyz::openbmc_project::Common::File::Seek::WHENCE
+        value: 123
+        type: int32
+      - name: xyz::openbmc_project::Common::File::Seek::ERRNO
+        value: 123
+        type: int32
+      - name: xyz::openbmc_project::Common::File::Seek::PATH
+        value: testing...
+        type: string
 
 - name: test no metadata elog
   class: callback
@@ -302,26 +302,26 @@
   interface: org.test
   method: Test
   args:
-    - value: 123
-      type: string
-    - value: false
-      type: boolean
-    - value: true
-      type: boolean
-    - value: 123
-      type: byte
-    - value: 123
-      type: uint16
-    - value: 123
-      type: uint32
-    - value: 123
-      type: uint64
-    - value: 123
-      type: int16
-    - value: 123
-      type: int32
-    - value: 123
-      type: int64
+      - value: 123
+        type: string
+      - value: false
+        type: boolean
+      - value: true
+        type: boolean
+      - value: 123
+        type: byte
+      - value: 123
+        type: uint16
+      - value: 123
+        type: uint32
+      - value: 123
+        type: uint64
+      - value: 123
+        type: int16
+      - value: 123
+        type: int32
+      - value: 123
+        type: int64
 
 - name: test count lt
   class: condition
@@ -329,9 +329,9 @@
   paths: test path group
   properties: test byte property group
   callback: test method
-  countop: '<'
+  countop: "<"
   countbound: 3
-  op: '<'
+  op: "<"
   bound: 115
   oneshot: true
 
@@ -342,9 +342,9 @@
   properties: test byte property group
   callback: test method
   defer: 1000us
-  countop: '<='
+  countop: "<="
   countbound: 3
-  op: '<='
+  op: "<="
   bound: 115
   oneshot: false
 
@@ -355,9 +355,9 @@
   properties: test byte property group
   defer: 1000us
   callback: test method
-  countop: '>'
+  countop: ">"
   countbound: 3
-  op: '>'
+  op: ">"
   bound: 115
 
 - name: test count gte
@@ -367,9 +367,9 @@
   properties: test byte property group
   defer: 1000us
   callback: test method
-  countop: '>='
+  countop: ">="
   countbound: 3
-  op: '>='
+  op: ">="
   bound: 115
 
 - name: test count eq
@@ -379,9 +379,9 @@
   properties: test byte property group
   defer: 1000us
   callback: test method
-  countop: '=='
+  countop: "=="
   countbound: 3
-  op: '=='
+  op: "=="
   bound: 115
 
 - name: test count neq
@@ -391,9 +391,9 @@
   properties: test byte property group
   defer: 1000us
   callback: test method
-  countop: '!='
+  countop: "!="
   countbound: 3
-  op: '!='
+  op: "!="
   bound: 115
 
 - name: test count u16
@@ -403,9 +403,9 @@
   properties: test u16 property group
   defer: 1000us
   callback: test method
-  countop: '=='
+  countop: "=="
   countbound: 3
-  op: '=='
+  op: "=="
   bound: 115
 
 - name: test count u32
@@ -415,9 +415,9 @@
   properties: test u32 property group
   defer: 1000us
   callback: test method
-  countop: '=='
+  countop: "=="
   countbound: 3
-  op: '=='
+  op: "=="
   bound: 115
 
 - name: test count u64
@@ -427,9 +427,9 @@
   properties: test u64 property group
   defer: 1000us
   callback: test method
-  countop: '=='
+  countop: "=="
   countbound: 3
-  op: '=='
+  op: "=="
   bound: 115
 
 - name: test count s16
@@ -439,9 +439,9 @@
   properties: test s16 property group
   defer: 1000us
   callback: test method
-  countop: '=='
+  countop: "=="
   countbound: 3
-  op: '=='
+  op: "=="
   bound: 115
 
 - name: test count s32
@@ -451,9 +451,9 @@
   properties: test s32 property group
   defer: 1000us
   callback: test method
-  countop: '=='
+  countop: "=="
   countbound: 3
-  op: '=='
+  op: "=="
   bound: 115
 
 - name: test count s64
@@ -463,9 +463,9 @@
   properties: test s64 property group
   defer: 1000us
   callback: test method
-  countop: '=='
+  countop: "=="
   countbound: 3
-  op: '=='
+  op: "=="
   bound: 115
 
 - name: test count bool
@@ -475,9 +475,9 @@
   properties: test bool property group
   defer: 1000us
   callback: test method
-  countop: '=='
+  countop: "=="
   countbound: 3
-  op: '=='
+  op: "=="
   bound: false
 
 - name: test resolve errors
diff --git a/src/test/yaml/callbackgentest/one.yaml b/src/test/yaml/callbackgentest/one.yaml
index abd1602..537124f 100644
--- a/src/test/yaml/callbackgentest/one.yaml
+++ b/src/test/yaml/callbackgentest/one.yaml
@@ -7,35 +7,35 @@
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
 
 - name: test path group 2
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst6
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst6
 
 - name: test property group 1
   class: group
   group: property
   type: int32
   members:
-    - interface: xyz.openbmc_project.Sensor.Iface1
-      meta: PROPERTY
-      property: Value
+      - interface: xyz.openbmc_project.Sensor.Iface1
+        meta: PROPERTY
+        property: Value
 
 - name: test property group 2
   class: group
   group: property
   type: string
   members:
-    - interface: xyz.openbmc_project.Sensor.Iface3
-      meta: PROPERTY
-      property: Value2
+      - interface: xyz.openbmc_project.Sensor.Iface3
+        meta: PROPERTY
+        property: Value2
 
 - name: test journal callback 1
   class: callback
diff --git a/src/test/yaml/callbackgentest/two.yaml b/src/test/yaml/callbackgentest/two.yaml
index f7f1d8f..380762c 100644
--- a/src/test/yaml/callbackgentest/two.yaml
+++ b/src/test/yaml/callbackgentest/two.yaml
@@ -4,19 +4,19 @@
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst6
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst6
 
 - name: test property group 1
   class: group
   group: property
   type: string
   members:
-    - interface: xyz.openbmc_project.Sensor.Iface3
-      meta: PROPERTY
-      property: Value2
+      - interface: xyz.openbmc_project.Sensor.Iface3
+        meta: PROPERTY
+        property: Value2
 
 - name: test journal callback 1
   class: callback
diff --git a/src/test/yaml/callbackgroupgentest/test.yaml b/src/test/yaml/callbackgroupgentest/test.yaml
index afb9d7e..f8d0b06 100644
--- a/src/test/yaml/callbackgroupgentest/test.yaml
+++ b/src/test/yaml/callbackgroupgentest/test.yaml
@@ -4,35 +4,35 @@
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
 
 - name: test path group 2
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst6
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst6
 
 - name: test property group 1
   class: group
   group: property
   type: int32
   members:
-    - interface: xyz.openbmc_project.Sensor.Iface1
-      meta: PROPERTY
-      property: Value
+      - interface: xyz.openbmc_project.Sensor.Iface1
+        meta: PROPERTY
+        property: Value
 
 - name: test property group 2
   class: group
   group: property
   type: string
   members:
-    - interface: xyz.openbmc_project.Sensor.Iface3
-      meta: PROPERTY
-      property: Value2
+      - interface: xyz.openbmc_project.Sensor.Iface3
+        meta: PROPERTY
+        property: Value2
 
 - name: test journal callback 1
   class: callback
@@ -65,12 +65,12 @@
   properties: test property group 2
   error: xyz::openbmc_project::Common::Error::InvalidArgument
   metadata:
-    - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_NAME
-      value: testing...
-      type: string
-    - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_VALUE
-      value: testing...
-      type: string
+      - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_NAME
+        value: testing...
+        type: string
+      - name: xyz::openbmc_project::Common::InvalidArgument::ARGUMENT_VALUE
+        value: testing...
+        type: string
 
 - name: test elog callback 2
   class: callback
@@ -83,29 +83,29 @@
   class: callback
   callback: group
   members:
-    - test journal callback 1
-    - test journal callback 2
-    - test journal callback 3
-    - test elog callback 1
+      - test journal callback 1
+      - test journal callback 2
+      - test journal callback 3
+      - test elog callback 1
 
 - name: test group callback 2
   class: callback
   callback: group
   members:
-    - test journal callback 1
-    - test journal callback 2
-    - test elog callback 2
+      - test journal callback 1
+      - test journal callback 2
+      - test elog callback 2
 
 - name: test group callback 3
   class: callback
   callback: group
   members:
-    - test journal callback 3
-    - test group callback 2
-    - test group callback 3
+      - test journal callback 3
+      - test group callback 2
+      - test group callback 3
 
 - name: test group callback 4
   class: callback
   callback: group
   members:
-    - test group callback 3
+      - test group callback 3
diff --git a/src/test/yaml/conditiongentest/test.yaml b/src/test/yaml/conditiongentest/test.yaml
index 6e2c36e..5f7e27a 100644
--- a/src/test/yaml/conditiongentest/test.yaml
+++ b/src/test/yaml/conditiongentest/test.yaml
@@ -4,35 +4,35 @@
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
 
 - name: test path group 2
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst6
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst6
 
 - name: test property group 1
   class: group
   group: property
   type: int32
   members:
-    - interface: xyz.openbmc_project.Sensor.Iface1
-      meta: PROPERTY
-      property: Value
+      - interface: xyz.openbmc_project.Sensor.Iface1
+        meta: PROPERTY
+        property: Value
 
 - name: test property group 2
   class: group
   group: property
   type: string
   members:
-    - interface: xyz.openbmc_project.Sensor.Iface3
-      meta: PROPERTY
-      property: Value2
+      - interface: xyz.openbmc_project.Sensor.Iface3
+        meta: PROPERTY
+        property: Value2
 
 - name: test count condition 1
   class: condition
@@ -40,9 +40,9 @@
   paths: test path group 1
   properties: test property group 1
   callback: test journal callback 1
-  countop: '>='
+  countop: ">="
   countbound: 3
-  op: '>='
+  op: ">="
   bound: 115
 
 - name: test count condition 2
@@ -51,9 +51,9 @@
   paths: test path group 1
   properties: test property group 1
   callback: test journal callback 1
-  countop: '>='
+  countop: ">="
   countbound: 3
-  op: '>='
+  op: ">="
   bound: 115
 
 - name: test journal callback 1
@@ -70,9 +70,9 @@
   paths: test path group 1
   properties: test property group 1
   callback: test journal callback 2
-  countop: '>='
+  countop: ">="
   countbound: 3
-  op: '>='
+  op: ">="
   bound: 115
 
 - name: test count condition 4
@@ -81,9 +81,9 @@
   paths: test path group 1
   properties: test property group 1
   callback: test journal callback 2
-  countop: '>='
+  countop: ">="
   countbound: 3
-  op: '>='
+  op: ">="
   bound: 115
 
 - name: test journal callback 2
@@ -100,7 +100,7 @@
   paths: test path group 1
   properties: test property group 1
   callback: test journal callback 1
-  op: '>='
+  op: ">="
   bound: 45
 
 - name: test median condition 2
@@ -109,5 +109,5 @@
   paths: test path group 2
   properties: test property group 1
   callback: test journal callback 2
-  op: '>='
+  op: ">="
   bound: 45
diff --git a/src/test/yaml/interfaceaddtest/one.yaml b/src/test/yaml/interfaceaddtest/one.yaml
index f84389e..90a28ee 100644
--- a/src/test/yaml/interfaceaddtest/one.yaml
+++ b/src/test/yaml/interfaceaddtest/one.yaml
@@ -5,8 +5,8 @@
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst1
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst1
 
 - name: pathwatch errorlog
   description: >
diff --git a/src/test/yaml/pathgentest/groupone.yaml b/src/test/yaml/pathgentest/groupone.yaml
index 7985b47..e6e997b 100644
--- a/src/test/yaml/pathgentest/groupone.yaml
+++ b/src/test/yaml/pathgentest/groupone.yaml
@@ -5,24 +5,24 @@
   class: group
   group: path
   members:
-    - meta: PATH1
-      path: /xyz/openbmc_project/testing/inst1
-    - meta: PATH1
-      path: /xyz/openbmc_project/testing/inst2
-    - meta: PATH1
-      path: /xyz/openbmc_project/testing/inst3
-    - meta: PATH1
-      path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH1
+        path: /xyz/openbmc_project/testing/inst1
+      - meta: PATH1
+        path: /xyz/openbmc_project/testing/inst2
+      - meta: PATH1
+        path: /xyz/openbmc_project/testing/inst3
+      - meta: PATH1
+        path: /xyz/openbmc_project/testing/inst4
 
 - name: test path group 2
   class: group
   group: path
   members:
-    - meta: PATH3
-      path: /xyz/openbmc_project/testing/inst1
-    - meta: PATH3
-      path: /xyz/openbmc_project/testing/inst2
-    - meta: PATH3
-      path: /xyz/openbmc_project/testing/inst3
-    - meta: PATH3
-      path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH3
+        path: /xyz/openbmc_project/testing/inst1
+      - meta: PATH3
+        path: /xyz/openbmc_project/testing/inst2
+      - meta: PATH3
+        path: /xyz/openbmc_project/testing/inst3
+      - meta: PATH3
+        path: /xyz/openbmc_project/testing/inst4
diff --git a/src/test/yaml/pathgentest/grouptwo.yaml b/src/test/yaml/pathgentest/grouptwo.yaml
index 3910fd2..bcc7cd3 100644
--- a/src/test/yaml/pathgentest/grouptwo.yaml
+++ b/src/test/yaml/pathgentest/grouptwo.yaml
@@ -7,24 +7,24 @@
   class: group
   group: path
   members:
-    - meta: PATH1
-      path: /xyz/openbmc_project/testing/inst1
-    - meta: PATH1
-      path: /xyz/openbmc_project/testing/inst2
-    - meta: PATH1
-      path: /xyz/openbmc_project/testing/inst5
-    - meta: PATH1
-      path: /xyz/openbmc_project/testing/inst6
+      - meta: PATH1
+        path: /xyz/openbmc_project/testing/inst1
+      - meta: PATH1
+        path: /xyz/openbmc_project/testing/inst2
+      - meta: PATH1
+        path: /xyz/openbmc_project/testing/inst5
+      - meta: PATH1
+        path: /xyz/openbmc_project/testing/inst6
 
 - name: test path group 2
   class: group
   group: path
   members:
-    - meta: PATH2
-      path: /xyz/openbmc_project/testing/inst4
-    - meta: PATH2
-      path: /xyz/openbmc_project/testing/inst3
-    - meta: PATH2
-      path: /xyz/openbmc_project/testing/inst2
-    - meta: PATH2
-      path: /xyz/openbmc_project/testing/inst1
+      - meta: PATH2
+        path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH2
+        path: /xyz/openbmc_project/testing/inst3
+      - meta: PATH2
+        path: /xyz/openbmc_project/testing/inst2
+      - meta: PATH2
+        path: /xyz/openbmc_project/testing/inst1
diff --git a/src/test/yaml/propertygentest/groupone.yaml b/src/test/yaml/propertygentest/groupone.yaml
index 5837e72..50a8638 100644
--- a/src/test/yaml/propertygentest/groupone.yaml
+++ b/src/test/yaml/propertygentest/groupone.yaml
@@ -3,21 +3,21 @@
   group: property
   type: uint32
   members:
-    - interface: xyz.openbmc_project.Test.Iface3
-      property: Foo
-      meta: PROPERTY1
-    - interface: xyz.openbmc_project.Test.Iface2
-      property: Value
-      meta: PROPERTY2
+      - interface: xyz.openbmc_project.Test.Iface3
+        property: Foo
+        meta: PROPERTY1
+      - interface: xyz.openbmc_project.Test.Iface2
+        property: Value
+        meta: PROPERTY2
 
 - name: test property group 2
   class: group
   group: property
   type: int32
   members:
-    - interface: xyz.openbmc_project.Test.Iface3
-      property: Bar
-      meta: PROPERTY1
-    - interface: xyz.openbmc_project.Test.Iface2
-      property: Foo
-      meta: PROPERTY2
+      - interface: xyz.openbmc_project.Test.Iface3
+        property: Bar
+        meta: PROPERTY1
+      - interface: xyz.openbmc_project.Test.Iface2
+        property: Foo
+        meta: PROPERTY2
diff --git a/src/test/yaml/propertygentest/grouptwo.yaml b/src/test/yaml/propertygentest/grouptwo.yaml
index 9b86bba..787ff6b 100644
--- a/src/test/yaml/propertygentest/grouptwo.yaml
+++ b/src/test/yaml/propertygentest/grouptwo.yaml
@@ -3,24 +3,24 @@
   group: property
   type: string
   members:
-    - interface: xyz.openbmc_project.Test.Iface6
-      property: Foo
-      meta: PROPERTY1
-    - interface: xyz.openbmc_project.Test.Iface1
-      property: Value
-      meta: PROPERTY2
+      - interface: xyz.openbmc_project.Test.Iface6
+        property: Foo
+        meta: PROPERTY1
+      - interface: xyz.openbmc_project.Test.Iface1
+        property: Value
+        meta: PROPERTY2
 
 - name: test property group 3
   class: group
   group: property
   type: int32
   members:
-    - interface: xyz.openbmc_project.Test.Iface3
-      property: Bar
-      meta: PROPERTY1
-    - interface: xyz.openbmc_project.Test.Iface2
-      property: Value
-      meta: PROPERTY2
-    - interface: xyz.openbmc_project.Test.Iface6
-      property: Baz
-      meta: PROPERTY3
+      - interface: xyz.openbmc_project.Test.Iface3
+        property: Bar
+        meta: PROPERTY1
+      - interface: xyz.openbmc_project.Test.Iface2
+        property: Value
+        meta: PROPERTY2
+      - interface: xyz.openbmc_project.Test.Iface6
+        property: Baz
+        meta: PROPERTY3
diff --git a/src/test/yaml/propertywatchgentest/watchone.yaml b/src/test/yaml/propertywatchgentest/watchone.yaml
index 1e6f7b4..da9dfd4 100644
--- a/src/test/yaml/propertywatchgentest/watchone.yaml
+++ b/src/test/yaml/propertywatchgentest/watchone.yaml
@@ -2,51 +2,51 @@
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst1
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst2
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst3
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst1
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst2
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst3
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
 
 - name: test path group 2
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst3
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst5
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst6
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst3
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst5
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst6
 
 - name: test property group 1
   class: group
   group: property
   type: string
   members:
-    - interface: xyz.openbmc_project.Sensor.Iface1
-      meta: PROPERTY
-      property: Value
-    - interface: xyz.openbmc_project.Sensor.Iface2
-      meta: PROPERTY
-      property: Value
+      - interface: xyz.openbmc_project.Sensor.Iface1
+        meta: PROPERTY
+        property: Value
+      - interface: xyz.openbmc_project.Sensor.Iface2
+        meta: PROPERTY
+        property: Value
 
 - name: test property group 2
   class: group
   group: property
   type: uint32
   members:
-    - interface: xyz.openbmc_project.Sensor.Iface3
-      meta: PROPERTY
-      property: Value1
-    - interface: xyz.openbmc_project.Sensor.Iface3
-      meta: PROPERTY
-      property: Value2
+      - interface: xyz.openbmc_project.Sensor.Iface3
+        meta: PROPERTY
+        property: Value1
+      - interface: xyz.openbmc_project.Sensor.Iface3
+        meta: PROPERTY
+        property: Value2
 
 - name: test property watch 1
   class: watch
diff --git a/src/test/yaml/propertywatchgentest/watchtwo.yaml b/src/test/yaml/propertywatchgentest/watchtwo.yaml
index 8b3dfcf..f19d58e 100644
--- a/src/test/yaml/propertywatchgentest/watchtwo.yaml
+++ b/src/test/yaml/propertywatchgentest/watchtwo.yaml
@@ -2,35 +2,35 @@
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
 
 - name: test path group 3
   class: group
   group: path
   members:
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst4
-    - meta: PATH
-      path: /xyz/openbmc_project/testing/inst6
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst4
+      - meta: PATH
+        path: /xyz/openbmc_project/testing/inst6
 
 - name: test property group 1
   class: group
   group: property
   type: int32
   members:
-    - interface: xyz.openbmc_project.Sensor.Iface1
-      meta: PROPERTY
-      property: Value
+      - interface: xyz.openbmc_project.Sensor.Iface1
+        meta: PROPERTY
+        property: Value
 
 - name: test property group 3
   class: group
   group: property
   type: string
   members:
-    - interface: xyz.openbmc_project.Sensor.Iface3
-      meta: PROPERTY
-      property: Value2
+      - interface: xyz.openbmc_project.Sensor.Iface3
+        meta: PROPERTY
+        property: Value2
 
 - name: test property watch 1
   class: watch