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