diff --git a/comid/testcases/comid-1.cbor b/comid/testcases/comid-1.cbor
index 033b8dd..58dba91 100644
Binary files a/comid/testcases/comid-1.cbor and b/comid/testcases/comid-1.cbor differ
diff --git a/comid/testcases/comid-2.cbor b/comid/testcases/comid-2.cbor
index b3a34c6..4c8e045 100644
Binary files a/comid/testcases/comid-2.cbor and b/comid/testcases/comid-2.cbor differ
diff --git a/comid/testcases/comid-3.cbor b/comid/testcases/comid-3.cbor
index f47d1d1..4277e67 100644
Binary files a/comid/testcases/comid-3.cbor and b/comid/testcases/comid-3.cbor differ
diff --git a/comid/testcases/comid-design-cd.cbor b/comid/testcases/comid-design-cd.cbor
index d736d6c..643199a 100644
Binary files a/comid/testcases/comid-design-cd.cbor and b/comid/testcases/comid-design-cd.cbor differ
diff --git a/comid/testcases/comid-firmware-cd.cbor b/comid/testcases/comid-firmware-cd.cbor
index cb876a6..f9a68a7 100644
Binary files a/comid/testcases/comid-firmware-cd.cbor and b/comid/testcases/comid-firmware-cd.cbor differ
diff --git a/comid/testcases/src/comid-1.diag b/comid/testcases/src/comid-1.diag
index c756da1..759617b 100644
--- a/comid/testcases/src/comid-1.diag
+++ b/comid/testcases/src/comid-1.diag
@@ -20,18 +20,20 @@
           / comid.layer / 3 : 1
         }
       },
-      / measurement-map / {
-        / comid.mval / 1 : {
-          / comid.ver / 0 : {
-            / comid.version / 0 : "1.0.0",
-            / comid.version-scheme / 1 : 16384 / semver /
-          },
-          / comid.digests / 2 : [ [
-            / hash-alg-id / 1, / sha256 /
-            / hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
-          ] ]
+      [
+        / measurement-map / {
+          / comid.mval / 1 : {
+            / comid.ver / 0 : {
+              / comid.version / 0 : "1.0.0",
+              / comid.version-scheme / 1 : 16384 / semver /
+            },
+            / comid.digests / 2 : [ [
+              / hash-alg-id / 1, / sha256 /
+              / hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
+            ]]
+          }
         }
-      }
+      ]
     ] ]
   }
 }
diff --git a/comid/testcases/src/comid-2.diag b/comid/testcases/src/comid-2.diag
index ce3c275..f5309a0 100644
--- a/comid/testcases/src/comid-2.diag
+++ b/comid/testcases/src/comid-2.diag
@@ -21,14 +21,16 @@
             / comid.layer / 3 : 1
           }
         },
-        / measurement-map / {
-          / comid.mval / 1 : {
-            / comid.digests / 2 : [ [
-              / hash-alg-id / 1, / sha256 /
-              / hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
-            ] ]
+        [
+          / measurement-map / {
+            / comid.mval / 1 : {
+              / comid.digests / 2 : [ [
+                / hash-alg-id / 1, / sha256 /
+                / hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
+              ] ]
+            }
           }
-        }
+        ]
       ],
       [
         / environment-map / {
@@ -43,14 +45,16 @@
 	      / comid.index / 4 : 0
           }
         },
-        / measurement-map / {
-          / comid.mval / 1 : {
-            / comid.digests / 2 : [ [
-              / hash-alg-id / 1, / sha256 /
-              / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
-            ] ]
+        [
+          / measurement-map / {
+            / comid.mval / 1 : {
+              / comid.digests / 2 : [ [
+                / hash-alg-id / 1, / sha256 /
+                / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
+              ] ]
+            }
           }
-        }
+        ]
       ],
       [
         / environment-map / {
@@ -65,14 +69,16 @@
 	      / comid.index / 4 : 1
           }
         },
-        / measurement-map / {
-          / comid.mval / 1 : {
-            / comid.digests / 2 : [ [
-              / hash-alg-id / 1, / sha256 /
-              / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
-            ] ]
+        [
+          / measurement-map / {
+            / comid.mval / 1 : {
+              / comid.digests / 2 : [ [
+                / hash-alg-id / 1, / sha256 /
+                / hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
+              ] ]
+            }
           }
-        }
+        ]
       ]
     ],
     / comid.endorsed-triples / 1 : [ [
@@ -87,11 +93,13 @@
           / comid.layer / 3 : 0
         }
       },
