diff --git a/src/db/unit_tests/dbNetlistCompareTests.cc b/src/db/unit_tests/dbNetlistCompareTests.cc
index d01980573..60267320e 100644
--- a/src/db/unit_tests/dbNetlistCompareTests.cc
+++ b/src/db/unit_tests/dbNetlistCompareTests.cc
@@ -586,8 +586,8 @@ TEST(1_SimpleInverterSkippedDevices)
      "match_pins $3 $2\n"
      "match_devices $3 $1\n"
      "match_devices_with_different_parameters $2 $2\n"
-     "device_mismatch (null) $3\n"
      "match_devices $1 $4\n"
+     "device_mismatch (null) $3\n"
      "end_circuit INV INV NOMATCH"
   );
   EXPECT_EQ (good, false);
@@ -622,8 +622,8 @@ TEST(1_SimpleInverterSkippedDevices)
     "  terminal $3[S]:$1[D]\n"
     "  pin $3:$2\n"
     " device (null):$3 [Mismatch]\n"
-    " device $3:$1 [Match]\n"
     " device $2:$2 [MatchWithWarning]\n"
+    " device $3:$1 [Match]\n"
     " device $1:$4 [Match]\n"
   );
   EXPECT_EQ (good, false);
@@ -1283,13 +1283,13 @@ TEST(6_BufferTwoPathsAdditionalDevices)
     "match_pins $3 $2\n"
     "match_devices $5 $1\n"
     "match_devices $7 $2\n"
-    "device_mismatch (null) $3\n"
     "match_devices $1 $4\n"
     "match_devices $3 $5\n"
     "match_devices $6 $6\n"
     "match_devices $8 $7\n"
     "match_devices $2 $8\n"
     "match_devices $4 $9\n"
+    "device_mismatch (null) $3\n"
     "device_mismatch $9 (null)\n"
     "end_circuit BUF BUF NOMATCH"
   );
@@ -1414,8 +1414,8 @@ TEST(7_ResistorsPlusOneDevice)
     "match_pins $2 $2\n"
     "match_devices $1 $1\n"
     "match_devices $3 $2\n"
-    "device_mismatch (null) $3\n"
     "match_devices $2 $4\n"
+    "device_mismatch (null) $3\n"
     "end_circuit TRIANGLE TRIANGLE NOMATCH"
   );
   EXPECT_EQ (good, false);
@@ -1496,9 +1496,8 @@ TEST(8_DiodesDontMatchOnSwappedPins)
     "match_pins $1 $0\n"
     "match_pins $2 $1\n"
     "match_devices $1 $1\n"
-    "device_mismatch (null) $2\n"
     "match_devices $3 $3\n"
-    "device_mismatch $2 (null)\n"
+    "device_mismatch $2 $2\n"
     "end_circuit TRIANGLE TRIANGLE NOMATCH"
   );
   EXPECT_EQ (good, false);
@@ -1676,8 +1675,7 @@ TEST(11_MismatchingSubcircuits)
     "match_pins $2 $0\n"
     "match_pins $3 $2\n"
     "match_devices $2 $1\n"
-    "device_mismatch (null) $2\n"
-    "device_mismatch $1 (null)\n"
+    "device_mismatch $1 $2\n"
     "end_circuit INV INV NOMATCH\n"
     "begin_circuit TOP TOP\n"
     "match_nets OUT OUT\n"
@@ -1709,13 +1707,11 @@ TEST(11_MismatchingSubcircuits)
     " pin $3:$2 [Match]\n"
     " net IN:IN [Mismatch]\n"
     "  terminal (null):$2[S]\n"
-    "  terminal (null):$2[G]\n"
-    "  terminal $1[G]:(null)\n"
+    "  terminal $1[G]:$2[G]\n"
     "  terminal $2[G]:$1[G]\n"
     "  pin $0:$1\n"
     " net OUT:OUT [Mismatch]\n"
-    "  terminal (null):$2[D]\n"
-    "  terminal $1[D]:(null)\n"
+    "  terminal $1[D]:$2[D]\n"
     "  terminal $2[D]:$1[S]\n"
     "  pin $1:$3\n"
     " net VDD:VDD [Mismatch]\n"
