diff --git a/testdata/lvs/test_22c.lvsdb.2 b/testdata/lvs/test_22c.lvsdb.2
index a3bacb5a7..4e5c37050 100644
--- a/testdata/lvs/test_22c.lvsdb.2
+++ b/testdata/lvs/test_22c.lvsdb.2
@@ -31,11 +31,11 @@ layout(
  layer(l25)
  layer(l26)
  layer(l27)
- layer(l1)
+ layer(l22)
  layer(l2)
  layer(l4)
  layer(l6)
- layer(l22)
+ layer(l1)
 
  # Mask layer connectivity
  connect(l5 l5 l4)
@@ -54,21 +54,21 @@ layout(
  connect(l17 l18 l17 l26 l27)
  connect(l20 l20 l19)
  connect(l19 l20 l19 l27)
- connect(l21 l9 l21 l2 l22)
+ connect(l21 l9 l21 l22 l2)
  connect(l23 l9 l11 l23)
  connect(l24 l11 l13 l24)
  connect(l25 l13 l15 l25)
  connect(l26 l15 l17 l26)
  connect(l27 l17 l19 l27)
- connect(l1 l1)
+ connect(l22 l21 l22)
  connect(l2 l3 l21 l2 l4 l6)
  connect(l4 l5 l2 l4)
  connect(l6 l2 l6)
- connect(l22 l21 l22)
+ connect(l1 l1)
 
  # Global nets and connectivity
- global(l1 vss)
  global(l6 vss)
+ global(l1 vss)
 
  # Device class section
  class(active_res RES)
@@ -193,22 +193,22 @@ layout(
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
    rect(l21 (-5 -1010) (170 170))
-   polygon(l2 (-465 -1120) (0 340) (-105 0) (0 420) (525 0) (0 -760))
-   rect(l2 (-525 1670) (445 420))
-   rect(l22 (-125 -1190) (330 270))
+   rect(l22 (-250 -220) (330 270))
    rect(l22 (950 -960) (150 2010))
    rect(l22 (-1100 -1320) (950 150))
+   polygon(l2 (-1495 -1050) (0 340) (-105 0) (0 420) (525 0) (0 -760))
+   rect(l2 (-525 1670) (445 420))
   )
   net(4
    polygon(l9 (1485 760) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
    rect(l21 (-335 -650) (170 170))
-   polygon(l2 (-125 -1480) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
-   rect(l2 (-340 1670) (445 420))
-   rect(l22 (-650 -830) (330 270))
+   rect(l22 (-250 -220) (330 270))
    rect(l22 (-1280 -150) (950 150))
    rect(l22 (-1100 -1320) (150 2010))
+   polygon(l2 (1075 -2220) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
+   rect(l2 (-340 1670) (445 420))
   )
   net(5 name(vdd)
    rect(l5 (-385 1780) (2950 1300))
diff --git a/testdata/lvs/test_22d.lvsdb.2 b/testdata/lvs/test_22d.lvsdb.2
index 24c24136c..3a3bd09c8 100644
--- a/testdata/lvs/test_22d.lvsdb.2
+++ b/testdata/lvs/test_22d.lvsdb.2
@@ -31,11 +31,11 @@ layout(
  layer(l25)
  layer(l26)
  layer(l27)
- layer(l1)
+ layer(l22)
  layer(l2)
  layer(l4)
  layer(l6)
- layer(l22)
+ layer(l1)
 
  # Mask layer connectivity
  connect(l5 l5 l4)
@@ -54,21 +54,21 @@ layout(
  connect(l17 l18 l17 l26 l27)
  connect(l20 l20 l19)
  connect(l19 l20 l19 l27)
- connect(l21 l9 l21 l2 l22)
+ connect(l21 l9 l21 l22 l2)
  connect(l23 l9 l11 l23)
  connect(l24 l11 l13 l24)
  connect(l25 l13 l15 l25)
  connect(l26 l15 l17 l26)
  connect(l27 l17 l19 l27)
- connect(l1 l1)
+ connect(l22 l21 l22)
  connect(l2 l3 l21 l2 l4 l6)
  connect(l4 l5 l2 l4)
  connect(l6 l2 l6)
- connect(l22 l21 l22)
+ connect(l1 l1)
 
  # Global nets and connectivity
- global(l1 vss)
  global(l6 vss)
+ global(l1 vss)
 
  # Device class section
  class(active_res RES)
@@ -193,22 +193,22 @@ layout(
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
    rect(l21 (-5 -1010) (170 170))
-   polygon(l2 (-465 -1120) (0 340) (-105 0) (0 420) (525 0) (0 -760))
-   rect(l2 (-525 1670) (445 420))
-   rect(l22 (-125 -1190) (330 270))
+   rect(l22 (-250 -220) (330 270))
    rect(l22 (950 -960) (150 2010))
    rect(l22 (-1100 -1320) (950 150))
+   polygon(l2 (-1495 -1050) (0 340) (-105 0) (0 420) (525 0) (0 -760))
+   rect(l2 (-525 1670) (445 420))
   )
   net(4
    polygon(l9 (1485 760) (0 840) (-245 0) (0 170) (245 0) (0 560) (170 0) (0 -1570))
    rect(l21 (-170 80) (170 170))
    rect(l21 (-170 1070) (170 170))
    rect(l21 (-335 -650) (170 170))
-   polygon(l2 (-125 -1480) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
-   rect(l2 (-340 1670) (445 420))
-   rect(l22 (-650 -830) (330 270))
+   rect(l22 (-250 -220) (330 270))
    rect(l22 (-1280 -150) (950 150))
    rect(l22 (-1100 -1320) (150 2010))
+   polygon(l2 (1075 -2220) (0 760) (525 0) (0 -420) (-105 0) (0 -340))
+   rect(l2 (-340 1670) (445 420))
   )
   net(5 name(vdd)
    rect(l5 (-385 1780) (2950 1300))