diff --git a/tests/czechlight-cfg-fs/data/v0_sdn-inline_empty/expected.json b/tests/czechlight-cfg-fs/data/v0_sdn-inline_empty/expected.json
index a31986c..59f7990 100644
--- a/tests/czechlight-cfg-fs/data/v0_sdn-inline_empty/expected.json
+++ b/tests/czechlight-cfg-fs/data/v0_sdn-inline_empty/expected.json
@@ -1,4 +1,25 @@
 {
+  "ietf-alarms:alarms": {
+    "control": {
+      "alarm-shelving": {
+        "shelf": [
+          {
+            "name": "systemd journal upload",
+            "resource": [
+              "systemd-journal-upload.service"
+            ],
+            "alarm-type": [
+              {
+                "alarm-type-id": "velia-alarms:systemd-unit-failure",
+                "alarm-type-qualifier-match": ""
+              }
+            ],
+            "description": "Ignore systemd-journal-upload.service failures"
+          }
+        ]
+      }
+    }
+  },
   "ietf-interfaces:interfaces": {
     "interface": [
       {
diff --git a/tests/czechlight-cfg-fs/data/v0_sdn-inline_somedata/expected.json b/tests/czechlight-cfg-fs/data/v0_sdn-inline_somedata/expected.json
index ff070e2..41dafc9 100644
--- a/tests/czechlight-cfg-fs/data/v0_sdn-inline_somedata/expected.json
+++ b/tests/czechlight-cfg-fs/data/v0_sdn-inline_somedata/expected.json
@@ -1,4 +1,25 @@
 {
+  "ietf-alarms:alarms": {
+    "control": {
+      "alarm-shelving": {
+        "shelf": [
+          {
+            "name": "systemd journal upload",
+            "resource": [
+              "systemd-journal-upload.service"
+            ],
+            "alarm-type": [
+              {
+                "alarm-type-id": "velia-alarms:systemd-unit-failure",
+                "alarm-type-qualifier-match": ""
+              }
+            ],
+            "description": "Ignore systemd-journal-upload.service failures"
+          }
+        ]
+      }
+    }
+  },
   "ietf-interfaces:interfaces": {
     "interface": [
       {
diff --git a/tests/czechlight-cfg-fs/data/v0_sdn-roadm-line_empty/expected.json b/tests/czechlight-cfg-fs/data/v0_sdn-roadm-line_empty/expected.json
index 20975b2..edc8766 100644
--- a/tests/czechlight-cfg-fs/data/v0_sdn-roadm-line_empty/expected.json
+++ b/tests/czechlight-cfg-fs/data/v0_sdn-roadm-line_empty/expected.json
@@ -1,4 +1,25 @@
 {
+  "ietf-alarms:alarms": {
+    "control": {
+      "alarm-shelving": {
+        "shelf": [
+          {
+            "name": "systemd journal upload",
+            "resource": [
+              "systemd-journal-upload.service"
+            ],
+            "alarm-type": [
+              {
+                "alarm-type-id": "velia-alarms:systemd-unit-failure",
+                "alarm-type-qualifier-match": ""
+              }
+            ],
+            "description": "Ignore systemd-journal-upload.service failures"
+          }
+        ]
+      }
+    }
+  },
   "ietf-interfaces:interfaces": {
     "interface": [
       {
diff --git a/tests/czechlight-cfg-fs/data/v0_sdn-roadm-line_with_altered_initial_data/expected.json b/tests/czechlight-cfg-fs/data/v0_sdn-roadm-line_with_altered_initial_data/expected.json
index 20975b2..edc8766 100644
--- a/tests/czechlight-cfg-fs/data/v0_sdn-roadm-line_with_altered_initial_data/expected.json
+++ b/tests/czechlight-cfg-fs/data/v0_sdn-roadm-line_with_altered_initial_data/expected.json
@@ -1,4 +1,25 @@
 {
+  "ietf-alarms:alarms": {
+    "control": {
+      "alarm-shelving": {
+        "shelf": [
+          {
+            "name": "systemd journal upload",
+            "resource": [
+              "systemd-journal-upload.service"
+            ],
+            "alarm-type": [
+              {
+                "alarm-type-id": "velia-alarms:systemd-unit-failure",
+                "alarm-type-qualifier-match": ""
+              }
+            ],
+            "description": "Ignore systemd-journal-upload.service failures"
+          }
+        ]
+      }
+    }
+  },
   "ietf-interfaces:interfaces": {
     "interface": [
       {
diff --git a/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/cmdline b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/cmdline
new file mode 100644
index 0000000..6b1d906
--- /dev/null
+++ b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/cmdline
@@ -0,0 +1 @@
+czechlight=sdn-roadm-line
diff --git a/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/expected.json b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/expected.json
new file mode 100644
index 0000000..29fcd4a
--- /dev/null
+++ b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/expected.json
@@ -0,0 +1,23 @@
+{
+  "ietf-alarms:alarms": {
+    "control": {
+      "alarm-shelving": {
+        "shelf": [
+          {
+            "name": "systemd journal upload",
+            "resource": [
+              "systemd-journal-upload.service"
+            ],
+            "alarm-type": [
+              {
+                "alarm-type-id": "velia-alarms:systemd-unit-failure",
+                "alarm-type-qualifier-match": ""
+              }
+            ],
+            "description": "Ignore systemd-journal-upload.service failures"
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/startup.json b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/startup.json
new file mode 100644
index 0000000..2c63c08
--- /dev/null
+++ b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/startup.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/version b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/version
@@ -0,0 +1 @@
+2
diff --git a/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/xpath b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/xpath
new file mode 100644
index 0000000..68b9e92
--- /dev/null
+++ b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_empty_alarms/xpath
@@ -0,0 +1 @@
+/ietf-alarms:alarms
diff --git a/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/cmdline b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/cmdline
new file mode 100644
index 0000000..6b1d906
--- /dev/null
+++ b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/cmdline
@@ -0,0 +1 @@
+czechlight=sdn-roadm-line
diff --git a/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/expected.json b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/expected.json
new file mode 100644
index 0000000..29fcd4a
--- /dev/null
+++ b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/expected.json
@@ -0,0 +1,23 @@
+{
+  "ietf-alarms:alarms": {
+    "control": {
+      "alarm-shelving": {
+        "shelf": [
+          {
+            "name": "systemd journal upload",
+            "resource": [
+              "systemd-journal-upload.service"
+            ],
+            "alarm-type": [
+              {
+                "alarm-type-id": "velia-alarms:systemd-unit-failure",
+                "alarm-type-qualifier-match": ""
+              }
+            ],
+            "description": "Ignore systemd-journal-upload.service failures"
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/startup.json b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/startup.json
new file mode 100644
index 0000000..c49d5e7
--- /dev/null
+++ b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/startup.json
@@ -0,0 +1,16 @@
+{
+  "ietf-alarms:alarms": {
+    "control": {
+      "alarm-shelving": {
+        "shelf": [
+          {
+            "name": "systemd journal upload",
+            "resource": [],
+            "alarm-type": [],
+            "description": "Something something something"
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/version b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/version
@@ -0,0 +1 @@
+2
diff --git a/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/xpath b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/xpath
new file mode 100644
index 0000000..68b9e92
--- /dev/null
+++ b/tests/czechlight-cfg-fs/data/v2_sdn-roadm-line_samename/xpath
@@ -0,0 +1 @@
+/ietf-alarms:alarms