diff --git a/src/meson.build b/src/meson.build
index 52d4e78..c8df2e3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,14 +4,14 @@
     'templates/callbackgroup.mako.cpp',
     'templates/conditional.mako.cpp',
     'templates/count.mako.cpp',
-    'templates/median.mako.cpp',
-    'templates/generated.mako.hpp',
-    'templates/journal.mako.cpp',
     'templates/elog.mako.cpp',
     'templates/errors.mako.hpp',
+    'templates/event.mako.cpp',
+    'templates/generated.mako.hpp',
+    'templates/journal.mako.cpp',
+    'templates/median.mako.cpp',
     'templates/method.mako.cpp',
     'templates/resolve_errors.mako.cpp',
-    'templates/event.mako.cpp',
 )
 
 yamldir = get_option('YAML_PATH')
@@ -24,12 +24,17 @@
     command: [
         prog_python,
         meson.project_source_root() + '/src/pdmgen.py',
-        '-t', 'generated.mako.hpp',
-        '-p', meson.project_source_root() + '/src/templates',
-        '-d', yamldir,
-        '-o', meson.current_build_dir() + '/generated.hpp',
-        '-e', meson.current_build_dir() + '/errors.hpp',
-        'generate-cpp'
+        '-t',
+        'generated.mako.hpp',
+        '-p',
+        meson.project_source_root() + '/src/templates',
+        '-d',
+        yamldir,
+        '-o',
+        meson.current_build_dir() + '/generated.hpp',
+        '-e',
+        meson.current_build_dir() + '/errors.hpp',
+        'generate-cpp',
     ],
     depend_files: templates_depends,
     env: sdbusplus_python_env,
diff --git a/src/test/meson.build b/src/test/meson.build
index ba4ff6e..d1de34d 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -8,13 +8,13 @@
                 dependency('threads'),
                 gtest_proj.dependency('gtest'),
                 gtest_proj.dependency('gtest_main'),
-            ]
+            ],
         )
         gmock_dep = gtest_proj.dependency('gmock')
     else
         assert(
             not get_option('tests').enabled(),
-            'Googletest is required if tests are enabled'
+            'Googletest is required if tests are enabled',
         )
     endif
 endif
@@ -24,12 +24,17 @@
     command: [
         prog_python,
         meson.project_source_root() + '/src/pdmgen.py',
-        '-t', 'pathgentest.mako.hpp',
-        '-p', meson.project_source_root() + '/src/test/templates',
-        '-d', meson.project_source_root() + '/src/test/yaml/pathgentest',
-        '-o', meson.current_build_dir() + '/pathgentest.hpp',
-        '-e', meson.current_build_dir() + '/pathgentest-errors.hpp',
-        'generate-cpp'
+        '-t',
+        'pathgentest.mako.hpp',
+        '-p',
+        meson.project_source_root() + '/src/test/templates',
+        '-d',
+        meson.project_source_root() + '/src/test/yaml/pathgentest',
+        '-o',
+        meson.current_build_dir() + '/pathgentest.hpp',
+        '-e',
+        meson.current_build_dir() + '/pathgentest-errors.hpp',
+        'generate-cpp',
     ],
     input: [
         'templates/pathgentest.mako.hpp',
@@ -40,19 +45,18 @@
     output: 'pathgentest.hpp',
 )
 
-pathgentest_sources = [
-    pathgentest_hpp,
-    'pathgentest.cpp',
-]
+pathgentest_sources = [pathgentest_hpp, 'pathgentest.cpp']
 