-      / measurement-map / {
-        / comid.mval / 1 : {
-          / comid.svn / 1 : 552(1)
+      [
+        / measurement-map / {
+          / comid.mval / 1 : {
+            / comid.svn / 1 : 552(1)
+          }
         }
-      }
+      ]
     ] ]
   }
 }
diff --git a/comid/testcases/src/comid-3.diag b/comid/testcases/src/comid-3.diag
index c11fc23..ec0e66d 100644
--- a/comid/testcases/src/comid-3.diag
+++ b/comid/testcases/src/comid-3.diag
@@ -20,14 +20,16 @@
             / comid.model / 2 : "ACME RoadRunner Firmware"
           }
         },
-        / measurement-map / {
-          / comid.mkey / 0: 700,
-          / comid.mval / 1 : {
-            / comid.digests / 2 : [[
-            / hash-alg-id / 6, / sha-256-32 /
-            / hash-value /  h'ABCDEF00' ]]
+        [
+          / measurement-map / {
+            / comid.mkey / 0: 700,
+            / comid.mval / 1 : {
+              / comid.digests / 2 : [[
+              / hash-alg-id / 6, / sha-256-32 /
+              / hash-value /  h'ABCDEF00' ]]
+            }
           }
-        }
+        ]
       ]
     ]
   }
diff --git a/comid/testcases/src/comid-design-cd.diag b/comid/testcases/src/comid-design-cd.diag
index d3305b5..cae08c4 100644
--- a/comid/testcases/src/comid-design-cd.diag
+++ b/comid/testcases/src/comid-design-cd.diag
@@ -24,7 +24,8 @@
             / comid.layer / 3 : 2
         }
       },
-      / measurement-map /
+      [
+        / measurement-map /
         {
           / comid.mval / 1 : {
             / raw-value-group /
@@ -32,6 +33,7 @@
               / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
           }
         }
+      ]
     ],
       [
           / environment-map / {
@@ -43,17 +45,19 @@
              / comid.layer / 3 : 2
             }
           },
-          / measurement-map /
-           {
-            / comid.mval / 1 : {
-             / comid.digests / 2 : [
-              [
-               / hash-alg-id / 7, / SHA384 /
-               / hash-value / h'3FE18ECA4053879E017EF5EB7A3E5157659C5F9BB15B7D09959B8B8647822A4CC21C3AA6721CEF87F5BFA53495DB0833'
-              ]
-             ]
+          [
+            / measurement-map /
+             {
+               / comid.mval / 1 : {
+               / comid.digests / 2 : [
+                [
+                  / hash-alg-id / 7, / SHA384 /
+                  / hash-value / h'3FE18ECA4053879E017EF5EB7A3E5157659C5F9BB15B7D09959B8B8647822A4CC21C3AA6721CEF87F5BFA53495DB0833'
+                ]
+               ]
+              }
             }
-           }
+          ]
         ],
         [
           / environment-map / {
@@ -65,17 +69,19 @@
               / comid.layer / 3 : 2
             }
           },
-          / measurement-map /
-            {
-              / comid.mval / 1 : {
-                / comid.digests / 2 : [
-                 [
-                   / hash-alg-id / 7, / SHA384 /
-                   / hash-value / h'20FF681A0882E29B481953888936209CB53DF9C5AAEC606A2C24A0FB138595124B8E3F24A12771BC3854CC68B40361AD'
-                 ]
-                ]
+          [
+            / measurement-map /
+              {
+                / comid.mval / 1 : {
+                  / comid.digests / 2 : [
+                   [
+                     / hash-alg-id / 7, / SHA384 /
+                     / hash-value / h'20FF681A0882E29B481953888936209CB53DF9C5AAEC606A2C24A0FB138595124B8E3F24A12771BC3854CC68B40361AD'
+                   ]
+                  ]
+                }
               }
-            }
+          ]
         ],
         [
           / environment-map / {
@@ -86,14 +92,16 @@
               / comid.vendor / 1 : "fpgadesignsrus.example"
             }
            },