@@ -1724,9 +1720,8 @@ TEST(11_MismatchingSubcircuits)
     " net VSS:VSS [Match]\n"
     "  terminal $2[S]:$1[D]\n"
     "  pin $3:$2\n"
-    " device (null):$2 [Mismatch]\n"
-    " device $1:(null) [Mismatch]\n"
     " device $2:$1 [Match]\n"
+    " device $1:$2 [Mismatch]\n"
     "TOP:TOP [Match]:\n"
     " pin $0:$2 [Match]\n"
     " pin $1:$0 [Match]\n"
@@ -2106,10 +2101,10 @@ TEST(14_Subcircuit2NandMismatchNoSwap)
     " net VSS:VSS [Match]\n"
     "  terminal $3[S]:$3[S]\n"
     "  pin $4:$4\n"
-    " device $1:$1 [Match]\n"
-    " device $2:$2 [Match]\n"
     " device $3:$3 [Match]\n"
     " device $4:$4 [Match]\n"
+    " device $1:$1 [Match]\n"
+    " device $2:$2 [Match]\n"
     "TOP:TOP [NoMatch]:\n"
     " pin (null):$0 [Mismatch]\n"
     " pin $0:(null) [Mismatch]\n"
diff --git a/testdata/lvs/ringo_simple.lvsdb.1 b/testdata/lvs/ringo_simple.lvsdb.1
index 0b4189af7..a68dae475 100644
--- a/testdata/lvs/ringo_simple.lvsdb.1
+++ b/testdata/lvs/ringo_simple.lvsdb.1
@@ -905,8 +905,8 @@ xref(
    pin(5 5 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
    device(2 2 match)
+   device(1 1 match)
   )
  )
  circuit(ND2X1 ND2X1 match
@@ -926,10 +926,10 @@ xref(
    pin(6 6 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
-   device(2 2 match)
    device(3 3 match)
    device(4 4 match)
+   device(1 1 match)
+   device(2 2 match)
   )
  )
  circuit(RINGO RINGO match
@@ -954,10 +954,6 @@ xref(
    pin(2 4 match)
    pin(1 1 match)
    pin(4 0 match)
-   circuit(1 1 match)
-   circuit(10 10 match)
-   circuit(11 11 match)
-   circuit(12 12 match)
    circuit(2 2 match)
    circuit(3 3 match)
    circuit(4 4 match)
@@ -966,6 +962,10 @@ xref(
    circuit(7 7 match)
    circuit(8 8 match)
    circuit(9 9 match)
+   circuit(10 10 match)
+   circuit(11 11 match)
+   circuit(12 12 match)
+   circuit(1 1 match)
   )
  )
 )
diff --git a/testdata/lvs/ringo_simple_blackboxing.lvsdb b/testdata/lvs/ringo_simple_blackboxing.lvsdb
index 15e2a8cc5..0e9ead554 100644
--- a/testdata/lvs/ringo_simple_blackboxing.lvsdb
+++ b/testdata/lvs/ringo_simple_blackboxing.lvsdb
@@ -537,10 +537,6 @@ xref(
    pin(2 4 match)
    pin(1 0 match)
    pin(4 1 match)
-   circuit(1 1 match)
-   circuit(5 10 match)
-   circuit(6 11 match)
-   circuit(7 12 match)
    circuit(2 2 match)
    circuit(3 3 match)
    circuit(17 4 match)
@@ -549,6 +545,10 @@ xref(
    circuit(20 7 match)
    circuit(21 8 match)
    circuit(4 9 match)
+   circuit(5 10 match)
+   circuit(6 11 match)
+   circuit(7 12 match)
+   circuit(1 1 match)
   )
  )
 )