-test('pathgentest.cpp',
-  executable(
-    'pathgentest',
-    pathgentest_sources,
-    build_by_default: false,
-    include_directories: ['..'],
-    dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
-  ))
+test(
+    'pathgentest.cpp',
+    executable(
+        'pathgentest',
+        pathgentest_sources,
+        build_by_default: false,
+        include_directories: ['..'],
+        dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+    ),
+)
 
 
 propertygentest_hpp = custom_target(
@@ -60,12 +64,17 @@
     command: [
         prog_python,
         meson.project_source_root() + '/src/pdmgen.py',
-        '-t', 'propertygentest.mako.hpp',
-        '-p', meson.project_source_root() + '/src/test/templates',
-        '-d', meson.project_source_root() + '/src/test/yaml/propertygentest',
-        '-o', meson.current_build_dir() + '/propertygentest.hpp',
-        '-e', meson.current_build_dir() + '/propertygentest-errors.hpp',
-        'generate-cpp'
+        '-t',
+        'propertygentest.mako.hpp',
+        '-p',
+        meson.project_source_root() + '/src/test/templates',
+        '-d',
+        meson.project_source_root() + '/src/test/yaml/propertygentest',
+        '-o',
+        meson.current_build_dir() + '/propertygentest.hpp',
+        '-e',
+        meson.current_build_dir() + '/propertygentest-errors.hpp',
+        'generate-cpp',
     ],
     input: [
         'templates/propertygentest.mako.hpp',
@@ -76,19 +85,18 @@
     output: 'propertygentest.hpp',
 )
 
-propertygentest_sources = [
-    propertygentest_hpp,
-    'propertygentest.cpp',
-]
+propertygentest_sources = [propertygentest_hpp, 'propertygentest.cpp']
 
-test('propertygentest.cpp',
-  executable(
-    'propertygentest',
-    propertygentest_sources,
-    build_by_default: false,
-    include_directories: ['..'],
-    dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
-  ))
+test(
+    'propertygentest.cpp',
+    executable(
+        'propertygentest',
+        propertygentest_sources,
+        build_by_default: false,
+        include_directories: ['..'],
+        dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+    ),
+)
 
 
 propertywatchgentest_hpp = custom_target(
@@ -96,12 +104,17 @@
     command: [
         prog_python,
         meson.project_source_root() + '/src/pdmgen.py',
-        '-t', 'propertywatchgentest.mako.hpp',
-        '-p', meson.project_source_root() + '/src/test/templates',
-        '-d', meson.project_source_root() + '/src/test/yaml/propertywatchgentest',
-        '-o', meson.current_build_dir() + '/propertywatchgentest.hpp',
-        '-e', meson.current_build_dir() + '/propertywatchgentest-errors.hpp',
-        'generate-cpp'
+        '-t',
+        'propertywatchgentest.mako.hpp',
+        '-p',
+        meson.project_source_root() + '/src/test/templates',
+        '-d',
+        meson.project_source_root() + '/src/test/yaml/propertywatchgentest',
+        '-o',
+        meson.current_build_dir() + '/propertywatchgentest.hpp',
+        '-e',
+        meson.current_build_dir() + '/propertywatchgentest-errors.hpp',
+        'generate-cpp',
     ],
     input: [
         'templates/propertywatchgentest.mako.hpp',
@@ -117,14 +130,16 @@
     'propertywatchgentest.cpp',
 ]
 
-test('propertywatchgentest.cpp',
-  executable(
-    'propertywatchgentest',
-    propertywatchgentest_sources,
-    build_by_default: false,
-    include_directories: ['..'],
-    dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
-  ))
+test(
+    'propertywatchgentest.cpp',
+    executable(
+        'propertywatchgentest',
+        propertywatchgentest_sources,
+        build_by_default: false,
+        include_directories: ['..'],
+        dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+    ),
+)
 
 
 callbackgentest_hpp = custom_target(
@@ -132,12 +147,17 @@
     command: [
         prog_python,
         meson.project_source_root() + '/src/pdmgen.py',
-        '-t', 'callbackgentest.mako.hpp',
-        '-p', meson.project_source_root() + '/src/test/templates',
-        '-d', meson.project_source_root() + '/src/test/yaml/callbackgentest',
-        '-o', meson.current_build_dir() + '/callbackgentest.hpp',
-        '-e', meson.current_build_dir() + '/callbackgentest-errors.hpp',
-        'generate-cpp'
+        '-t',
+        'callbackgentest.mako.hpp',
+        '-p',
+        meson.project_source_root() + '/src/test/templates',
+        '-d',
+        meson.project_source_root() + '/src/test/yaml/callbackgentest',
+        '-o',
+        meson.current_build_dir() + '/callbackgentest.hpp',
+        '-e',
+        meson.current_build_dir() + '/callbackgentest-errors.hpp',
+        'generate-cpp',
     ],
     input: [
         'templates/callbackgentest.mako.hpp',
@@ -148,19 +168,18 @@
     output: 'callbackgentest.hpp',
 )
 
-callbackgentest_sources = [
-    callbackgentest_hpp,
-    'callbackgentest.cpp',
-]
+callbackgentest_sources = [callbackgentest_hpp, 'callbackgentest.cpp']
 
-test('callbackgentest.cpp',
-  executable(
-    'callbackgentest',
-    callbackgentest_sources,
-    build_by_default: false,
-    include_directories: ['..'],
-    dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
-  ))
+test(
+    'callbackgentest.cpp',
+    executable(
+        'callbackgentest',
+        callbackgentest_sources,
+        build_by_default: false,
+        include_directories: ['..'],
+        dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+    ),
+)
 
 
 callbackgroupgentest_hpp = custom_target(
@@ -168,12 +187,17 @@
     command: [
         prog_python,
         meson.project_source_root() + '/src/pdmgen.py',
-        '-t', 'callbackgroupgentest.mako.hpp',
-        '-p', meson.project_source_root() + '/src/test/templates',
-        '-d', meson.project_source_root() + '/src/test/yaml/callbackgroupgentest',
-        '-o', meson.current_build_dir() + '/callbackgroupgentest.hpp',
-        '-e', meson.current_build_dir() + '/callbackgroupgentest-errors.hpp',
-        'generate-cpp'
+        '-t',
+        'callbackgroupgentest.mako.hpp',
+        '-p',
+        meson.project_source_root() + '/src/test/templates',
+        '-d',
+        meson.project_source_root() + '/src/test/yaml/callbackgroupgentest',
+        '-o',
+        meson.current_build_dir() + '/callbackgroupgentest.hpp',
+        '-e',
+        meson.current_build_dir() + '/callbackgroupgentest-errors.hpp',
+        'generate-cpp',
     ],
     input: [
         'templates/callbackgroupgentest.mako.hpp',
@@ -188,14 +212,16 @@
     'callbackgroupgentest.cpp',
 ]
 
-test('callbackgroupgentest.cpp',
-  executable(
-    'callbackgroupgentest',
-    callbackgroupgentest_sources,
-    build_by_default: false,
-    include_directories: ['..'],
-    dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
-  ))
+test(
+    'callbackgroupgentest.cpp',
+    executable(
+        'callbackgroupgentest',
+        callbackgroupgentest_sources,
+        build_by_default: false,
+        include_directories: ['..'],
+        dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+    ),
+)
 
 
 conditiongentest_hpp = custom_target(
@@ -203,12 +229,17 @@
     command: [
         prog_python,
         meson.project_source_root() + '/src/pdmgen.py',
-        '-t', 'conditiongentest.mako.hpp',
-        '-p', meson.project_source_root() + '/src/test/templates',
-        '-d', meson.project_source_root() + '/src/test/yaml/conditiongentest',
-        '-o', meson.current_build_dir() + '/conditiongentest.hpp',
-        '-e', meson.current_build_dir() + '/conditiongentest-errors.hpp',
-        'generate-cpp'
+        '-t',
+        'conditiongentest.mako.hpp',
+        '-p',
+        meson.project_source_root() + '/src/test/templates',
+        '-d',
+        meson.project_source_root() + '/src/test/yaml/conditiongentest',
+        '-o',
+        meson.current_build_dir() + '/conditiongentest.hpp',
+        '-e',
+        meson.current_build_dir() + '/conditiongentest-errors.hpp',
+        'generate-cpp',
     ],
     input: [
         'templates/conditiongentest.mako.hpp',
@@ -218,19 +249,18 @@
     output: 'conditiongentest.hpp',
 )
 
-conditiongentest_sources = [
-    conditiongentest_hpp,
-    'conditiongentest.cpp',
-]
+conditiongentest_sources = [conditiongentest_hpp, 'conditiongentest.cpp']
 
-test('conditiongentest.cpp',
-  executable(
-    'conditiongentest',
-    conditiongentest_sources,
-    build_by_default: false,
-    include_directories: ['..'],
-    dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep]
-  ))
+test(
+    'conditiongentest.cpp',
+    executable(
+        'conditiongentest',
+        conditiongentest_sources,
+        build_by_default: false,
+        include_directories: ['..'],
+        dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep],
+    ),
+)
 
 
 callbacktest_sources = [
@@ -253,14 +283,16 @@
     gmock_dep,
 ]
 
-test('callbacktest.cpp',
-  executable(
-    'callbacktest',
-    callbacktest_sources,
-    build_by_default: false,
-    include_directories: ['..', '../../'],
-    dependencies: callbacktest_deps,
-  ))
+test(
+    'callbacktest.cpp',
+    executable(
+        'callbacktest',
+        callbacktest_sources,
+        build_by_default: false,
+        include_directories: ['..', '../../'],
+        dependencies: callbacktest_deps,
+    ),
+)
 
 
 interfaceaddtest_hpp = custom_target(
@@ -268,12 +300,17 @@
     command: [
         prog_python,
         meson.project_source_root() + '/src/pdmgen.py',
-        '-t', 'interfaceaddtest.mako.hpp',
-        '-p', meson.project_source_root() + '/src/test/templates',
-        '-d', meson.project_source_root() + '/src/test/yaml/interfaceaddtest',
-        '-o', meson.current_build_dir() + '/interfaceaddtest.hpp',
-        '-e', meson.current_build_dir() + '/interfaceaddtest-errors.hpp',
-        'generate-cpp'
+        '-t',
+        'interfaceaddtest.mako.hpp',
+        '-p',
+        meson.project_source_root() + '/src/test/templates',
+        '-d',
+        meson.project_source_root() + '/src/test/yaml/interfaceaddtest',
+        '-o',
+        meson.current_build_dir() + '/interfaceaddtest.hpp',
+        '-e',
+        meson.current_build_dir() + '/interfaceaddtest-errors.hpp',
+        'generate-cpp',
     ],
     input: [
         'templates/interfaceaddtest.mako.hpp',
@@ -283,16 +320,20 @@
     output: 'interfaceaddtest.hpp',
 )
 
-interfaceaddtest_sources = [
-    interfaceaddtest_hpp,
-    'interfaceaddtest.cpp',
-]
+interfaceaddtest_sources = [interfaceaddtest_hpp, 'interfaceaddtest.cpp']
 
-test('interfaceaddtest.cpp',
-  executable(
-    'interfaceaddtest',
-    interfaceaddtest_sources,
-    build_by_default: false,
-    include_directories: ['..'],
-    dependencies: [gtest_dep, gmock_dep, phosphor_dbus_interfaces_dep, sdeventplus_dep]
-  ))
+test(
+    'interfaceaddtest.cpp',
+    executable(
+        'interfaceaddtest',
+        interfaceaddtest_sources,
+        build_by_default: false,
+        include_directories: ['..'],
+        dependencies: [
+            gtest_dep,
+            gmock_dep,
+            phosphor_dbus_interfaces_dep,
+            sdeventplus_dep,
+        ],
+    ),
+)