-           / measurement-map /
-             {
-               / comid.mval / 1 : {
-               / raw-value-group /
-                 / comid.raw-value / 4 : 560(h'000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'),
-                 / comid.raw-value-mask / 5 : h'466224343D681802C1506BBED7D7F00B969BADDD6346E4F2E7CE146692996F22A45814DE81D248F583B65F817B5FCEAB'
+           [
+             / measurement-map /
+               {
+                 / comid.mval / 1 : {
+                 / raw-value-group /
+                   / comid.raw-value / 4 : 560(h'000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'),
+                   / comid.raw-value-mask / 5 : h'466224343D681802C1506BBED7D7F00B969BADDD6346E4F2E7CE146692996F22A45814DE81D248F583B65F817B5FCEAB'
+                 }
                }
-             }
+           ]
         ]
       ],
       / comid.endorsed-triples / 1 : [
@@ -106,13 +114,15 @@
                / comid.vendor / 1 : "fpgadesignsrus.example"
              }
           },
-          / measurement-map / {
-            / comid.mval / 1 : {
-              / raw-value-group /
-                / comid.raw-value / 4 : 560(h'0000000000000000'),
-                / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
+          [
+            / measurement-map / {
+              / comid.mval / 1 : {
+                / raw-value-group /
+                  / comid.raw-value / 4 : 560(h'0000000000000000'),
+                  / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
+              }
             }
-          }
+          ]
         ]
       ]
     }
diff --git a/comid/testcases/src/comid-firmware-cd.diag b/comid/testcases/src/comid-firmware-cd.diag
index 1e8625f..d61ab7d 100644
--- a/comid/testcases/src/comid-firmware-cd.diag
+++ b/comid/testcases/src/comid-firmware-cd.diag
@@ -20,18 +20,20 @@
               / comid.index / 4 : 0
             }
           },
-          / measurement-map /
-            {
-              / comid.mval / 1 : {
-                / comid.svn / 1 : 552(1),
-                / comid.digests / 2 : [
-                  [
-                    / hash-alg-id / 7, / SHA384 /
-                    / hash-value / h'15E77D6F133252F1DB7044901313884F2977D2109B33C79F33E079BFC78865255C0FB733C240FDDA544B8215D7B8F815'
+          [
+            / measurement-map /
+              {
+                / comid.mval / 1 : {
+                  / comid.svn / 1 : 552(1),
+                  / comid.digests / 2 : [
+                    [
+                      / hash-alg-id / 7, / SHA384 /
+                      / hash-value / h'15E77D6F133252F1DB7044901313884F2977D2109B33C79F33E079BFC78865255C0FB733C240FDDA544B8215D7B8F815'
+                    ]
                   ]
-                ]
+                }
               }
-            }
+          ]
         ],
         [
           / environment-map / {
@@ -43,18 +45,20 @@
               / comid.index / 4 : 0
             }
           },
-          / measurement-map /
-            {
-              / comid.mval / 1 : {
-                / comid.svn / 1 : 552(1),
-                / comid.digests / 2 : [
-                  [
-                    / hash-alg-id / 7, / SHA384 /
-                    / hash-value / h'3D90B6BF003DA2D94EA5463F97FB3C53DDC51CFBA1E3E38EEF7AF071A67986595D22729131DF9FE80F5451EEF154F85E'
+          [
+            / measurement-map /
+              {
+                / comid.mval / 1 : {
+                  / comid.svn / 1 : 552(1),
+                  / comid.digests / 2 : [
+                    [
+                      / hash-alg-id / 7, / SHA384 /
+                      / hash-value / h'3D90B6BF003DA2D94EA5463F97FB3C53DDC51CFBA1E3E38EEF7AF071A67986595D22729131DF9FE80F5451EEF154F85E'
+                    ]
                   ]
-                ]
+                }
               }
-            }
+          ]
         ]
       ],
       / comid.endorsed-triples / 1 : [
@@ -67,13 +71,15 @@
               / comid.vendor / 1 : "fwmfginc.example"
            }
           },
-          / measurement-map / {
-           / comid.mval / 1 : {
-            / raw-value-group /
-             / comid.raw-value / 4 : 560(h'0000000000000000'),
-             / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
-           }
-          }
+          [
+            / measurement-map / {
+             / comid.mval / 1 : {
+              / raw-value-group /
+               / comid.raw-value / 4 : 560(h'0000000000000000'),
+               / comid.raw-value-mask / 5 : h'FFFFFFFF00000000'
+             }
+            }
+          ]
         ]
       ]
     }