diff --git a/testdata/lvs/ringo_simple_device_scaling.lvsdb.1 b/testdata/lvs/ringo_simple_device_scaling.lvsdb.1
index 7d2b9b69e..d4ba4694d 100644
--- a/testdata/lvs/ringo_simple_device_scaling.lvsdb.1
+++ b/testdata/lvs/ringo_simple_device_scaling.lvsdb.1
@@ -905,8 +905,8 @@ xref(
    pin(5 5 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
    device(2 2 match)
+   device(1 1 match)
   )
  )
  circuit(ND2X1 ND2X1 match
@@ -926,10 +926,10 @@ xref(
    pin(6 6 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
-   device(2 2 match)
    device(3 3 match)
    device(4 4 match)
+   device(1 1 match)
+   device(2 2 match)
   )
  )
  circuit(RINGO RINGO match
@@ -954,10 +954,6 @@ xref(
    pin(2 4 match)
    pin(1 1 match)
    pin(4 0 match)
-   circuit(1 1 match)
-   circuit(10 10 match)
-   circuit(11 11 match)
-   circuit(12 12 match)
    circuit(2 2 match)
    circuit(3 3 match)
    circuit(4 4 match)
@@ -966,6 +962,10 @@ xref(
    circuit(7 7 match)
    circuit(8 8 match)
    circuit(9 9 match)
+   circuit(10 10 match)
+   circuit(11 11 match)
+   circuit(12 12 match)
+   circuit(1 1 match)
   )
  )
 )
diff --git a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1 b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1
index a5842042d..2760c734e 100644
--- a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1
+++ b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1
@@ -924,8 +924,8 @@ xref(
    pin(5 5 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
    device(2 2 match)
+   device(1 1 match)
   )
  )
  circuit(ND2X1 ND2X1 match
@@ -945,10 +945,10 @@ xref(
    pin(6 6 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
-   device(2 2 match)
    device(3 3 match)
    device(4 4 match)
+   device(1 1 match)
+   device(2 2 match)
   )
  )
  circuit(RINGO RINGO match
@@ -973,10 +973,6 @@ xref(
    pin(2 4 match)
    pin(1 1 match)
    pin(4 0 match)
-   circuit(1 1 match)
-   circuit(10 10 match)
-   circuit(11 11 match)
-   circuit(12 12 match)
    circuit(2 2 match)
    circuit(3 3 match)
    circuit(4 4 match)
@@ -985,6 +981,10 @@ xref(
    circuit(7 7 match)
    circuit(8 8 match)
    circuit(9 9 match)
+   circuit(10 10 match)
+   circuit(11 11 match)
+   circuit(12 12 match)
+   circuit(1 1 match)
   )
  )
 )
diff --git a/testdata/lvs/ringo_simple_io.lvsdb.1 b/testdata/lvs/ringo_simple_io.lvsdb.1
index 9a02f4996..edb8e90ce 100644
--- a/testdata/lvs/ringo_simple_io.lvsdb.1
+++ b/testdata/lvs/ringo_simple_io.lvsdb.1
@@ -825,8 +825,8 @@ Z(
    P(5 5 1)
    P(0 0 1)
    P(2 2 1)
-   D(1 1 1)
    D(2 2 1)
+   D(1 1 1)
   )
  )
  X(ND2X1 ND2X1 1
@@ -846,10 +846,10 @@ Z(
    P(6 6 1)
    P(0 0 1)
    P(2 2 1)
-   D(1 1 1)
-   D(2 2 1)
    D(3 3 1)
    D(4 4 1)
+   D(1 1 1)
+   D(2 2 1)
   )
  )
  X(RINGO RINGO 1
@@ -874,10 +874,6 @@ Z(
    P(2 4 1)
    P(1 1 1)
    P(4 0 1)
-   X(1 1 1)
-   X(10 10 1)
-   X(11 11 1)
-   X(12 12 1)
    X(2 2 1)
    X(3 3 1)
    X(4 4 1)
@@ -886,6 +882,10 @@ Z(
    X(7 7 1)
    X(8 8 1)
    X(9 9 1)
+   X(10 10 1)
+   X(11 11 1)
+   X(12 12 1)
+   X(1 1 1)
   )
  )
 )
diff --git a/testdata/lvs/ringo_simple_io2.lvsdb.1 b/testdata/lvs/ringo_simple_io2.lvsdb.1
index 0b4189af7..a68dae475 100644
--- a/testdata/lvs/ringo_simple_io2.lvsdb.1
+++ b/testdata/lvs/ringo_simple_io2.lvsdb.1
@@ -905,8 +905,8 @@ xref(
    pin(5 5 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
    device(2 2 match)
+   device(1 1 match)
   )
  )
  circuit(ND2X1 ND2X1 match
@@ -926,10 +926,10 @@ xref(
    pin(6 6 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
-   device(2 2 match)
    device(3 3 match)
    device(4 4 match)
+   device(1 1 match)
+   device(2 2 match)
   )
  )
  circuit(RINGO RINGO match
@@ -954,10 +954,6 @@ xref(
    pin(2 4 match)
    pin(1 1 match)
    pin(4 0 match)
-   circuit(1 1 match)
-   circuit(10 10 match)
-   circuit(11 11 match)
-   circuit(12 12 match)
    circuit(2 2 match)
    circuit(3 3 match)
    circuit(4 4 match)
@@ -966,6 +962,10 @@ xref(
    circuit(7 7 match)
    circuit(8 8 match)
    circuit(9 9 match)
+   circuit(10 10 match)
+   circuit(11 11 match)
+   circuit(12 12 match)
+   circuit(1 1 match)
   )
  )
 )
diff --git a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1 b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1
index f29249ba8..bee7ccfc8 100644
--- a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1
+++ b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1
@@ -905,8 +905,8 @@ xref(
    pin(5 5 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
    device(2 2 match)
+   device(1 1 match)
   )
  )
  circuit(nd2X1 ND2X1 match
@@ -926,10 +926,10 @@ xref(
    pin(6 6 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
-   device(2 2 match)
    device(3 3 match)
    device(4 4 match)
+   device(1 1 match)
+   device(2 2 match)
   )
  )
  circuit(top RINGO match
@@ -953,10 +953,6 @@ xref(
    pin(2 4 match)
    pin(1 1 match)
    pin(4 0 match)
-   circuit(1 1 match)
-   circuit(10 10 match)
-   circuit(11 11 match)
-   circuit(12 12 match)
    circuit(2 2 match)
    circuit(3 3 match)
    circuit(4 4 match)
@@ -965,6 +961,10 @@ xref(
    circuit(7 7 match)
    circuit(8 8 match)
    circuit(9 9 match)
+   circuit(10 10 match)
+   circuit(11 11 match)
+   circuit(12 12 match)
+   circuit(1 1 match)
   )
  )
 )
diff --git a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1 b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1
index a2aedc01d..4c98e224d 100644
--- a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1
+++ b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1
@@ -905,8 +905,8 @@ xref(
    pin(5 5 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
    device(2 2 match)
+   device(1 1 match)
   )
  )
  circuit(ND2X1 ND2X1 match
@@ -926,10 +926,10 @@ xref(
    pin(6 6 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
-   device(2 2 match)
    device(3 3 match)
    device(4 4 match)
+   device(1 1 match)
+   device(2 2 match)
   )
  )
  circuit(RINGO RINGO match
@@ -954,10 +954,6 @@ xref(
    pin(2 4 match)
    pin(1 1 match)
    pin(4 0 match)
-   circuit(1 1 match)
-   circuit(10 10 match)
-   circuit(11 11 match)
-   circuit(12 12 match)
    circuit(2 2 match)
    circuit(3 3 match)
    circuit(4 4 match)
@@ -966,6 +962,10 @@ xref(
    circuit(7 7 match)
    circuit(8 8 match)
    circuit(9 9 match)
+   circuit(10 10 match)
+   circuit(11 11 match)
+   circuit(12 12 match)
+   circuit(1 1 match)
   )
  )
 )
diff --git a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1 b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1
index c3f53f62f..7fc246d6a 100644
--- a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1
+++ b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1
@@ -905,8 +905,8 @@ xref(
    pin(5 5 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
    device(2 2 match)
+   device(1 1 match)
   )
  )
  circuit(ND2X1 ND2X1 match
@@ -926,10 +926,10 @@ xref(
    pin(6 6 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
-   device(2 2 match)
    device(3 3 match)
    device(4 4 match)
+   device(1 1 match)
+   device(2 2 match)
   )
  )
  circuit(RINGO RINGO match
@@ -954,10 +954,6 @@ xref(
    pin(2 4 match)
    pin(1 1 match)
    pin(4 0 match)
-   circuit(1 1 match)
-   circuit(10 10 match)
-   circuit(11 11 match)
-   circuit(12 12 match)
    circuit(2 2 match)
    circuit(3 3 match)
    circuit(4 4 match)
@@ -966,6 +962,10 @@ xref(
    circuit(7 7 match)
    circuit(8 8 match)
    circuit(9 9 match)
+   circuit(10 10 match)
+   circuit(11 11 match)
+   circuit(12 12 match)
+   circuit(1 1 match)
   )
  )
 )
diff --git a/testdata/lvs/ringo_simple_simplification.lvsdb.1 b/testdata/lvs/ringo_simple_simplification.lvsdb.1
index f73156a89..b0e4b5871 100644
--- a/testdata/lvs/ringo_simple_simplification.lvsdb.1
+++ b/testdata/lvs/ringo_simple_simplification.lvsdb.1
@@ -1078,8 +1078,8 @@ xref(
    pin(5 5 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
    device(2 2 match)
+   device(1 1 match)
   )
  )
  circuit(INVX2 INVX2 match
@@ -1096,8 +1096,8 @@ xref(
    pin(5 5 match)
    pin(1 0 match)
    pin(3 2 match)
-   device(1 1 match)
    device(3 2 match)
+   device(1 1 match)
   )
  )
  circuit(ND2X1 ND2X1 match
@@ -1117,10 +1117,10 @@ xref(
    pin(6 6 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
-   device(2 2 match)
    device(3 3 match)
    device(4 4 match)
+   device(1 1 match)
+   device(2 2 match)
   )
  )
  circuit(RINGO RINGO match
@@ -1145,10 +1145,6 @@ xref(
    pin(2 4 match)
    pin(1 1 match)
    pin(4 0 match)
-   circuit(1 1 match)
-   circuit(5 10 match)
-   circuit(6 11 match)
-   circuit(7 12 match)
    circuit(2 2 match)
    circuit(3 3 match)
    circuit(17 4 match)
@@ -1157,6 +1153,10 @@ xref(
    circuit(20 7 match)
    circuit(21 8 match)
    circuit(4 9 match)
+   circuit(5 10 match)
+   circuit(6 11 match)
+   circuit(7 12 match)
+   circuit(1 1 match)
   )
  )
 )
diff --git a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1 b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1
index f73156a89..b0e4b5871 100644
--- a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1
+++ b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1
@@ -1078,8 +1078,8 @@ xref(
    pin(5 5 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
    device(2 2 match)
+   device(1 1 match)
   )
  )
  circuit(INVX2 INVX2 match
@@ -1096,8 +1096,8 @@ xref(
    pin(5 5 match)
    pin(1 0 match)
    pin(3 2 match)
-   device(1 1 match)
    device(3 2 match)
+   device(1 1 match)
   )
  )
  circuit(ND2X1 ND2X1 match
@@ -1117,10 +1117,10 @@ xref(
    pin(6 6 match)
    pin(0 0 match)
    pin(2 2 match)
-   device(1 1 match)
-   device(2 2 match)
    device(3 3 match)
    device(4 4 match)
+   device(1 1 match)
+   device(2 2 match)
   )
  )
  circuit(RINGO RINGO match
@@ -1145,10 +1145,6 @@ xref(
    pin(2 4 match)
    pin(1 1 match)
    pin(4 0 match)
-   circuit(1 1 match)
-   circuit(5 10 match)
-   circuit(6 11 match)
-   circuit(7 12 match)
    circuit(2 2 match)
    circuit(3 3 match)
    circuit(17 4 match)
@@ -1157,6 +1153,10 @@ xref(
    circuit(20 7 match)
    circuit(21 8 match)
    circuit(4 9 match)
+   circuit(5 10 match)
+   circuit(6 11 match)
+   circuit(7 12 match)
+   circuit(1 1 match)
   )
  )
 )