diff --git a/src/db/unit_tests/dbLayoutToNetlistTests.cc b/src/db/unit_tests/dbLayoutToNetlistTests.cc
index 8967d2063..b250040ce 100644
--- a/src/db/unit_tests/dbLayoutToNetlistTests.cc
+++ b/src/db/unit_tests/dbLayoutToNetlistTests.cc
@@ -375,7 +375,7 @@ TEST(1_BasicExtraction)
   EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (5.3, 0.0))), "RINGO:VSS");
 
   EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (2.6, 1.0))), "RINGO:$I39");
-  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (6.4, 1.0))), "RINGO:$I2");
+  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (6.4, 1.0))), "RINGO:$I12");
 
   //  test build_all_nets
 
@@ -576,7 +576,7 @@ TEST(1_BasicExtraction)
   EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (5.3, 0.0))), "RINGO:VSS");
 
   EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (2.6, 1.0))), "RINGO:$I39");
-  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (6.4, 1.0))), "RINGO:$I2");
+  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (6.4, 1.0))), "RINGO:$I12");
 
   //  use this opportunity to check joining of nets with cluster joining
   db::Circuit *top = l2n.netlist ()->circuit_by_name ("RINGO");
@@ -616,7 +616,7 @@ TEST(1_BasicExtraction)
   EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (5.3, 0.0))), "RINGO:VDD,VSS");
 
   EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (2.6, 1.0))), "RINGO:$I39");
-  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (6.4, 1.0))), "RINGO:$I2");
+  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (6.4, 1.0))), "RINGO:$I12");
 
   //  compare the collected test data
 
diff --git a/src/lvs/unit_tests/lvsTests.cc b/src/lvs/unit_tests/lvsTests.cc
index d5f8a4dc6..7e82ce590 100644
--- a/src/lvs/unit_tests/lvsTests.cc
+++ b/src/lvs/unit_tests/lvsTests.cc
@@ -154,7 +154,7 @@ TEST(16_private)
 TEST(17_private)
 {
   test_is_long_runner ();
-  run_test (_this, "test_17.lylvs", "test_17b.cir.gz", "test_17.gds.gz", true, "test_17b_6.lvsdb");
+  run_test (_this, "test_17.lylvs", "test_17b.cir.gz", "test_17.gds.gz", true, "test_17b_7.lvsdb");
 }
 
 TEST(18_private)
@@ -172,7 +172,7 @@ TEST(19_private)
 TEST(20_private)
 {
   // test_is_long_runner ();
-  run_test (_this, "test_20.lylvs", "test_20.cir.gz", "test_20.gds.gz", true, "test_20_5.lvsdb");
+  run_test (_this, "test_20.lylvs", "test_20.cir.gz", "test_20.gds.gz", true, "test_20_6.lvsdb");
 }
 
 TEST(21_private)
diff --git a/testdata/algo/device_extract_au13_circuits.gds b/testdata/algo/device_extract_au13_circuits.gds
index 131540011..b396d222d 100644
Binary files a/testdata/algo/device_extract_au13_circuits.gds and b/testdata/algo/device_extract_au13_circuits.gds differ
diff --git a/testdata/algo/device_extract_au14_circuits.gds b/testdata/algo/device_extract_au14_circuits.gds
index 11fecc306..237ca6577 100644
Binary files a/testdata/algo/device_extract_au14_circuits.gds and b/testdata/algo/device_extract_au14_circuits.gds differ
diff --git a/testdata/algo/device_extract_au1_dup_inst_with_rec_nets.gds b/testdata/algo/device_extract_au1_dup_inst_with_rec_nets.gds
index 8df8f4374..a010888e3 100644
Binary files a/testdata/algo/device_extract_au1_dup_inst_with_rec_nets.gds and b/testdata/algo/device_extract_au1_dup_inst_with_rec_nets.gds differ
diff --git a/testdata/algo/device_extract_au1_joined_nets.gds b/testdata/algo/device_extract_au1_joined_nets.gds
index 919bc22a3..7ce83b1e2 100644
Binary files a/testdata/algo/device_extract_au1_joined_nets.gds and b/testdata/algo/device_extract_au1_joined_nets.gds differ
diff --git a/testdata/algo/device_extract_au1_rebuild_nr.gds b/testdata/algo/device_extract_au1_rebuild_nr.gds
index 3432e15c6..e4b741123 100644
Binary files a/testdata/algo/device_extract_au1_rebuild_nr.gds and b/testdata/algo/device_extract_au1_rebuild_nr.gds differ
diff --git a/testdata/algo/device_extract_au1_rebuild_pf.gds b/testdata/algo/device_extract_au1_rebuild_pf.gds
index 72911a17f..05aa0b980 100644
Binary files a/testdata/algo/device_extract_au1_rebuild_pf.gds and b/testdata/algo/device_extract_au1_rebuild_pf.gds differ
diff --git a/testdata/algo/device_extract_au1_rebuild_pr.gds b/testdata/algo/device_extract_au1_rebuild_pr.gds
index ef85fab2d..9725c79bf 100644
Binary files a/testdata/algo/device_extract_au1_rebuild_pr.gds and b/testdata/algo/device_extract_au1_rebuild_pr.gds differ
diff --git a/testdata/algo/device_extract_au1_with_rec_nets.gds b/testdata/algo/device_extract_au1_with_rec_nets.gds
index 9768f35d5..7539914d7 100644
Binary files a/testdata/algo/device_extract_au1_with_rec_nets.gds and b/testdata/algo/device_extract_au1_with_rec_nets.gds differ
diff --git a/testdata/algo/device_extract_au2_with_rec_nets.gds b/testdata/algo/device_extract_au2_with_rec_nets.gds
index a92ab6744..0a0d7faa3 100644
Binary files a/testdata/algo/device_extract_au2_with_rec_nets.gds and b/testdata/algo/device_extract_au2_with_rec_nets.gds differ
diff --git a/testdata/algo/device_extract_au3_with_rec_nets.gds b/testdata/algo/device_extract_au3_with_rec_nets.gds
index 8e5c0cd09..969f00594 100644
Binary files a/testdata/algo/device_extract_au3_with_rec_nets.gds and b/testdata/algo/device_extract_au3_with_rec_nets.gds differ
diff --git a/testdata/algo/device_extract_au4_with_rec_nets.gds b/testdata/algo/device_extract_au4_with_rec_nets.gds
index 6ecb58431..9995ce84d 100644
Binary files a/testdata/algo/device_extract_au4_with_rec_nets.gds and b/testdata/algo/device_extract_au4_with_rec_nets.gds differ
diff --git a/testdata/algo/device_extract_au5_flattened_circuits.gds b/testdata/algo/device_extract_au5_flattened_circuits.gds
index 18d0b794d..18d3b56f3 100644
Binary files a/testdata/algo/device_extract_au5_flattened_circuits.gds and b/testdata/algo/device_extract_au5_flattened_circuits.gds differ
diff --git a/testdata/algo/device_extract_au5_with_rec_nets.gds b/testdata/algo/device_extract_au5_with_rec_nets.gds
index 1c310db0b..41fde217c 100644
Binary files a/testdata/algo/device_extract_au5_with_rec_nets.gds and b/testdata/algo/device_extract_au5_with_rec_nets.gds differ
diff --git a/testdata/algo/hc_test_au11.gds b/testdata/algo/hc_test_au11.gds
index 51611f9e7..002284700 100644
Binary files a/testdata/algo/hc_test_au11.gds and b/testdata/algo/hc_test_au11.gds differ
diff --git a/testdata/algo/l2n_writer_au.txt b/testdata/algo/l2n_writer_au.txt
index 23b74e85a..cad572677 100644
--- a/testdata/algo/l2n_writer_au.txt
+++ b/testdata/algo/l2n_writer_au.txt
@@ -140,11 +140,11 @@ circuit(INV2
   rect(nsd (-1675 -925) (550 950))
  )
  net(5 name($5)
-  rect(diff_cont (-110 2490) (220 220))
-  rect(diff_cont (-220 180) (220 220))
-  rect(diff_cont (-220 -220) (220 220))
+  rect(diff_cont (-110 2890) (220 220))
   rect(diff_cont (-220 -620) (220 220))
-  rect(metal1 (-290 -290) (360 760))
+  rect(diff_cont (-220 -220) (220 220))
+  rect(diff_cont (-220 180) (220 220))
+  rect(metal1 (-290 -690) (360 760))
   rect(metal1 (-360 -760) (360 760))
   rect(via1 (-305 -705) (250 250))
   rect(via1 (-250 150) (250 250))
@@ -244,14 +244,14 @@ circuit(RINGO
  net(12 name($I39))
  net(13 name($I38))
  net(14 name($I19))
- net(15 name($I8))
- net(16 name($I7))
- net(17 name($I6))
- net(18 name($I5))
- net(19 name($I4))
- net(20 name($I3))
- net(21 name($I2))
- net(22 name($I1))
+ net(15 name($I18))
+ net(16 name($I17))
+ net(17 name($I16))
+ net(18 name($I15))
+ net(19 name($I14))
+ net(20 name($I13))
+ net(21 name($I12))
+ net(22 name($I11))
 
  # Outgoing pins and their connections to nets
  pin(1 name(FB))
@@ -274,61 +274,61 @@ circuit(RINGO
   pin(3 3)
   pin(4 4)
  )
- circuit(3 INV2 location(2640 0)
-  pin(0 14)
-  pin(1 12)
-  pin(2 22)
-  pin(3 3)
-  pin(4 4)
- )
- circuit(4 INV2 location(5280 0)
-  pin(0 22)
-  pin(1 11)
-  pin(2 21)
-  pin(3 3)
-  pin(4 4)
- )
- circuit(5 INV2 location(7920 0)
-  pin(0 21)
-  pin(1 10)
-  pin(2 20)
-  pin(3 3)
-  pin(4 4)
- )
- circuit(6 INV2 location(10560 0)
-  pin(0 20)
-  pin(1 9)
-  pin(2 19)
-  pin(3 3)
-  pin(4 4)
- )
- circuit(7 INV2 location(13200 0)
-  pin(0 19)
-  pin(1 8)
-  pin(2 18)
-  pin(3 3)
-  pin(4 4)
- )
- circuit(8 INV2 location(15840 0)
-  pin(0 18)
-  pin(1 7)
-  pin(2 17)
-  pin(3 3)
-  pin(4 4)
- )
- circuit(9 INV2 location(18480 0)
-  pin(0 17)
-  pin(1 6)
-  pin(2 16)
-  pin(3 3)
-  pin(4 4)
- )
- circuit(10 INV2 location(21120 0)
+ circuit(3 INV2 location(21120 0)
   pin(0 16)
   pin(1 5)
   pin(2 15)
   pin(3 3)
   pin(4 4)
  )
+ circuit(4 INV2 location(18480 0)
+  pin(0 17)
+  pin(1 6)
+  pin(2 16)
+  pin(3 3)
+  pin(4 4)
+ )
+ circuit(5 INV2 location(15840 0)
+  pin(0 18)
+  pin(1 7)
+  pin(2 17)
+  pin(3 3)
+  pin(4 4)
+ )
+ circuit(6 INV2 location(13200 0)
+  pin(0 19)
+  pin(1 8)
+  pin(2 18)
+  pin(3 3)
+  pin(4 4)
+ )
+ circuit(7 INV2 location(10560 0)
+  pin(0 20)
+  pin(1 9)
+  pin(2 19)
+  pin(3 3)
+  pin(4 4)
+ )
+ circuit(8 INV2 location(7920 0)
+  pin(0 21)
+  pin(1 10)
+  pin(2 20)
+  pin(3 3)
+  pin(4 4)
+ )
+ circuit(9 INV2 location(5280 0)
+  pin(0 22)
+  pin(1 11)
+  pin(2 21)
+  pin(3 3)
+  pin(4 4)
+ )
+ circuit(10 INV2 location(2640 0)
+  pin(0 14)
+  pin(1 12)
+  pin(2 22)
+  pin(3 3)
+  pin(4 4)
+ )
 
 )
diff --git a/testdata/algo/l2n_writer_au_2.gds b/testdata/algo/l2n_writer_au_2.gds
index 37ba81471..a4f45414f 100644
Binary files a/testdata/algo/l2n_writer_au_2.gds and b/testdata/algo/l2n_writer_au_2.gds differ
diff --git a/testdata/algo/l2n_writer_au_2b.txt b/testdata/algo/l2n_writer_au_2b.txt
index 0137b1b11..1e5e23d11 100644
--- a/testdata/algo/l2n_writer_au_2b.txt
+++ b/testdata/algo/l2n_writer_au_2b.txt
@@ -169,11 +169,11 @@ circuit(INV2
   rect(nsd (-1515 -385) (550 950))
  )
  net(6 name(VDD)
-  rect(diff_cont (-110 2490) (220 220))
-  rect(diff_cont (-220 180) (220 220))
-  rect(diff_cont (-220 -220) (220 220))
+  rect(diff_cont (-110 2890) (220 220))
   rect(diff_cont (-220 -620) (220 220))
-  rect(metal1 (-290 -290) (360 760))
+  rect(diff_cont (-220 -220) (220 220))
+  rect(diff_cont (-220 180) (220 220))
+  rect(metal1 (-290 -690) (360 760))
   rect(metal1 (-360 -760) (360 760))
   rect(via1 (-305 -705) (250 250))
   rect(via1 (-250 150) (250 250))
@@ -345,9 +345,9 @@ circuit(RINGO
  net(7 name($I23))
  net(8 name($I22))
  net(9 name($I17))
- net(10 name($I11))
- net(11 name($I10))
- net(12 name($I9))
+ net(10 name($I16))
+ net(11 name($I15))
+ net(12 name($I14))
 
  # Outgoing pins and their connections to nets
  pin(1 name(FB))
@@ -374,13 +374,13 @@ circuit(RINGO
   pin(5 9)
   pin(6 3)
  )
- circuit(3 INV2PAIR location(3580 -800)
+ circuit(3 INV2PAIR location(14140 -800)
   pin(0 4)
-  pin(1 7)
+  pin(1 5)
   pin(2 3)
   pin(3 4)
-  pin(4 9)
-  pin(5 12)
+  pin(4 11)
+  pin(5 10)
   pin(6 3)
  )
  circuit(4 INV2PAIR location(8860 -800)
@@ -392,13 +392,13 @@ circuit(RINGO
   pin(5 11)
   pin(6 3)
  )
- circuit(5 INV2PAIR location(14140 -800)
+ circuit(5 INV2PAIR location(3580 -800)
   pin(0 4)
-  pin(1 5)
+  pin(1 7)
   pin(2 3)
   pin(3 4)
-  pin(4 11)
-  pin(5 10)
+  pin(4 9)
+  pin(5 12)
   pin(6 3)
  )
 
diff --git a/testdata/algo/l2n_writer_au_2s.txt b/testdata/algo/l2n_writer_au_2s.txt
index b03978d7e..e0338aef8 100644
--- a/testdata/algo/l2n_writer_au_2s.txt
+++ b/testdata/algo/l2n_writer_au_2s.txt
@@ -148,11 +148,11 @@ X(INV2
   R(nsd (-1515 -385) (550 950))
  )
  N(6 I(VDD)
-  R(diff_cont (-110 2490) (220 220))
-  R(diff_cont (-220 180) (220 220))
-  R(diff_cont (-220 -220) (220 220))
+  R(diff_cont (-110 2890) (220 220))
   R(diff_cont (-220 -620) (220 220))
-  R(metal1 (-290 -290) (360 760))
+  R(diff_cont (-220 -220) (220 220))
+  R(diff_cont (-220 180) (220 220))
+  R(metal1 (-290 -690) (360 760))
   R(metal1 (-360 -760) (360 760))
   R(via1 (-305 -705) (250 250))
   R(via1 (-250 150) (250 250))
@@ -306,9 +306,9 @@ X(RINGO
  N(7 I($I23))
  N(8 I($I22))
  N(9 I($I17))
- N(10 I($I11))
- N(11 I($I10))
- N(12 I($I9))
+ N(10 I($I16))
+ N(11 I($I15))
+ N(12 I($I14))
  P(1 I(FB))
  P(2 I(OSC))
  P(3 I(VDD))
@@ -331,13 +331,13 @@ X(RINGO
   P(5 9)
   P(6 3)
  )
- X(3 INV2PAIR Y(3580 -800)
+ X(3 INV2PAIR Y(14140 -800)
   P(0 4)
-  P(1 7)
+  P(1 5)
   P(2 3)
   P(3 4)
-  P(4 9)
-  P(5 12)
+  P(4 11)
+  P(5 10)
   P(6 3)
  )
  X(4 INV2PAIR Y(8860 -800)
@@ -349,13 +349,13 @@ X(RINGO
   P(5 11)
   P(6 3)
  )
- X(5 INV2PAIR Y(14140 -800)
+ X(5 INV2PAIR Y(3580 -800)
   P(0 4)
-  P(1 5)
+  P(1 7)
   P(2 3)
   P(3 4)
-  P(4 11)
-  P(5 10)
+  P(4 9)
+  P(5 12)
   P(6 3)
  )
 )
diff --git a/testdata/algo/l2n_writer_au_p.txt b/testdata/algo/l2n_writer_au_p.txt
index 8be488e3f..aae4cda2d 100644
--- a/testdata/algo/l2n_writer_au_p.txt
+++ b/testdata/algo/l2n_writer_au_p.txt
@@ -121,11 +121,11 @@ X(INV2
   R(nsd (-1675 -925) (550 950))
  )
  N(5 I($5)
-  R(diff_cont (-110 2490) (220 220))
-  R(diff_cont (-220 180) (220 220))
-  R(diff_cont (-220 -220) (220 220))
+  R(diff_cont (-110 2890) (220 220))
   R(diff_cont (-220 -620) (220 220))
-  R(metal1 (-290 -290) (360 760))
+  R(diff_cont (-220 -220) (220 220))
+  R(diff_cont (-220 180) (220 220))
+  R(metal1 (-290 -690) (360 760))
   R(metal1 (-360 -760) (360 760))
   R(via1 (-305 -705) (250 250))
   R(via1 (-250 150) (250 250))
@@ -225,14 +225,14 @@ X(RINGO
  N(12 I($I39))
  N(13 I($I38))
  N(14 I($I19))
- N(15 I($I8))
- N(16 I($I7))
- N(17 I($I6))
- N(18 I($I5))
- N(19 I($I4))
- N(20 I($I3))
- N(21 I($I2))
- N(22 I($I1))
+ N(15 I($I18))
+ N(16 I($I17))
+ N(17 I($I16))
+ N(18 I($I15))
+ N(19 I($I14))
+ N(20 I($I13))
+ N(21 I($I12))
+ N(22 I($I11))
  P(1 I(FB))
  P(2 I(OSC))
  P(3 I(VSS))
@@ -254,60 +254,60 @@ X(RINGO
   P(3 3)
   P(4 4)
  )
- X(3 INV2 Y(2640 0)
-  P(0 14)
-  P(1 12)
-  P(2 22)
-  P(3 3)
-  P(4 4)
- )
- X(4 INV2 Y(5280 0)
-  P(0 22)
-  P(1 11)
-  P(2 21)
-  P(3 3)
-  P(4 4)
- )
- X(5 INV2 Y(7920 0)
-  P(0 21)
-  P(1 10)
-  P(2 20)
-  P(3 3)
-  P(4 4)
- )
- X(6 INV2 Y(10560 0)
-  P(0 20)
-  P(1 9)
-  P(2 19)
-  P(3 3)
-  P(4 4)
- )
- X(7 INV2 Y(13200 0)
-  P(0 19)
-  P(1 8)
-  P(2 18)
-  P(3 3)
-  P(4 4)
- )
- X(8 INV2 Y(15840 0)
-  P(0 18)
-  P(1 7)
-  P(2 17)
-  P(3 3)
-  P(4 4)
- )
- X(9 INV2 Y(18480 0)
-  P(0 17)
-  P(1 6)
-  P(2 16)
-  P(3 3)
-  P(4 4)
- )
- X(10 INV2 Y(21120 0)
+ X(3 INV2 Y(21120 0)
   P(0 16)
   P(1 5)
   P(2 15)
   P(3 3)
   P(4 4)
  )
+ X(4 INV2 Y(18480 0)
+  P(0 17)
+  P(1 6)
+  P(2 16)
+  P(3 3)
+  P(4 4)
+ )
+ X(5 INV2 Y(15840 0)
+  P(0 18)
+  P(1 7)
+  P(2 17)
+  P(3 3)
+  P(4 4)
+ )
+ X(6 INV2 Y(13200 0)
+  P(0 19)
+  P(1 8)
+  P(2 18)
+  P(3 3)
+  P(4 4)
+ )
+ X(7 INV2 Y(10560 0)
+  P(0 20)
+  P(1 9)
+  P(2 19)
+  P(3 3)
+  P(4 4)
+ )
+ X(8 INV2 Y(7920 0)
+  P(0 21)
+  P(1 10)
+  P(2 20)
+  P(3 3)
+  P(4 4)
+ )
+ X(9 INV2 Y(5280 0)
+  P(0 22)
+  P(1 11)
+  P(2 21)
+  P(3 3)
+  P(4 4)
+ )
+ X(10 INV2 Y(2640 0)
+  P(0 14)
+  P(1 12)
+  P(2 22)
+  P(3 3)
+  P(4 4)
+ )
 )
diff --git a/testdata/algo/l2n_writer_au_s.txt b/testdata/algo/l2n_writer_au_s.txt
index d63409be9..460be60ce 100644
--- a/testdata/algo/l2n_writer_au_s.txt
+++ b/testdata/algo/l2n_writer_au_s.txt
@@ -121,11 +121,11 @@ X(INV2
   R(nsd (-1675 -925) (550 950))
  )
  N(5 I($5)
-  R(diff_cont (-110 2490) (220 220))
-  R(diff_cont (-220 180) (220 220))
-  R(diff_cont (-220 -220) (220 220))
+  R(diff_cont (-110 2890) (220 220))
   R(diff_cont (-220 -620) (220 220))
-  R(metal1 (-290 -290) (360 760))
+  R(diff_cont (-220 -220) (220 220))
+  R(diff_cont (-220 180) (220 220))
+  R(metal1 (-290 -690) (360 760))
   R(metal1 (-360 -760) (360 760))
   R(via1 (-305 -705) (250 250))
   R(via1 (-250 150) (250 250))
@@ -216,14 +216,14 @@ X(RINGO
  N(12 I($I39))
  N(13 I($I38))
  N(14 I($I19))
- N(15 I($I8))
- N(16 I($I7))
- N(17 I($I6))
- N(18 I($I5))
- N(19 I($I4))
- N(20 I($I3))
- N(21 I($I2))
- N(22 I($I1))
+ N(15 I($I18))
+ N(16 I($I17))
+ N(17 I($I16))
+ N(18 I($I15))
+ N(19 I($I14))
+ N(20 I($I13))
+ N(21 I($I12))
+ N(22 I($I11))
  P(1 I(FB))
  P(2 I(OSC))
  P(3 I(VSS))
@@ -242,60 +242,60 @@ X(RINGO
   P(3 3)
   P(4 4)
  )
- X(3 INV2 Y(2640 0)
-  P(0 14)
-  P(1 12)
-  P(2 22)
-  P(3 3)
-  P(4 4)
- )
- X(4 INV2 Y(5280 0)
-  P(0 22)
-  P(1 11)
-  P(2 21)
-  P(3 3)
-  P(4 4)
- )
- X(5 INV2 Y(7920 0)
-  P(0 21)
-  P(1 10)
-  P(2 20)
-  P(3 3)
-  P(4 4)
- )
- X(6 INV2 Y(10560 0)
-  P(0 20)
-  P(1 9)
-  P(2 19)
-  P(3 3)
-  P(4 4)
- )
- X(7 INV2 Y(13200 0)
-  P(0 19)
-  P(1 8)
-  P(2 18)
-  P(3 3)
-  P(4 4)
- )
- X(8 INV2 Y(15840 0)
-  P(0 18)
-  P(1 7)
-  P(2 17)
-  P(3 3)
-  P(4 4)
- )
- X(9 INV2 Y(18480 0)
-  P(0 17)
-  P(1 6)
-  P(2 16)
-  P(3 3)
-  P(4 4)
- )
- X(10 INV2 Y(21120 0)
+ X(3 INV2 Y(21120 0)
   P(0 16)
   P(1 5)
   P(2 15)
   P(3 3)
   P(4 4)
  )
+ X(4 INV2 Y(18480 0)
+  P(0 17)
+  P(1 6)
+  P(2 16)
+  P(3 3)
+  P(4 4)
+ )
+ X(5 INV2 Y(15840 0)
+  P(0 18)
+  P(1 7)
+  P(2 17)
+  P(3 3)
+  P(4 4)
+ )
+ X(6 INV2 Y(13200 0)
+  P(0 19)
+  P(1 8)
+  P(2 18)
+  P(3 3)
+  P(4 4)
+ )
+ X(7 INV2 Y(10560 0)
+  P(0 20)
+  P(1 9)
+  P(2 19)
+  P(3 3)
+  P(4 4)
+ )
+ X(8 INV2 Y(7920 0)
+  P(0 21)
+  P(1 10)
+  P(2 20)
+  P(3 3)
+  P(4 4)
+ )
+ X(9 INV2 Y(5280 0)
+  P(0 22)
+  P(1 11)
+  P(2 21)
+  P(3 3)
+  P(4 4)
+ )
+ X(10 INV2 Y(2640 0)
+  P(0 14)
+  P(1 12)
+  P(2 22)
+  P(3 3)
+  P(4 4)
+ )
 )
diff --git a/testdata/algo/lvs_test1_au.lvsdb.1 b/testdata/algo/lvs_test1_au.lvsdb.1
index 56f72cfa1..64ff5925c 100644
--- a/testdata/algo/lvs_test1_au.lvsdb.1
+++ b/testdata/algo/lvs_test1_au.lvsdb.1
@@ -351,9 +351,9 @@ layout(
   net(7 name($I23))
   net(8 name($I22))
   net(9 name($I17))
-  net(10 name($I11))
-  net(11 name($I10))
-  net(12 name($I9))
+  net(10 name($I16))
+  net(11 name($I15))
+  net(12 name($I14))
 
   # Outgoing pins and their connections to nets
   pin(1 name(FB))
@@ -380,13 +380,13 @@ layout(
    pin(5 9)
    pin(6 3)
   )
-  circuit(3 INV2PAIR location(3580 -800)
+  circuit(3 INV2PAIR location(14140 -800)
    pin(0 4)
    pin(1 3)
    pin(2 4)
-   pin(3 7)
-   pin(4 9)
-   pin(5 12)
+   pin(3 5)
+   pin(4 11)
+   pin(5 10)
    pin(6 3)
   )
   circuit(4 INV2PAIR location(8860 -800)
@@ -398,13 +398,13 @@ layout(
    pin(5 11)
    pin(6 3)
   )
-  circuit(5 INV2PAIR location(14140 -800)
+  circuit(5 INV2PAIR location(3580 -800)
    pin(0 4)
    pin(1 3)
    pin(2 4)
-   pin(3 5)
-   pin(4 11)
-   pin(5 10)
+   pin(3 7)
+   pin(4 9)
+   pin(5 12)
    pin(6 3)
   )
 
@@ -638,9 +638,9 @@ xref(
    pin(3 3 match)
    circuit(1 1 match)
    circuit(2 2 match)
-   circuit(3 3 match)
+   circuit(5 3 match)
    circuit(4 4 match)
-   circuit(5 5 match)
+   circuit(3 5 match)
   )
  )
 )
diff --git a/testdata/algo/lvs_test1_au.lvsdb.2 b/testdata/algo/lvs_test1_au.lvsdb.2
deleted file mode 100644
index 4a8055ac4..000000000
--- a/testdata/algo/lvs_test1_au.lvsdb.2
+++ /dev/null
@@ -1,646 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(bulk)
- layer(nwell '1/0')
- layer(poly '3/0')
- layer(poly_lbl '3/1')
- layer(diff_cont '4/0')
- layer(poly_cont '5/0')
- layer(metal1 '6/0')
- layer(metal1_lbl '6/1')
- layer(via1 '7/0')
- layer(metal2 '8/0')
- layer(metal2_lbl '8/1')
- layer(ntie)
- layer(psd)
- layer(ptie)
- layer(nsd)
-
- # Mask layer connectivity
- connect(nwell nwell ntie)
- connect(poly poly poly_lbl poly_cont)
- connect(poly_lbl poly)
- connect(diff_cont diff_cont metal1 ntie psd ptie nsd)
- connect(poly_cont poly poly_cont metal1)
- connect(metal1 diff_cont poly_cont metal1 metal1_lbl via1)
- connect(metal1_lbl metal1)
- connect(via1 metal1 via1 metal2)
- connect(metal2 via1 metal2 metal2_lbl)
- connect(metal2_lbl metal2)
- connect(ntie nwell diff_cont ntie)
- connect(psd diff_cont psd)
- connect(ptie diff_cont ptie)
- connect(nsd diff_cont nsd)
-
- # Global nets and connectivity
- global(bulk BULK)
- global(ptie BULK)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(psd (-650 -875) (525 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(psd (125 -875) (550 1750))
-  )
-  terminal(B
-   rect(nwell (-125 -875) (250 1750))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(psd (-675 -875) (550 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(psd (125 -875) (525 1750))
-  )
-  terminal(B
-   rect(nwell (-125 -875) (250 1750))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(nsd (-650 -875) (525 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(nsd (125 -875) (550 1750))
-  )
-  terminal(B
-   rect(bulk (-125 -875) (250 1750))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(nsd (-675 -875) (550 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(nsd (125 -875) (525 1750))
-  )
-  terminal(B
-   rect(bulk (-125 -875) (250 1750))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(INV2
-
-  # Circuit boundary
-  rect((-1700 -2440) (3100 7820))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(nwell (-1400 1800) (2800 3580))
-   rect(diff_cont (-1510 -650) (220 220))
-   rect(ntie (-510 -450) (800 680))
-  )
-  net(2 name(IN)
-   rect(poly (-525 -250) (250 2500))
-   rect(poly (-1425 -630) (2100 360))
-   rect(poly (-125 -2230) (250 2500))
-   rect(poly (-1050 -3850) (250 2400))
-   rect(poly (550 1200) (250 2400))
-   rect(poly (-250 -6000) (250 2400))
-   rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-525 -2600) (0 0))
-   rect(poly_cont (-830 -110) (220 220))
-  )
-  net(3 name(OUT)
-   rect(diff_cont (-910 90) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (1380 3380) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 -3820) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-1820 3380) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(metal1 (1310 -3710) (360 2220))
-   rect(metal1 (-1900 -800) (2220 360))
-   rect(metal1 (-2280 -2400) (360 2840))
-   rect(metal1 (-360 -3600) (360 1560))
-   rect(metal1 (1240 2040) (360 1560))
-   rect(metal1 (-360 -5160) (360 1560))
-   rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1420 -2180) (0 0))
-   rect(psd (-1850 525) (525 1750))
-   rect(psd (1050 -1750) (525 1750))
-   rect(nsd (-2100 -5350) (525 1750))
-   rect(nsd (1050 -1750) (525 1750))
-  )
-  net(4 name(VSS)
-   rect(diff_cont (-110 90) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 980) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(metal1 (-290 -290) (360 1560))
-   rect(metal1 (-360 -1560) (360 1560))
-   rect(via1 (-305 -705) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 -1450) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-160 -540) (0 0))
-   rect(nsd (-1515 -1185) (550 1750))
-  )
-  net(5 name(VDD)
-   rect(diff_cont (-110 2490) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 -1420) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(metal1 (-290 -1490) (360 1560))
-   rect(metal1 (-360 -1560) (360 1560))
-   rect(via1 (-305 -1505) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-150 -1250) (0 0))
-   rect(psd (-1525 -475) (550 1750))
-  )
-  net(6 name(BULK)
-   rect(diff_cont (-110 -2160) (220 220))
-   rect(ptie (-510 -450) (800 680))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1)
-  pin(2 name(IN))
-  pin(3 name(OUT))
-  pin(4 name(VSS))
-  pin(5 name(VDD))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   device(D$PMOS$1 location(800 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(-400 3200)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 3)
-   terminal(G 2)
-   terminal(D 5)
-   terminal(B 1)
-  )
-  device(3 D$NMOS
-   device(D$NMOS$1 location(800 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(-400 -400)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 3)
-   terminal(G 2)
-   terminal(D 4)
-   terminal(B 6)
-  )
-
- )
- circuit(INV2PAIR
-
-  # Circuit boundary
-  rect((0 -1640) (5740 7820))
-
-  # Nets with their geometries
-  net(1 name(BULK))
-  net(2 name($I6))
-  net(3 name($I5))
-  net(4 name($I4))
-  net(5 name($I3))
-  net(6 name($I2))
-  net(7 name($I1))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(BULK))
-  pin(2)
-  pin(3)
-  pin(4)
-  pin(5)
-  pin(6)
-  pin(7)
-
-  # Subcircuits and their connections
-  circuit(1 INV2 location(1700 800)
-   pin(0 7)
-   pin(1 5)
-   pin(2 4)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-  circuit(2 INV2 location(4340 800)
-   pin(0 7)
-   pin(1 4)
-   pin(2 6)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((-1720 -2440) (26880 7820))
-
-  # Nets with their geometries
-  net(1 name(FB)
-   rect(metal1 (-1700 1620) (360 360))
-   rect(via1 (-305 -305) (250 250))
-   rect(via1 (23190 -250) (250 250))
-   rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22120 -200) (0 0))
-  )
-  net(2 name(OSC)
-   rect(via1 (24435 1675) (250 250))
-   rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-200 -200) (0 0))
-  )
-  net(3 name(VDD)
-   rect(metal1 (-180 3900) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23940 -2220) (0 0))
-  )
-  net(4 name(VSS)
-   rect(metal1 (-180 -2220) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23940 1100) (0 0))
-  )
-  net(5 name($I25))
-  net(6 name($I24))
-  net(7 name($I23))
-  net(8 name($I22))
-  net(9 name($I17))
-  net(10 name($I11))
-  net(11 name($I10))
-  net(12 name($I9))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(FB))
-  pin(2 name(OSC))
-  pin(3 name(VDD))
-  pin(4 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 INV2PAIR location(19420 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 1)
-   pin(4 10)
-   pin(5 2)
-   pin(6 3)
-  )
-  circuit(2 INV2PAIR location(-1700 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 8)
-   pin(4 1)
-   pin(5 9)
-   pin(6 3)
-  )
-  circuit(3 INV2PAIR location(3580 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 7)
-   pin(4 9)
-   pin(5 12)
-   pin(6 3)
-  )
-  circuit(4 INV2PAIR location(8860 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 6)
-   pin(4 12)
-   pin(5 11)
-   pin(6 3)
-  )
-  circuit(5 INV2PAIR location(14140 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 5)
-   pin(4 11)
-   pin(5 10)
-   pin(6 3)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(INV2
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('5'))
-  net(6 name('6'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-  pin(5 name('5'))
-  pin(6 name('6'))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 5)
-   terminal(G 2)
-   terminal(D 3)
-   terminal(B 1)
-  )
-  device(2 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 4)
-   terminal(G 2)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(INV2PAIR
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('5'))
-  net(6 name('6'))
-  net(7 name('7'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-  pin(5 name('5'))
-  pin(6 name('6'))
-  pin(7 name('7'))
-
-  # Subcircuits and their connections
-  circuit(1 INV2 name($1)
-   pin(0 7)
-   pin(1 5)
-   pin(2 4)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-  circuit(2 INV2 name($2)
-   pin(0 7)
-   pin(1 4)
-   pin(2 6)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('6'))
-  net(6 name('100'))
-  net(7 name('5'))
-  net(8 name('101'))
-  net(9 name('8'))
-  net(10 name('102'))
-  net(11 name('7'))
-  net(12 name('103'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-
-  # Subcircuits and their connections
-  circuit(1 INV2PAIR name($1)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 1)
-   pin(4 5)
-   pin(5 2)
-   pin(6 3)
-  )
-  circuit(2 INV2PAIR name($2)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 6)
-   pin(4 1)
-   pin(5 7)
-   pin(6 3)
-  )
-  circuit(3 INV2PAIR name($3)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 8)
-   pin(4 7)
-   pin(5 9)
-   pin(6 3)
-  )
-  circuit(4 INV2PAIR name($4)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 10)
-   pin(4 9)
-   pin(5 11)
-   pin(6 3)
-  )
-  circuit(5 INV2PAIR name($5)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 12)
-   pin(4 11)
-   pin(5 5)
-   pin(6 3)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INV2 INV2 match
-  xref(
-   net(1 1 match)
-   net(6 6 match)
-   net(2 2 match)
-   net(3 3 match)
-   net(5 5 match)
-   net(4 4 match)
-   pin(0 0 match)
-   pin(5 5 match)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(4 4 match)
-   pin(3 3 match)
-   device(3 2 match)
-   device(1 1 match)
-  )
- )
- circuit(INV2PAIR INV2PAIR match
-  xref(
-   net(2 2 match)
-   net(3 3 match)
-   net(4 4 match)
-   net(5 5 match)
-   net(6 6 match)
-   net(7 7 match)
-   net(1 1 match)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(5 5 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   circuit(1 1 match)
-   circuit(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(8 6 match)
-   net(7 8 match)
-   net(6 10 match)
-   net(5 12 match)
-   net(9 7 match)
-   net(10 5 match)
-   net(11 11 match)
-   net(12 9 match)
-   net(1 1 match)
-   net(2 2 match)
-   net(3 3 match)
-   net(4 4 match)
-   pin(0 0 match)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(3 3 match)
-   circuit(1 1 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-  )
- )
-)
diff --git a/testdata/algo/lvs_test1b_au.lvsdb.1 b/testdata/algo/lvs_test1b_au.lvsdb.1
index 531ff69f8..28b479174 100644
--- a/testdata/algo/lvs_test1b_au.lvsdb.1
+++ b/testdata/algo/lvs_test1b_au.lvsdb.1
@@ -351,9 +351,9 @@ layout(
   net(7 name($I23))
   net(8 name($I22))
   net(9 name($I17))
-  net(10 name($I11))
-  net(11 name($I10))
-  net(12 name($I9))
+  net(10 name($I16))
+  net(11 name($I15))
+  net(12 name($I14))
 
   # Outgoing pins and their connections to nets
   pin(1 name(FB))
@@ -380,13 +380,13 @@ layout(
    pin(5 9)
    pin(6 3)
   )
-  circuit(3 INV2PAIR location(3580 -800)
+  circuit(3 INV2PAIR location(14140 -800)
    pin(0 4)
    pin(1 3)
    pin(2 4)
-   pin(3 7)
-   pin(4 9)
-   pin(5 12)
+   pin(3 5)
+   pin(4 11)
+   pin(5 10)
    pin(6 3)
   )
   circuit(4 INV2PAIR location(8860 -800)
@@ -398,13 +398,13 @@ layout(
    pin(5 11)
    pin(6 3)
   )
-  circuit(5 INV2PAIR location(14140 -800)
+  circuit(5 INV2PAIR location(3580 -800)
    pin(0 4)
    pin(1 3)
    pin(2 4)
-   pin(3 5)
-   pin(4 11)
-   pin(5 10)
+   pin(3 7)
+   pin(4 9)
+   pin(5 12)
    pin(6 3)
   )
 
@@ -638,9 +638,9 @@ xref(
    pin(3 3 match)
    circuit(1 1 match)
    circuit(2 2 match)
-   circuit(3 3 match)
+   circuit(5 3 match)
    circuit(4 4 match)
-   circuit(5 5 match)
+   circuit(3 5 match)
   )
  )
 )
diff --git a/testdata/algo/lvs_test1b_au.lvsdb.2 b/testdata/algo/lvs_test1b_au.lvsdb.2
deleted file mode 100644
index eeba4a324..000000000
--- a/testdata/algo/lvs_test1b_au.lvsdb.2
+++ /dev/null
@@ -1,646 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(bulk)
- layer(nwell '1/0')
- layer(poly '3/0')
- layer(poly_lbl '3/1')
- layer(diff_cont '4/0')
- layer(poly_cont '5/0')
- layer(metal1 '6/0')
- layer(metal1_lbl '6/1')
- layer(via1 '7/0')
- layer(metal2 '8/0')
- layer(metal2_lbl '8/1')
- layer(ntie)
- layer(psd)
- layer(ptie)
- layer(nsd)
-
- # Mask layer connectivity
- connect(nwell nwell ntie)
- connect(poly poly poly_lbl poly_cont)
- connect(poly_lbl poly)
- connect(diff_cont diff_cont metal1 ntie psd ptie nsd)
- connect(poly_cont poly poly_cont metal1)
- connect(metal1 diff_cont poly_cont metal1 metal1_lbl via1)
- connect(metal1_lbl metal1)
- connect(via1 metal1 via1 metal2)
- connect(metal2 via1 metal2 metal2_lbl)
- connect(metal2_lbl metal2)
- connect(ntie nwell diff_cont ntie)
- connect(psd diff_cont psd)
- connect(ptie diff_cont ptie)
- connect(nsd diff_cont nsd)
-
- # Global nets and connectivity
- global(bulk BULK)
- global(ptie BULK)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(psd (-650 -875) (525 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(psd (125 -875) (550 1750))
-  )
-  terminal(B
-   rect(nwell (-125 -875) (250 1750))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(psd (-675 -875) (550 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(psd (125 -875) (525 1750))
-  )
-  terminal(B
-   rect(nwell (-125 -875) (250 1750))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(nsd (-650 -875) (525 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(nsd (125 -875) (550 1750))
-  )
-  terminal(B
-   rect(bulk (-125 -875) (250 1750))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(nsd (-675 -875) (550 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(nsd (125 -875) (525 1750))
-  )
-  terminal(B
-   rect(bulk (-125 -875) (250 1750))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(INV2
-
-  # Circuit boundary
-  rect((-1700 -2440) (3100 7820))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(nwell (-1400 1800) (2800 3580))
-   rect(diff_cont (-1510 -650) (220 220))
-   rect(ntie (-510 -450) (800 680))
-  )
-  net(2 name(IN)
-   rect(poly (-525 -250) (250 2500))
-   rect(poly (-1425 -630) (2100 360))
-   rect(poly (-125 -2230) (250 2500))
-   rect(poly (-1050 -3850) (250 2400))
-   rect(poly (550 1200) (250 2400))
-   rect(poly (-250 -6000) (250 2400))
-   rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-525 -2600) (0 0))
-   rect(poly_cont (-830 -110) (220 220))
-  )
-  net(3 name(OUT)
-   rect(diff_cont (-910 90) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (1380 3380) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 -3820) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-1820 3380) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(metal1 (1310 -3710) (360 2220))
-   rect(metal1 (-1900 -800) (2220 360))
-   rect(metal1 (-2280 -2400) (360 2840))
-   rect(metal1 (-360 -3600) (360 1560))
-   rect(metal1 (1240 2040) (360 1560))
-   rect(metal1 (-360 -5160) (360 1560))
-   rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1420 -2180) (0 0))
-   rect(psd (-1850 525) (525 1750))
-   rect(psd (1050 -1750) (525 1750))
-   rect(nsd (-2100 -5350) (525 1750))
-   rect(nsd (1050 -1750) (525 1750))
-  )
-  net(4 name(VSS)
-   rect(diff_cont (-110 90) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 980) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(metal1 (-290 -290) (360 1560))
-   rect(metal1 (-360 -1560) (360 1560))
-   rect(via1 (-305 -705) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 -1450) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-160 -540) (0 0))
-   rect(nsd (-1515 -1185) (550 1750))
-  )
-  net(5 name(VDD)
-   rect(diff_cont (-110 2490) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 -1420) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(metal1 (-290 -1490) (360 1560))
-   rect(metal1 (-360 -1560) (360 1560))
-   rect(via1 (-305 -1505) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-150 -1250) (0 0))
-   rect(psd (-1525 -475) (550 1750))
-  )
-  net(6 name(BULK)
-   rect(diff_cont (-110 -2160) (220 220))
-   rect(ptie (-510 -450) (800 680))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1)
-  pin(2 name(IN))
-  pin(3 name(OUT))
-  pin(4 name(VSS))
-  pin(5 name(VDD))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   device(D$PMOS$1 location(800 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(-400 3200)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 3)
-   terminal(G 2)
-   terminal(D 5)
-   terminal(B 1)
-  )
-  device(2 D$NMOS
-   device(D$NMOS$1 location(800 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(-400 -400)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 3)
-   terminal(G 2)
-   terminal(D 4)
-   terminal(B 6)
-  )
-
- )
- circuit(INV2PAIR
-
-  # Circuit boundary
-  rect((0 -1640) (5740 7820))
-
-  # Nets with their geometries
-  net(1 name(BULK))
-  net(2 name($I6))
-  net(3 name($I5))
-  net(4 name($I4))
-  net(5 name($I3))
-  net(6 name($I2))
-  net(7 name($I1))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(BULK))
-  pin(2)
-  pin(3)
-  pin(4)
-  pin(5)
-  pin(6)
-  pin(7)
-
-  # Subcircuits and their connections
-  circuit(1 INV2 location(1700 800)
-   pin(0 7)
-   pin(1 5)
-   pin(2 4)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-  circuit(2 INV2 location(4340 800)
-   pin(0 7)
-   pin(1 4)
-   pin(2 6)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((-1720 -2440) (26880 7820))
-
-  # Nets with their geometries
-  net(1 name(FB)
-   rect(metal1 (-1700 1620) (360 360))
-   rect(via1 (-305 -305) (250 250))
-   rect(via1 (23190 -250) (250 250))
-   rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22120 -200) (0 0))
-  )
-  net(2 name(OSC)
-   rect(via1 (24435 1675) (250 250))
-   rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-200 -200) (0 0))
-  )
-  net(3 name(VDD)
-   rect(metal1 (-180 3900) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23940 -2220) (0 0))
-  )
-  net(4 name(VSS)
-   rect(metal1 (-180 -2220) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23940 1100) (0 0))
-  )
-  net(5 name($I25))
-  net(6 name($I24))
-  net(7 name($I23))
-  net(8 name($I22))
-  net(9 name($I17))
-  net(10 name($I11))
-  net(11 name($I10))
-  net(12 name($I9))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(FB))
-  pin(2 name(OSC))
-  pin(3 name(VDD))
-  pin(4 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 INV2PAIR location(19420 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 1)
-   pin(4 10)
-   pin(5 2)
-   pin(6 3)
-  )
-  circuit(2 INV2PAIR location(-1700 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 8)
-   pin(4 1)
-   pin(5 9)
-   pin(6 3)
-  )
-  circuit(3 INV2PAIR location(3580 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 7)
-   pin(4 9)
-   pin(5 12)
-   pin(6 3)
-  )
-  circuit(4 INV2PAIR location(8860 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 6)
-   pin(4 12)
-   pin(5 11)
-   pin(6 3)
-  )
-  circuit(5 INV2PAIR location(14140 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 5)
-   pin(4 11)
-   pin(5 10)
-   pin(6 3)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(INV2
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('5'))
-  net(6 name('6'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-  pin(5 name('5'))
-  pin(6 name('6'))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 5)
-   terminal(G 2)
-   terminal(D 3)
-   terminal(B 1)
-  )
-  device(2 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 4)
-   terminal(G 2)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(INV2PAIR
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('5'))
-  net(6 name('6'))
-  net(7 name('7'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-  pin(5 name('5'))
-  pin(6 name('6'))
-  pin(7 name('7'))
-
-  # Subcircuits and their connections
-  circuit(1 INV2 name($1)
-   pin(0 7)
-   pin(1 5)
-   pin(2 4)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-  circuit(2 INV2 name($2)
-   pin(0 7)
-   pin(1 4)
-   pin(2 6)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('6'))
-  net(6 name('100'))
-  net(7 name('5'))
-  net(8 name('101'))
-  net(9 name('8'))
-  net(10 name('102'))
-  net(11 name('7'))
-  net(12 name('103'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-
-  # Subcircuits and their connections
-  circuit(1 INV2PAIR name($1)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 1)
-   pin(4 5)
-   pin(5 2)
-   pin(6 3)
-  )
-  circuit(2 INV2PAIR name($2)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 6)
-   pin(4 1)
-   pin(5 7)
-   pin(6 3)
-  )
-  circuit(3 INV2PAIR name($3)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 8)
-   pin(4 7)
-   pin(5 9)
-   pin(6 3)
-  )
-  circuit(4 INV2PAIR name($4)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 10)
-   pin(4 9)
-   pin(5 11)
-   pin(6 3)
-  )
-  circuit(5 INV2PAIR name($5)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 12)
-   pin(4 11)
-   pin(5 5)
-   pin(6 3)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INV2 INV2 match
-  xref(
-   net(1 1 match)
-   net(6 6 match)
-   net(2 2 match)
-   net(3 3 match)
-   net(5 5 match)
-   net(4 4 match)
-   pin(0 0 match)
-   pin(5 5 match)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(4 4 match)
-   pin(3 3 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(INV2PAIR INV2PAIR match
-  xref(
-   net(2 2 match)
-   net(3 3 match)
-   net(4 4 match)
-   net(5 5 match)
-   net(6 6 match)
-   net(7 7 match)
-   net(1 1 match)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(5 5 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   circuit(1 1 match)
-   circuit(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(8 6 match)
-   net(7 8 match)
-   net(6 10 match)
-   net(5 12 match)
-   net(9 7 match)
-   net(10 5 match)
-   net(11 11 match)
-   net(12 9 match)
-   net(1 1 match)
-   net(2 2 match)
-   net(3 3 match)
-   net(4 4 match)
-   pin(0 0 match)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(3 3 match)
-   circuit(1 1 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-  )
- )
-)
diff --git a/testdata/algo/lvs_test2_au.lvsdb.1 b/testdata/algo/lvs_test2_au.lvsdb.1
index ab2e809b0..08569fcca 100644
--- a/testdata/algo/lvs_test2_au.lvsdb.1
+++ b/testdata/algo/lvs_test2_au.lvsdb.1
@@ -351,9 +351,9 @@ layout(
   net(7 name($I23))
   net(8 name($I22))
   net(9 name($I17))
-  net(10 name($I11))
-  net(11 name($I10))
-  net(12 name($I9))
+  net(10 name($I16))
+  net(11 name($I15))
+  net(12 name($I14))
 
   # Outgoing pins and their connections to nets
   pin(1 name(FB))
@@ -380,13 +380,13 @@ layout(
    pin(5 9)
    pin(6 3)
   )
-  circuit(3 INV2PAIR location(3580 -800)
+  circuit(3 INV2PAIR location(14140 -800)
    pin(0 4)
    pin(1 3)
    pin(2 4)
-   pin(3 7)
-   pin(4 9)
-   pin(5 12)
+   pin(3 5)
+   pin(4 11)
+   pin(5 10)
    pin(6 3)
   )
   circuit(4 INV2PAIR location(8860 -800)
@@ -398,13 +398,13 @@ layout(
    pin(5 11)
    pin(6 3)
   )
-  circuit(5 INV2PAIR location(14140 -800)
+  circuit(5 INV2PAIR location(3580 -800)
    pin(0 4)
    pin(1 3)
    pin(2 4)
-   pin(3 5)
-   pin(4 11)
-   pin(5 10)
+   pin(3 7)
+   pin(4 9)
+   pin(5 12)
    pin(6 3)
   )
 
@@ -669,9 +669,9 @@ xref(
    circuit(() 2 mismatch)
    circuit(2 () mismatch)
    circuit(1 1 match)
-   circuit(3 3 match)
+   circuit(5 3 match)
    circuit(4 4 match)
-   circuit(5 5 match)
+   circuit(3 5 match)
   )
  )
 )
diff --git a/testdata/algo/lvs_test2_au.lvsdb.2 b/testdata/algo/lvs_test2_au.lvsdb.2
deleted file mode 100644
index c774021c7..000000000
--- a/testdata/algo/lvs_test2_au.lvsdb.2
+++ /dev/null
@@ -1,677 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(bulk)
- layer(nwell '1/0')
- layer(poly '3/0')
- layer(poly_lbl '3/1')
- layer(diff_cont '4/0')
- layer(poly_cont '5/0')
- layer(metal1 '6/0')
- layer(metal1_lbl '6/1')
- layer(via1 '7/0')
- layer(metal2 '8/0')
- layer(metal2_lbl '8/1')
- layer(ntie)
- layer(psd)
- layer(ptie)
- layer(nsd)
-
- # Mask layer connectivity
- connect(nwell nwell ntie)
- connect(poly poly poly_lbl poly_cont)
- connect(poly_lbl poly)
- connect(diff_cont diff_cont metal1 ntie psd ptie nsd)
- connect(poly_cont poly poly_cont metal1)
- connect(metal1 diff_cont poly_cont metal1 metal1_lbl via1)
- connect(metal1_lbl metal1)
- connect(via1 metal1 via1 metal2)
- connect(metal2 via1 metal2 metal2_lbl)
- connect(metal2_lbl metal2)
- connect(ntie nwell diff_cont ntie)
- connect(psd diff_cont psd)
- connect(ptie diff_cont ptie)
- connect(nsd diff_cont nsd)
-
- # Global nets and connectivity
- global(bulk BULK)
- global(ptie BULK)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(psd (-650 -875) (525 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(psd (125 -875) (550 1750))
-  )
-  terminal(B
-   rect(nwell (-125 -875) (250 1750))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(psd (-675 -875) (550 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(psd (125 -875) (525 1750))
-  )
-  terminal(B
-   rect(nwell (-125 -875) (250 1750))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(nsd (-650 -875) (525 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(nsd (125 -875) (550 1750))
-  )
-  terminal(B
-   rect(bulk (-125 -875) (250 1750))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(nsd (-675 -875) (550 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(nsd (125 -875) (525 1750))
-  )
-  terminal(B
-   rect(bulk (-125 -875) (250 1750))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(INV2
-
-  # Circuit boundary
-  rect((-1700 -2440) (3100 7820))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(nwell (-1400 1800) (2800 3580))
-   rect(diff_cont (-1510 -650) (220 220))
-   rect(ntie (-510 -450) (800 680))
-  )
-  net(2 name(IN)
-   rect(poly (-525 -250) (250 2500))
-   rect(poly (-1425 -630) (2100 360))
-   rect(poly (-125 -2230) (250 2500))
-   rect(poly (-1050 -3850) (250 2400))
-   rect(poly (550 1200) (250 2400))
-   rect(poly (-250 -6000) (250 2400))
-   rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-525 -2600) (0 0))
-   rect(poly_cont (-830 -110) (220 220))
-  )
-  net(3 name(OUT)
-   rect(diff_cont (-910 90) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (1380 3380) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 -3820) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-1820 3380) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(metal1 (1310 -3710) (360 2220))
-   rect(metal1 (-1900 -800) (2220 360))
-   rect(metal1 (-2280 -2400) (360 2840))
-   rect(metal1 (-360 -3600) (360 1560))
-   rect(metal1 (1240 2040) (360 1560))
-   rect(metal1 (-360 -5160) (360 1560))
-   rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1420 -2180) (0 0))
-   rect(psd (-1850 525) (525 1750))
-   rect(psd (1050 -1750) (525 1750))
-   rect(nsd (-2100 -5350) (525 1750))
-   rect(nsd (1050 -1750) (525 1750))
-  )
-  net(4 name(VSS)
-   rect(diff_cont (-110 90) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 980) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(metal1 (-290 -290) (360 1560))
-   rect(metal1 (-360 -1560) (360 1560))
-   rect(via1 (-305 -705) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 -1450) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-160 -540) (0 0))
-   rect(nsd (-1515 -1185) (550 1750))
-  )
-  net(5 name(VDD)
-   rect(diff_cont (-110 2490) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 -1420) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(metal1 (-290 -1490) (360 1560))
-   rect(metal1 (-360 -1560) (360 1560))
-   rect(via1 (-305 -1505) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-150 -1250) (0 0))
-   rect(psd (-1525 -475) (550 1750))
-  )
-  net(6 name(BULK)
-   rect(diff_cont (-110 -2160) (220 220))
-   rect(ptie (-510 -450) (800 680))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1)
-  pin(2 name(IN))
-  pin(3 name(OUT))
-  pin(4 name(VSS))
-  pin(5 name(VDD))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   device(D$PMOS$1 location(800 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(-400 3200)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 3)
-   terminal(G 2)
-   terminal(D 5)
-   terminal(B 1)
-  )
-  device(3 D$NMOS
-   device(D$NMOS$1 location(800 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(-400 -400)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 3)
-   terminal(G 2)
-   terminal(D 4)
-   terminal(B 6)
-  )
-
- )
- circuit(INV2PAIR
-
-  # Circuit boundary
-  rect((0 -1640) (5740 7820))
-
-  # Nets with their geometries
-  net(1 name(BULK))
-  net(2 name($I6))
-  net(3 name($I5))
-  net(4 name($I4))
-  net(5 name($I3))
-  net(6 name($I2))
-  net(7 name($I1))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(BULK))
-  pin(2)
-  pin(3)
-  pin(4)
-  pin(5)
-  pin(6)
-  pin(7)
-
-  # Subcircuits and their connections
-  circuit(1 INV2 location(1700 800)
-   pin(0 7)
-   pin(1 5)
-   pin(2 4)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-  circuit(2 INV2 location(4340 800)
-   pin(0 7)
-   pin(1 4)
-   pin(2 6)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((-1720 -2440) (26880 7820))
-
-  # Nets with their geometries
-  net(1 name(FB)
-   rect(metal1 (-1700 1620) (360 360))
-   rect(via1 (-305 -305) (250 250))
-   rect(via1 (23190 -250) (250 250))
-   rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22120 -200) (0 0))
-  )
-  net(2 name(OSC)
-   rect(via1 (24435 1675) (250 250))
-   rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-200 -200) (0 0))
-  )
-  net(3 name(VDD)
-   rect(metal1 (-180 3900) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23940 -2220) (0 0))
-  )
-  net(4 name(VSS)
-   rect(metal1 (-180 -2220) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23940 1100) (0 0))
-  )
-  net(5 name($I25))
-  net(6 name($I24))
-  net(7 name($I23))
-  net(8 name($I22))
-  net(9 name($I17))
-  net(10 name($I11))
-  net(11 name($I10))
-  net(12 name($I9))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(FB))
-  pin(2 name(OSC))
-  pin(3 name(VDD))
-  pin(4 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 INV2PAIR location(19420 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 1)
-   pin(4 10)
-   pin(5 2)
-   pin(6 3)
-  )
-  circuit(2 INV2PAIR location(-1700 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 8)
-   pin(4 1)
-   pin(5 9)
-   pin(6 3)
-  )
-  circuit(3 INV2PAIR location(3580 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 7)
-   pin(4 9)
-   pin(5 12)
-   pin(6 3)
-  )
-  circuit(4 INV2PAIR location(8860 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 6)
-   pin(4 12)
-   pin(5 11)
-   pin(6 3)
-  )
-  circuit(5 INV2PAIR location(14140 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 5)
-   pin(4 11)
-   pin(5 10)
-   pin(6 3)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(INV2
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('5'))
-  net(6 name('6'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-  pin(5 name('5'))
-  pin(6 name('6'))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 5)
-   terminal(G 2)
-   terminal(D 3)
-   terminal(B 1)
-  )
-  device(2 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 4)
-   terminal(G 2)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(INV2PAIR
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('5'))
-  net(6 name('6'))
-  net(7 name('7'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-  pin(5 name('5'))
-  pin(6 name('6'))
-  pin(7 name('7'))
-
-  # Subcircuits and their connections
-  circuit(1 INV2 name($2)
-   pin(0 7)
-   pin(1 4)
-   pin(2 6)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-
- )
- circuit(INV2PAIRX
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('5'))
-  net(6 name('6'))
-  net(7 name('7'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-  pin(5 name('5'))
-  pin(6 name('6'))
-  pin(7 name('7'))
-
-  # Subcircuits and their connections
-  circuit(1 INV2 name($2)
-   pin(0 7)
-   pin(1 4)
-   pin(2 6)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('6'))
-  net(6 name('5'))
-  net(7 name('101'))
-  net(8 name('8'))
-  net(9 name('102'))
-  net(10 name('7'))
-  net(11 name('103'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-
-  # Subcircuits and their connections
-  circuit(1 INV2PAIR name($1)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 1)
-   pin(4 5)
-   pin(5 2)
-   pin(6 3)
-  )
-  circuit(2 INV2PAIR name($2)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 1)
-   pin(4 1)
-   pin(5 6)
-   pin(6 3)
-  )
-  circuit(3 INV2PAIR name($3)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 7)
-   pin(4 6)
-   pin(5 8)
-   pin(6 3)
-  )
-  circuit(4 INV2PAIR name($4)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 9)
-   pin(4 8)
-   pin(5 10)
-   pin(6 3)
-  )
-  circuit(5 INV2PAIR name($5)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 11)
-   pin(4 10)
-   pin(5 5)
-   pin(6 3)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(() INV2PAIRX mismatch
-  xref(
-  )
- )
- circuit(INV2 INV2 match
-  xref(
-   net(1 1 match)
-   net(6 6 match)
-   net(2 2 match)
-   net(3 3 match)
-   net(5 5 match)
-   net(4 4 match)
-   pin(0 0 match)
-   pin(5 5 match)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(4 4 match)
-   pin(3 3 match)
-   device(3 2 match)
-   device(1 1 match)
-  )
- )
- circuit(INV2PAIR INV2PAIR nomatch
-  xref(
-   net(2 2 mismatch)
-   net(3 3 mismatch)
-   net(4 4 mismatch)
-   net(5 5 mismatch)
-   net(6 6 match)
-   net(7 7 mismatch)
-   net(1 1 mismatch)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(5 5 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   circuit(1 () mismatch)
-   circuit(2 1 match)
-  )
- )
- circuit(RINGO RINGO nomatch
-  log(
-   entry(error description('Net $I22 is not matching any net from reference netlist'))
-   entry(error description('Net FB is not matching any net from reference netlist'))
-  )
-  xref(
-   net(8 () mismatch)
-   net(7 7 match)
-   net(6 9 match)
-   net(5 11 match)
-   net(9 6 match)
-   net(10 5 match)
-   net(11 10 match)
-   net(12 8 match)
-   net(1 1 mismatch)
-   net(2 2 match)
-   net(3 3 match)
-   net(4 4 match)
-   pin(0 0 match)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(3 3 match)
-   circuit(() 2 mismatch)
-   circuit(2 () mismatch)
-   circuit(1 1 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-  )
- )
-)
diff --git a/testdata/algo/lvs_test2b_au.lvsdb.1 b/testdata/algo/lvs_test2b_au.lvsdb.1
index ed6529e45..a8fd11aa8 100644
--- a/testdata/algo/lvs_test2b_au.lvsdb.1
+++ b/testdata/algo/lvs_test2b_au.lvsdb.1
@@ -351,9 +351,9 @@ layout(
   net(7 name($I23))
   net(8 name($I22))
   net(9 name($I17))
-  net(10 name($I11))
-  net(11 name($I10))
-  net(12 name($I9))
+  net(10 name($I16))
+  net(11 name($I15))
+  net(12 name($I14))
 
   # Outgoing pins and their connections to nets
   pin(1 name(FB))
@@ -380,13 +380,13 @@ layout(
    pin(5 9)
    pin(6 3)
   )
-  circuit(3 INV2PAIR location(3580 -800)
+  circuit(3 INV2PAIR location(14140 -800)
    pin(0 4)
    pin(1 3)
    pin(2 4)
-   pin(3 7)
-   pin(4 9)
-   pin(5 12)
+   pin(3 5)
+   pin(4 11)
+   pin(5 10)
    pin(6 3)
   )
   circuit(4 INV2PAIR location(8860 -800)
@@ -398,13 +398,13 @@ layout(
    pin(5 11)
    pin(6 3)
   )
-  circuit(5 INV2PAIR location(14140 -800)
+  circuit(5 INV2PAIR location(3580 -800)
    pin(0 4)
    pin(1 3)
    pin(2 4)
-   pin(3 5)
-   pin(4 11)
-   pin(5 10)
+   pin(3 7)
+   pin(4 9)
+   pin(5 12)
    pin(6 3)
   )
 
@@ -669,9 +669,9 @@ xref(
    circuit(() 2 mismatch)
    circuit(2 () mismatch)
    circuit(1 1 match)
-   circuit(3 3 match)
+   circuit(5 3 match)
    circuit(4 4 match)
-   circuit(5 5 match)
+   circuit(3 5 match)
   )
  )
 )
diff --git a/testdata/algo/lvs_test2b_au.lvsdb.2 b/testdata/algo/lvs_test2b_au.lvsdb.2
deleted file mode 100644
index 8d6cd0db7..000000000
--- a/testdata/algo/lvs_test2b_au.lvsdb.2
+++ /dev/null
@@ -1,677 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(bulk)
- layer(nwell '1/0')
- layer(poly '3/0')
- layer(poly_lbl '3/1')
- layer(diff_cont '4/0')
- layer(poly_cont '5/0')
- layer(metal1 '6/0')
- layer(metal1_lbl '6/1')
- layer(via1 '7/0')
- layer(metal2 '8/0')
- layer(metal2_lbl '8/1')
- layer(ntie)
- layer(psd)
- layer(ptie)
- layer(nsd)
-
- # Mask layer connectivity
- connect(nwell nwell ntie)
- connect(poly poly poly_lbl poly_cont)
- connect(poly_lbl poly)
- connect(diff_cont diff_cont metal1 ntie psd ptie nsd)
- connect(poly_cont poly poly_cont metal1)
- connect(metal1 diff_cont poly_cont metal1 metal1_lbl via1)
- connect(metal1_lbl metal1)
- connect(via1 metal1 via1 metal2)
- connect(metal2 via1 metal2 metal2_lbl)
- connect(metal2_lbl metal2)
- connect(ntie nwell diff_cont ntie)
- connect(psd diff_cont psd)
- connect(ptie diff_cont ptie)
- connect(nsd diff_cont nsd)
-
- # Global nets and connectivity
- global(bulk BULK)
- global(ptie BULK)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(psd (-650 -875) (525 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(psd (125 -875) (550 1750))
-  )
-  terminal(B
-   rect(nwell (-125 -875) (250 1750))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(psd (-675 -875) (550 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(psd (125 -875) (525 1750))
-  )
-  terminal(B
-   rect(nwell (-125 -875) (250 1750))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(nsd (-650 -875) (525 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(nsd (125 -875) (550 1750))
-  )
-  terminal(B
-   rect(bulk (-125 -875) (250 1750))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(nsd (-675 -875) (550 1750))
-  )
-  terminal(G
-   rect(poly (-125 -875) (250 1750))
-  )
-  terminal(D
-   rect(nsd (125 -875) (525 1750))
-  )
-  terminal(B
-   rect(bulk (-125 -875) (250 1750))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(INV2
-
-  # Circuit boundary
-  rect((-1700 -2440) (3100 7820))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(nwell (-1400 1800) (2800 3580))
-   rect(diff_cont (-1510 -650) (220 220))
-   rect(ntie (-510 -450) (800 680))
-  )
-  net(2 name(IN)
-   rect(poly (-525 -250) (250 2500))
-   rect(poly (-1425 -630) (2100 360))
-   rect(poly (-125 -2230) (250 2500))
-   rect(poly (-1050 -3850) (250 2400))
-   rect(poly (550 1200) (250 2400))
-   rect(poly (-250 -6000) (250 2400))
-   rect(poly (-1050 1200) (250 2400))
-   rect(poly_lbl (-525 -2600) (0 0))
-   rect(poly_cont (-830 -110) (220 220))
-  )
-  net(3 name(OUT)
-   rect(diff_cont (-910 90) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (1380 3380) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 -3820) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-1820 3380) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(metal1 (1310 -3710) (360 2220))
-   rect(metal1 (-1900 -800) (2220 360))
-   rect(metal1 (-2280 -2400) (360 2840))
-   rect(metal1 (-360 -3600) (360 1560))
-   rect(metal1 (1240 2040) (360 1560))
-   rect(metal1 (-360 -5160) (360 1560))
-   rect(metal1 (-1960 2040) (360 1560))
-   rect(metal1_lbl (1420 -2180) (0 0))
-   rect(psd (-1850 525) (525 1750))
-   rect(psd (1050 -1750) (525 1750))
-   rect(nsd (-2100 -5350) (525 1750))
-   rect(nsd (1050 -1750) (525 1750))
-  )
-  net(4 name(VSS)
-   rect(diff_cont (-110 90) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 980) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(diff_cont (-220 -620) (220 220))
-   rect(metal1 (-290 -290) (360 1560))
-   rect(metal1 (-360 -1560) (360 1560))
-   rect(via1 (-305 -705) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 -1450) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(metal2 (-1525 -775) (2800 1700))
-   rect(metal2_lbl (-160 -540) (0 0))
-   rect(nsd (-1515 -1185) (550 1750))
-  )
-  net(5 name(VDD)
-   rect(diff_cont (-110 2490) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 -1420) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(diff_cont (-220 180) (220 220))
-   rect(metal1 (-290 -1490) (360 1560))
-   rect(metal1 (-360 -1560) (360 1560))
-   rect(via1 (-305 -1505) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(via1 (-250 150) (250 250))
-   rect(metal2 (-1525 -1575) (2800 1700))
-   rect(metal2_lbl (-150 -1250) (0 0))
-   rect(psd (-1525 -475) (550 1750))
-  )
-  net(6 name(BULK)
-   rect(diff_cont (-110 -2160) (220 220))
-   rect(ptie (-510 -450) (800 680))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1)
-  pin(2 name(IN))
-  pin(3 name(OUT))
-  pin(4 name(VSS))
-  pin(5 name(VDD))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   device(D$PMOS$1 location(800 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(-400 3200)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 3)
-   terminal(G 2)
-   terminal(D 5)
-   terminal(B 1)
-  )
-  device(2 D$NMOS
-   device(D$NMOS$1 location(800 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(-400 -400)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 3)
-   terminal(G 2)
-   terminal(D 4)
-   terminal(B 6)
-  )
-
- )
- circuit(INV2PAIR
-
-  # Circuit boundary
-  rect((0 -1640) (5740 7820))
-
-  # Nets with their geometries
-  net(1 name(BULK))
-  net(2 name($I6))
-  net(3 name($I5))
-  net(4 name($I4))
-  net(5 name($I3))
-  net(6 name($I2))
-  net(7 name($I1))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(BULK))
-  pin(2)
-  pin(3)
-  pin(4)
-  pin(5)
-  pin(6)
-  pin(7)
-
-  # Subcircuits and their connections
-  circuit(1 INV2 location(1700 800)
-   pin(0 7)
-   pin(1 5)
-   pin(2 4)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-  circuit(2 INV2 location(4340 800)
-   pin(0 7)
-   pin(1 4)
-   pin(2 6)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((-1720 -2440) (26880 7820))
-
-  # Nets with their geometries
-  net(1 name(FB)
-   rect(metal1 (-1700 1620) (360 360))
-   rect(via1 (-305 -305) (250 250))
-   rect(via1 (23190 -250) (250 250))
-   rect(metal2 (-23765 -325) (23840 400))
-   rect(metal2_lbl (-22120 -200) (0 0))
-  )
-  net(2 name(OSC)
-   rect(via1 (24435 1675) (250 250))
-   rect(metal2 (-325 -325) (400 400))
-   rect(metal2_lbl (-200 -200) (0 0))
-  )
-  net(3 name(VDD)
-   rect(metal1 (-180 3900) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23940 -2220) (0 0))
-  )
-  net(4 name(VSS)
-   rect(metal1 (-180 -2220) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal1 (2280 -1120) (360 1120))
-   rect(metal2_lbl (-23940 1100) (0 0))
-  )
-  net(5 name($I25))
-  net(6 name($I24))
-  net(7 name($I23))
-  net(8 name($I22))
-  net(9 name($I17))
-  net(10 name($I11))
-  net(11 name($I10))
-  net(12 name($I9))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(FB))
-  pin(2 name(OSC))
-  pin(3 name(VDD))
-  pin(4 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 INV2PAIR location(19420 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 1)
-   pin(4 10)
-   pin(5 2)
-   pin(6 3)
-  )
-  circuit(2 INV2PAIR location(-1700 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 8)
-   pin(4 1)
-   pin(5 9)
-   pin(6 3)
-  )
-  circuit(3 INV2PAIR location(3580 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 7)
-   pin(4 9)
-   pin(5 12)
-   pin(6 3)
-  )
-  circuit(4 INV2PAIR location(8860 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 6)
-   pin(4 12)
-   pin(5 11)
-   pin(6 3)
-  )
-  circuit(5 INV2PAIR location(14140 -800)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 5)
-   pin(4 11)
-   pin(5 10)
-   pin(6 3)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(INV2
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('5'))
-  net(6 name('6'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-  pin(5 name('5'))
-  pin(6 name('6'))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 5)
-   terminal(G 2)
-   terminal(D 3)
-   terminal(B 1)
-  )
-  device(2 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 3.5)
-   param(AS 1.4)
-   param(AD 1.4)
-   param(PS 6.85)
-   param(PD 6.85)
-   terminal(S 4)
-   terminal(G 2)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(INV2PAIR
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('5'))
-  net(6 name('6'))
-  net(7 name('7'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-  pin(5 name('5'))
-  pin(6 name('6'))
-  pin(7 name('7'))
-
-  # Subcircuits and their connections
-  circuit(1 INV2 name($2)
-   pin(0 7)
-   pin(1 4)
-   pin(2 6)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-
- )
- circuit(INV2PAIRX
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('5'))
-  net(6 name('6'))
-  net(7 name('7'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-  pin(5 name('5'))
-  pin(6 name('6'))
-  pin(7 name('7'))
-
-  # Subcircuits and their connections
-  circuit(1 INV2 name($2)
-   pin(0 7)
-   pin(1 4)
-   pin(2 6)
-   pin(3 3)
-   pin(4 2)
-   pin(5 1)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name('1'))
-  net(2 name('2'))
-  net(3 name('3'))
-  net(4 name('4'))
-  net(5 name('6'))
-  net(6 name('5'))
-  net(7 name('101'))
-  net(8 name('8'))
-  net(9 name('102'))
-  net(10 name('7'))
-  net(11 name('103'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name('1'))
-  pin(2 name('2'))
-  pin(3 name('3'))
-  pin(4 name('4'))
-
-  # Subcircuits and their connections
-  circuit(1 INV2PAIR name($1)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 1)
-   pin(4 5)
-   pin(5 2)
-   pin(6 3)
-  )
-  circuit(2 INV2PAIR name($2)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 1)
-   pin(4 1)
-   pin(5 6)
-   pin(6 3)
-  )
-  circuit(3 INV2PAIR name($3)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 7)
-   pin(4 6)
-   pin(5 8)
-   pin(6 3)
-  )
-  circuit(4 INV2PAIR name($4)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 9)
-   pin(4 8)
-   pin(5 10)
-   pin(6 3)
-  )
-  circuit(5 INV2PAIR name($5)
-   pin(0 4)
-   pin(1 3)
-   pin(2 4)
-   pin(3 11)
-   pin(4 10)
-   pin(5 5)
-   pin(6 3)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(() INV2PAIRX mismatch
-  xref(
-  )
- )
- circuit(INV2 INV2 match
-  xref(
-   net(1 1 match)
-   net(6 6 match)
-   net(2 2 match)
-   net(3 3 match)
-   net(5 5 match)
-   net(4 4 match)
-   pin(0 0 match)
-   pin(5 5 match)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(4 4 match)
-   pin(3 3 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(INV2PAIR INV2PAIR nomatch
-  xref(
-   net(2 2 mismatch)
-   net(3 3 mismatch)
-   net(4 4 mismatch)
-   net(5 5 mismatch)
-   net(6 6 match)
-   net(7 7 mismatch)
-   net(1 1 mismatch)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(5 5 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   circuit(1 () mismatch)
-   circuit(2 1 match)
-  )
- )
- circuit(RINGO RINGO nomatch
-  log(
-   entry(error description('Net $I22 is not matching any net from reference netlist'))
-   entry(error description('Net FB is not matching any net from reference netlist'))
-  )
-  xref(
-   net(8 () mismatch)
-   net(7 7 match)
-   net(6 9 match)
-   net(5 11 match)
-   net(9 6 match)
-   net(10 5 match)
-   net(11 10 match)
-   net(12 8 match)
-   net(1 1 mismatch)
-   net(2 2 match)
-   net(3 3 match)
-   net(4 4 match)
-   pin(0 0 match)
-   pin(1 1 match)
-   pin(2 2 match)
-   pin(3 3 match)
-   circuit(() 2 mismatch)
-   circuit(2 () mismatch)
-   circuit(1 1 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-  )
- )
-)
diff --git a/testdata/algo/net_proc_au3.gds b/testdata/algo/net_proc_au3.gds
index b84c44b2c..2968b8805 100644
Binary files a/testdata/algo/net_proc_au3.gds and b/testdata/algo/net_proc_au3.gds differ
diff --git a/testdata/lvs/ringo_device_subcircuits.lvsdb.1 b/testdata/lvs/ringo_device_subcircuits.lvsdb.1
index b3e9d8cf3..42e0248ff 100644
--- a/testdata/lvs/ringo_device_subcircuits.lvsdb.1
+++ b/testdata/lvs/ringo_device_subcircuits.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -403,27 +403,27 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
+   rect(l3 (0 4500) (600 3500))
    rect(l3 (23300 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
+   rect(l3 (-25300 -3500) (1400 3500))
+   rect(l8 (22610 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
+   rect(l11 (1660 860) (0 0))
+   rect(l11 (-2950 -450) (600 800))
    rect(l11 (23400 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
+   rect(l11 (-25200 -800) (1200 800))
+   rect(l11 (-750 -1450) (300 1400))
+   rect(l11 (-100 -350) (0 0))
+   rect(l9 (23100 -1100) (500 1500))
+   rect(l9 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l11 (23440 3840) (320 320))
@@ -438,23 +438,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
+   rect(l8 (24510 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1660 -390) (0 0))
+   rect(l11 (21500 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_device_subcircuits.lvsdb.2 b/testdata/lvs/ringo_device_subcircuits.lvsdb.2
deleted file mode 100644
index d01baf5b0..000000000
--- a/testdata/lvs/ringo_device_subcircuits.lvsdb.2
+++ /dev/null
@@ -1,908 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(XPMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 XPMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 XPMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 XPMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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_layout_var.lvsdb.1 b/testdata/lvs/ringo_layout_var.lvsdb.1
index 09a84c082..ad9af0022 100644
--- a/testdata/lvs/ringo_layout_var.lvsdb.1
+++ b/testdata/lvs/ringo_layout_var.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -490,9 +490,9 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
+   rect(l3 (0 4500) (600 3500))
+   rect(l3 (-100 -3500) (1400 3500))
+   rect(l3 (22000 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
    rect(l8 (-24690 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
@@ -501,11 +501,11 @@ layout(
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
+   rect(l11 (-2950 -450) (600 800))
+   rect(l11 (0 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
+   rect(l11 (22750 -400) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
@@ -525,23 +525,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
+   rect(l8 (24510 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1660 -390) (0 0))
+   rect(l11 (21500 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_layout_var.lvsdb.2 b/testdata/lvs/ringo_layout_var.lvsdb.2
deleted file mode 100644
index fb9e4a5a0..000000000
--- a/testdata/lvs/ringo_layout_var.lvsdb.2
+++ /dev/null
@@ -1,1013 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(INVX1B
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1B location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1B location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1B location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(INVX1B INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(3 3 match)
-   circuit(5 5 match)
-   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(2 2 match)
-   circuit(4 4 match)
-   circuit(6 6 match)
-   circuit(1 1 match)
-  )
- )
-)
diff --git a/testdata/lvs/ringo_mixed_hierarchy.cir b/testdata/lvs/ringo_mixed_hierarchy.cir
index 6a8f50780..6ce130b08 100644
--- a/testdata/lvs/ringo_mixed_hierarchy.cir
+++ b/testdata/lvs/ringo_mixed_hierarchy.cir
@@ -16,24 +16,24 @@
 X$1 3 14 16 3 1 16 INVX1
 * cell instance $2 r0 *1 20.4,0
 X$2 3 1 16 3 13 16 INVX1
-* cell instance $8 r0 *1 4.2,0
-X$8 3 5 16 3 4 16 INVX1
-* cell instance $9 r0 *1 6,0
-X$9 3 6 16 3 5 16 INVX1
-* cell instance $10 r0 *1 7.8,0
-X$10 3 7 16 3 6 16 INVX1
-* cell instance $11 r0 *1 9.6,0
-X$11 3 8 16 3 7 16 INVX1
-* cell instance $12 r0 *1 11.4,0
-X$12 3 9 16 3 8 16 INVX1
+* cell instance $10 r0 *1 18.6,0
+X$10 3 13 16 3 12 16 INVX1
+* cell instance $11 r0 *1 16.8,0
+X$11 3 12 16 3 11 16 INVX1
+* cell instance $12 r0 *1 15,0
+X$12 3 11 16 3 10 16 INVX1
 * cell instance $13 r0 *1 13.2,0
 X$13 3 10 16 3 9 16 INVX1
-* cell instance $14 r0 *1 15,0
-X$14 3 11 16 3 10 16 INVX1
-* cell instance $15 r0 *1 16.8,0
-X$15 3 12 16 3 11 16 INVX1
-* cell instance $16 r0 *1 18.6,0
-X$16 3 13 16 3 12 16 INVX1
+* cell instance $14 r0 *1 11.4,0
+X$14 3 9 16 3 8 16 INVX1
+* cell instance $15 r0 *1 9.6,0
+X$15 3 8 16 3 7 16 INVX1
+* cell instance $16 r0 *1 7.8,0
+X$16 3 7 16 3 6 16 INVX1
+* cell instance $17 r0 *1 6,0
+X$17 3 6 16 3 5 16 INVX1
+* cell instance $18 r0 *1 4.2,0
+X$18 3 5 16 3 4 16 INVX1
 * device instance $1 r0 *1 2.65,5.8 PMOS
 M$1 3 2 4 3 PMOS L=0.25U W=1.5U AS=0.6375P AD=0.3375P PS=3.85U PD=1.95U
 * device instance $2 r0 *1 3.35,5.8 PMOS
diff --git a/testdata/lvs/ringo_mixed_hierarchy.lvsdb b/testdata/lvs/ringo_mixed_hierarchy.lvsdb
index aaa1a946e..6bc9689e7 100644
--- a/testdata/lvs/ringo_mixed_hierarchy.lvsdb
+++ b/testdata/lvs/ringo_mixed_hierarchy.lvsdb
@@ -259,34 +259,34 @@ layout(
   )
   net(3 name(VDD)
    rect(l3 (1700 4500) (2600 3500))
-   rect(l3 (-3800 -3500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
+   rect(l3 (19600 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-22890 -2840) (180 180))
+   rect(l3 (-25800 -3500) (600 3500))
+   rect(l3 (-100 -3500) (1400 3500))
+   rect(l8 (1010 -2840) (180 180))
    rect(l8 (-180 920) (180 180))
    rect(l8 (-180 -730) (180 180))
-   rect(l8 (-1980 870) (180 180))
+   rect(l8 (21420 870) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21840 -1290) (300 1700))
+   rect(l11 (1560 -1290) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
    rect(l11 (-100 50) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
+   rect(l11 (-2950 -450) (600 800))
    rect(l11 (23400 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l2 (-23025 -2550) (450 1500))
-   rect(l9 (-2275 -450) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
+   rect(l11 (-25200 -800) (1200 800))
+   rect(l11 (-750 -1450) (300 1400))
+   rect(l11 (-100 -350) (0 0))
+   rect(l2 (1525 -2150) (450 1500))
+   rect(l9 (21125 -450) (500 1500))
+   rect(l9 (-23900 -1500) (500 1500))
   )
   net(4 name($4)
    rect(l8 (3610 1770) (180 180))
@@ -360,12 +360,12 @@ layout(
    rect(l11 (-1900 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (23200 -350) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l6 (-23700 460) (425 950))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l6 (1500 460) (425 950))
    rect(l10 (-1575 -2210) (500 1500))
    rect(l10 (22900 -1500) (500 1500))
   )
@@ -448,44 +448,28 @@ layout(
    pin(4 13)
    pin(5 16)
   )
-  circuit(8 INVX1 location(4200 0)
+  circuit(10 INVX1 location(18600 0)
    pin(0 3)
-   pin(1 5)
+   pin(1 13)
    pin(2 16)
    pin(3 3)
-   pin(4 4)
+   pin(4 12)
    pin(5 16)
   )
-  circuit(9 INVX1 location(6000 0)
+  circuit(11 INVX1 location(16800 0)
    pin(0 3)
-   pin(1 6)
+   pin(1 12)
    pin(2 16)
    pin(3 3)
-   pin(4 5)
+   pin(4 11)
    pin(5 16)
   )
-  circuit(10 INVX1 location(7800 0)
+  circuit(12 INVX1 location(15000 0)
    pin(0 3)
-   pin(1 7)
+   pin(1 11)
    pin(2 16)
    pin(3 3)
-   pin(4 6)
-   pin(5 16)
-  )
-  circuit(11 INVX1 location(9600 0)
-   pin(0 3)
-   pin(1 8)
-   pin(2 16)
-   pin(3 3)
-   pin(4 7)
-   pin(5 16)
-  )
-  circuit(12 INVX1 location(11400 0)
-   pin(0 3)
-   pin(1 9)
-   pin(2 16)
-   pin(3 3)
-   pin(4 8)
+   pin(4 10)
    pin(5 16)
   )
   circuit(13 INVX1 location(13200 0)
@@ -496,28 +480,44 @@ layout(
    pin(4 9)
    pin(5 16)
   )
-  circuit(14 INVX1 location(15000 0)
+  circuit(14 INVX1 location(11400 0)
    pin(0 3)
-   pin(1 11)
+   pin(1 9)
    pin(2 16)
    pin(3 3)
-   pin(4 10)
+   pin(4 8)
    pin(5 16)
   )
-  circuit(15 INVX1 location(16800 0)
+  circuit(15 INVX1 location(9600 0)
    pin(0 3)
-   pin(1 12)
+   pin(1 8)
    pin(2 16)
    pin(3 3)
-   pin(4 11)
+   pin(4 7)
    pin(5 16)
   )
-  circuit(16 INVX1 location(18600 0)
+  circuit(16 INVX1 location(7800 0)
    pin(0 3)
-   pin(1 13)
+   pin(1 7)
    pin(2 16)
    pin(3 3)
-   pin(4 12)
+   pin(4 6)
+   pin(5 16)
+  )
+  circuit(17 INVX1 location(6000 0)
+   pin(0 3)
+   pin(1 6)
+   pin(2 16)
+   pin(3 3)
+   pin(4 5)
+   pin(5 16)
+  )
+  circuit(18 INVX1 location(4200 0)
+   pin(0 3)
+   pin(1 5)
+   pin(2 16)
+   pin(3 3)
+   pin(4 4)
    pin(5 16)
   )
 
@@ -801,15 +801,15 @@ xref(
    device(4 4 match)
    device(1 1 match)
    device(2 2 match)
-   circuit(8 2 match)
-   circuit(9 3 match)
-   circuit(10 4 match)
-   circuit(11 5 match)
-   circuit(12 6 match)
+   circuit(18 2 match)
+   circuit(17 3 match)
+   circuit(16 4 match)
+   circuit(15 5 match)
+   circuit(14 6 match)
    circuit(13 7 match)
-   circuit(14 8 match)
-   circuit(15 9 match)
-   circuit(16 10 match)
+   circuit(12 8 match)
+   circuit(11 9 match)
+   circuit(10 10 match)
    circuit(2 11 match)
    circuit(1 12 match)
   )
diff --git a/testdata/lvs/ringo_simple.lvsdb.1 b/testdata/lvs/ringo_simple.lvsdb.1
index c7c49dbe7..5069e8e32 100644
--- a/testdata/lvs/ringo_simple.lvsdb.1
+++ b/testdata/lvs/ringo_simple.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -403,27 +403,27 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
+   rect(l3 (0 4500) (600 3500))
    rect(l3 (23300 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
+   rect(l3 (-25300 -3500) (1400 3500))
+   rect(l8 (22610 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
+   rect(l11 (1660 860) (0 0))
+   rect(l11 (-2950 -450) (600 800))
    rect(l11 (23400 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
+   rect(l11 (-25200 -800) (1200 800))
+   rect(l11 (-750 -1450) (300 1400))
+   rect(l11 (-100 -350) (0 0))
+   rect(l9 (23100 -1100) (500 1500))
+   rect(l9 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l11 (23440 3840) (320 320))
@@ -438,23 +438,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
+   rect(l8 (24510 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1660 -390) (0 0))
+   rect(l11 (21500 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple.lvsdb.2 b/testdata/lvs/ringo_simple.lvsdb.2
deleted file mode 100644
index ef872de19..000000000
--- a/testdata/lvs/ringo_simple.lvsdb.2
+++ /dev/null
@@ -1,908 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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 d572caf85..ed392bf6e 100644
--- a/testdata/lvs/ringo_simple_blackboxing.lvsdb
+++ b/testdata/lvs/ringo_simple_blackboxing.lvsdb
@@ -116,9 +116,9 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(6 name(VDD)
-   rect(l3 (1100 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
+   rect(l3 (600 4500) (600 3500))
+   rect(l3 (-100 -3500) (1400 3500))
+   rect(l3 (22000 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
    rect(l8 (-24690 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
@@ -127,11 +127,11 @@ layout(
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l11 (-22340 860) (0 0))
-   rect(l11 (-1750 -450) (1200 800))
+   rect(l11 (-2350 -450) (600 800))
+   rect(l11 (0 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
+   rect(l11 (22750 -400) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
@@ -151,23 +151,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(9 name(VSS)
-   rect(l8 (1710 1610) (180 180))
+   rect(l8 (25110 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-22340 -390) (0 0))
-   rect(l11 (-1300 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1060 -390) (0 0))
+   rect(l11 (22100 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
   net(10 name($I22)
    rect(l11 (7350 2950) (900 300))
diff --git a/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb b/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb
index d572caf85..ed392bf6e 100644
--- a/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb
+++ b/testdata/lvs/ringo_simple_blackboxing_netter.lvsdb
@@ -116,9 +116,9 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(6 name(VDD)
-   rect(l3 (1100 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
+   rect(l3 (600 4500) (600 3500))
+   rect(l3 (-100 -3500) (1400 3500))
+   rect(l3 (22000 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
    rect(l8 (-24690 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
@@ -127,11 +127,11 @@ layout(
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l11 (-22340 860) (0 0))
-   rect(l11 (-1750 -450) (1200 800))
+   rect(l11 (-2350 -450) (600 800))
+   rect(l11 (0 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
+   rect(l11 (22750 -400) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
@@ -151,23 +151,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(9 name(VSS)
-   rect(l8 (1710 1610) (180 180))
+   rect(l8 (25110 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-22340 -390) (0 0))
-   rect(l11 (-1300 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1060 -390) (0 0))
+   rect(l11 (22100 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
   net(10 name($I22)
    rect(l11 (7350 2950) (900 300))
diff --git a/testdata/lvs/ringo_simple_compare2.lvsdb.1 b/testdata/lvs/ringo_simple_compare2.lvsdb.1
index c7c49dbe7..5069e8e32 100644
--- a/testdata/lvs/ringo_simple_compare2.lvsdb.1
+++ b/testdata/lvs/ringo_simple_compare2.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -403,27 +403,27 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
+   rect(l3 (0 4500) (600 3500))
    rect(l3 (23300 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
+   rect(l3 (-25300 -3500) (1400 3500))
+   rect(l8 (22610 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
+   rect(l11 (1660 860) (0 0))
+   rect(l11 (-2950 -450) (600 800))
    rect(l11 (23400 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
+   rect(l11 (-25200 -800) (1200 800))
+   rect(l11 (-750 -1450) (300 1400))
+   rect(l11 (-100 -350) (0 0))
+   rect(l9 (23100 -1100) (500 1500))
+   rect(l9 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l11 (23440 3840) (320 320))
@@ -438,23 +438,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
+   rect(l8 (24510 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1660 -390) (0 0))
+   rect(l11 (21500 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple_compare2.lvsdb.2 b/testdata/lvs/ringo_simple_compare2.lvsdb.2
deleted file mode 100644
index ef872de19..000000000
--- a/testdata/lvs/ringo_simple_compare2.lvsdb.2
+++ /dev/null
@@ -1,908 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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_device_scaling.lvsdb.1 b/testdata/lvs/ringo_simple_device_scaling.lvsdb.1
index 7741c19d1..c5c1ee2e4 100644
--- a/testdata/lvs/ringo_simple_device_scaling.lvsdb.1
+++ b/testdata/lvs/ringo_simple_device_scaling.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -403,27 +403,27 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
+   rect(l3 (0 4500) (600 3500))
    rect(l3 (23300 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
+   rect(l3 (-25300 -3500) (1400 3500))
+   rect(l8 (22610 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
+   rect(l11 (1660 860) (0 0))
+   rect(l11 (-2950 -450) (600 800))
    rect(l11 (23400 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
+   rect(l11 (-25200 -800) (1200 800))
+   rect(l11 (-750 -1450) (300 1400))
+   rect(l11 (-100 -350) (0 0))
+   rect(l9 (23100 -1100) (500 1500))
+   rect(l9 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l11 (23440 3840) (320 320))
@@ -438,23 +438,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
+   rect(l8 (24510 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1660 -390) (0 0))
+   rect(l11 (21500 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple_device_scaling.lvsdb.2 b/testdata/lvs/ringo_simple_device_scaling.lvsdb.2
deleted file mode 100644
index 9c45bc1f1..000000000
--- a/testdata/lvs/ringo_simple_device_scaling.lvsdb.2
+++ /dev/null
@@ -1,908 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.5)
-   param(W 3)
-   param(AS 2.55)
-   param(AD 1.35)
-   param(PS 7.7)
-   param(PD 3.9)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.5)
-   param(W 3)
-   param(AS 1.35)
-   param(AD 2.55)
-   param(PS 3.9)
-   param(PD 7.7)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.5)
-   param(W 1.9)
-   param(AS 1.615)
-   param(AD 0.855)
-   param(PS 5.5)
-   param(PD 2.8)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.5)
-   param(W 1.9)
-   param(AS 0.855)
-   param(AD 1.615)
-   param(PS 2.8)
-   param(PD 5.5)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.5)
-   param(W 3)
-   param(AS 2.55)
-   param(AD 2.55)
-   param(PS 7.7)
-   param(PD 7.7)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.5)
-   param(W 1.9)
-   param(AS 1.615)
-   param(AD 1.615)
-   param(PS 5.5)
-   param(PD 5.5)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.5)
-   param(W 3)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.5)
-   param(W 3)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.5)
-   param(W 1.9)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 6)
-   terminal(D 3)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.5)
-   param(W 1.9)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 8)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.5)
-   param(W 3)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.5)
-   param(W 1.9)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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_dmos.lvsdb.1 b/testdata/lvs/ringo_simple_dmos.lvsdb.1
index a32be3a4b..1fcefb44e 100644
--- a/testdata/lvs/ringo_simple_dmos.lvsdb.1
+++ b/testdata/lvs/ringo_simple_dmos.lvsdb.1
@@ -407,27 +407,27 @@ layout(
    rect(l15 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l4 (500 4500) (1400 3500))
-   rect(l4 (-1900 -3500) (600 3500))
+   rect(l4 (0 4500) (600 3500))
    rect(l4 (23300 -3500) (1400 3500))
    rect(l4 (-100 -3500) (600 3500))
-   rect(l10 (-24690 -1240) (180 180))
+   rect(l4 (-25300 -3500) (1400 3500))
+   rect(l10 (22610 -1240) (180 180))
    rect(l10 (-180 370) (180 180))
    rect(l10 (-180 -1280) (180 180))
-   rect(l10 (23220 370) (180 180))
+   rect(l10 (-23580 370) (180 180))
    rect(l10 (-180 370) (180 180))
    rect(l10 (-180 -1280) (180 180))
-   rect(l13 (-21740 860) (0 0))
-   rect(l13 (-2350 -450) (1200 800))
-   rect(l13 (-750 -1450) (300 1400))
-   rect(l13 (-100 -350) (0 0))
-   rect(l13 (-1250 -400) (600 800))
+   rect(l13 (1660 860) (0 0))
+   rect(l13 (-2950 -450) (600 800))
    rect(l13 (23400 -800) (1200 800))
    rect(l13 (-750 -1450) (300 1400))
    rect(l13 (-100 -350) (0 0))
    rect(l13 (550 -400) (600 800))
-   rect(l11 (-24850 -1500) (500 1500))
-   rect(l11 (22900 -1500) (500 1500))
+   rect(l13 (-25200 -800) (1200 800))
+   rect(l13 (-750 -1450) (300 1400))
+   rect(l13 (-100 -350) (0 0))
+   rect(l11 (23100 -1100) (500 1500))
+   rect(l11 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l13 (23440 3840) (320 320))
@@ -442,23 +442,23 @@ layout(
    rect(l15 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l10 (1110 1610) (180 180))
+   rect(l10 (24510 1610) (180 180))
    rect(l10 (-180 -1280) (180 180))
    rect(l10 (-180 370) (180 180))
-   rect(l10 (23220 370) (180 180))
+   rect(l10 (-23580 370) (180 180))
    rect(l10 (-180 -1280) (180 180))
    rect(l10 (-180 370) (180 180))
-   rect(l13 (-21740 -390) (0 0))
-   rect(l13 (-1900 -400) (300 1400))
-   rect(l13 (-750 -1450) (1200 800))
-   rect(l13 (-550 -400) (0 0))
-   rect(l13 (-1250 -400) (600 800))
-   rect(l13 (23850 -750) (300 1400))
+   rect(l13 (1660 -390) (0 0))
+   rect(l13 (21500 -400) (300 1400))
    rect(l13 (-750 -1450) (1200 800))
    rect(l13 (-550 -400) (0 0))
    rect(l13 (550 -400) (600 800))
-   rect(l12 (-24850 -800) (500 1500))
-   rect(l12 (22900 -1500) (500 1500))
+   rect(l13 (-25800 -800) (600 800))
+   rect(l13 (450 -750) (300 1400))
+   rect(l13 (-750 -1450) (1200 800))
+   rect(l13 (-550 -400) (0 0))
+   rect(l12 (23100 -400) (500 1500))
+   rect(l12 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple_dmos.lvsdb.2 b/testdata/lvs/ringo_simple_dmos.lvsdb.2
deleted file mode 100644
index bce38cb9d..000000000
--- a/testdata/lvs/ringo_simple_dmos.lvsdb.2
+++ /dev/null
@@ -1,889 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l4 '1/0')
- layer(l5 '5/0')
- layer(l10 '8/0')
- layer(l13 '9/0')
- layer(l14 '10/0')
- layer(l15 '11/0')
- layer(l9)
- layer(l3)
- layer(l1)
- layer(l11)
- layer(l8)
- layer(l6)
- layer(l12)
-
- # Mask layer connectivity
- connect(l4 l4 l11)
- connect(l5 l5 l10)
- connect(l10 l5 l10 l13 l3 l1 l11 l8 l6 l12)
- connect(l13 l10 l13 l14)
- connect(l14 l13 l14 l15)
- connect(l15 l14 l15)
- connect(l9 l9)
- connect(l3 l10 l3)
- connect(l1 l10 l1)
- connect(l11 l4 l10 l11)
- connect(l8 l10 l8)
- connect(l6 l10 l6)
- connect(l12 l10 l12)
-
- # Global nets and connectivity
- global(l9 SUBSTRATE)
- global(l12 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l3 (125 -750) (450 1500))
-  )
-  terminal(G
-   rect(l5 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l1 (-550 -750) (425 1500))
-  )
-  terminal(B
-   rect(l4 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l3 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l5 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l1 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l4 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l3 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l5 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l1 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l4 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l8 (125 -475) (450 950))
-  )
-  terminal(G
-   rect(l5 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(B
-   rect(l9 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l8 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l5 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l9 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l8 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l5 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l9 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l10 (1110 5160) (180 180))
-   rect(l10 (-180 920) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l13 (-240 -790) (300 1700))
-   rect(l13 (-1350 0) (2400 800))
-   rect(l13 (-1150 -400) (0 0))
-   rect(l3 (-250 -2150) (425 1500))
-   rect(l3 (-450 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l10 (1810 1770) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l10 (-1580 3760) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l10 (1220 920) (180 180))
-   rect(l10 (-180 -1280) (180 180))
-   rect(l10 (-180 370) (180 180))
-   polygon(l13 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l13 (-110 1390) (300 1400))
-   polygon(l13 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l13 (-140 -500) (0 0))
-   rect(l13 (-1750 1100) (300 1400))
-   rect(l13 (1100 -1700) (300 300))
-   rect(l13 (-300 0) (300 1400))
-   rect(l1 (-1750 -1450) (425 1500))
-   rect(l1 (950 -1500) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l10 (410 1770) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l13 (-240 -1300) (300 1360))
-   rect(l13 (-650 -2160) (2400 800))
-   rect(l13 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l8 (1000 1660) (425 950))
-   rect(l8 (-450 -950) (425 950))
-  )
-  net(5 name($5)
-   rect(l4 (-100 4500) (2600 3500))
-  )
-  net(6 name(B)
-   rect(l5 (1425 2860) (250 1940))
-   rect(l5 (-345 -950) (300 300))
-   rect(l5 (-205 650) (250 2000))
-   rect(l5 (-250 -2000) (250 2000))
-   rect(l5 (-250 -5390) (250 1450))
-   rect(l10 (-285 1050) (180 180))
-   rect(l13 (-70 -90) (0 0))
-   rect(l13 (-170 -150) (300 300))
-  )
-  net(7 name(A)
-   rect(l5 (725 2860) (250 1940))
-   rect(l5 (-325 -1850) (300 300))
-   rect(l5 (-225 1550) (250 2000))
-   rect(l5 (-250 -2000) (250 2000))
-   rect(l5 (-250 -5390) (250 1450))
-   rect(l10 (-265 150) (180 180))
-   rect(l13 (-90 -90) (0 0))
-   rect(l13 (-150 -150) (300 300))
-  )
-  net(8 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(5)
-  pin(6 name(B))
-  pin(7 name(A))
-  pin(8 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 7)
-   terminal(D 2)
-   terminal(B 5)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 5)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 4)
-   terminal(G 7)
-   terminal(D 3)
-   terminal(B 8)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 4)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 8)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l10 (410 6260) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l13 (-240 -240) (300 1400))
-   rect(l13 (-650 300) (1800 800))
-   rect(l13 (-1450 -1100) (300 300))
-   rect(l13 (300 400) (0 0))
-   rect(l3 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l10 (1110 5160) (180 180))
-   rect(l10 (-180 920) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l10 (-180 -4120) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l13 (-240 -790) (300 4790))
-   rect(l13 (-150 -2500) (0 0))
-   rect(l1 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l10 (410 1770) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l13 (-240 -1300) (300 1360))
-   rect(l13 (-650 -2160) (1800 800))
-   rect(l13 (-850 -400) (0 0))
-   rect(l8 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l4 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l5 (725 2860) (250 1940))
-   rect(l5 (-525 -1850) (300 300))
-   rect(l5 (-25 1550) (250 2000))
-   rect(l5 (-250 -2000) (250 2000))
-   rect(l5 (-250 -5390) (250 1450))
-   rect(l10 (-465 150) (180 180))
-   rect(l13 (-90 -90) (0 0))
-   rect(l13 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l13 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l13 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l13 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l13 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l13 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l13 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l13 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l13 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l13 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l13 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l13 (21750 2950) (900 300))
-   rect(l13 (-19530 590) (320 320))
-   rect(l13 (17820 -320) (320 320))
-   rect(l14 (-18400 -260) (200 200))
-   rect(l14 (17940 -200) (200 200))
-   rect(l15 (-18040 -300) (17740 400))
-   rect(l15 (-17920 -200) (0 0))
-   rect(l15 (-220 -200) (400 400))
-   rect(l15 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l4 (500 4500) (1400 3500))
-   rect(l4 (-1900 -3500) (600 3500))
-   rect(l4 (23300 -3500) (1400 3500))
-   rect(l4 (-100 -3500) (600 3500))
-   rect(l10 (-24690 -1240) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l10 (-180 -1280) (180 180))
-   rect(l10 (23220 370) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l10 (-180 -1280) (180 180))
-   rect(l13 (-21740 860) (0 0))
-   rect(l13 (-2350 -450) (1200 800))
-   rect(l13 (-750 -1450) (300 1400))
-   rect(l13 (-100 -350) (0 0))
-   rect(l13 (-1250 -400) (600 800))
-   rect(l13 (23400 -800) (1200 800))
-   rect(l13 (-750 -1450) (300 1400))
-   rect(l13 (-100 -350) (0 0))
-   rect(l13 (550 -400) (600 800))
-   rect(l11 (-24850 -1500) (500 1500))
-   rect(l11 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l13 (23440 3840) (320 320))
-   rect(l14 (-260 -260) (200 200))
-   rect(l15 (-100 -100) (0 0))
-   rect(l15 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l13 (2440 2940) (320 320))
-   rect(l14 (-260 -260) (200 200))
-   rect(l15 (-100 -100) (0 0))
-   rect(l15 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l10 (1110 1610) (180 180))
-   rect(l10 (-180 -1280) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l10 (23220 370) (180 180))
-   rect(l10 (-180 -1280) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l13 (-21740 -390) (0 0))
-   rect(l13 (-1900 -400) (300 1400))
-   rect(l13 (-750 -1450) (1200 800))
-   rect(l13 (-550 -400) (0 0))
-   rect(l13 (-1250 -400) (600 800))
-   rect(l13 (23850 -750) (300 1400))
-   rect(l13 (-750 -1450) (1200 800))
-   rect(l13 (-550 -400) (0 0))
-   rect(l13 (550 -400) (600 800))
-   rect(l12 (-24850 -800) (500 1500))
-   rect(l12 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- log(
-  entry(error description('Circuits RINGO and RINGO could not be compared because the following subcircuits failed to compare:\n  A: ND2X1\n  B: ND2X1'))
- )
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 nomatch
-  log(
-   entry(error description('No equivalent pin VSS from netlist found in reference netlist.\nThis is an indication that additional physical connections are made to the subcircuit cell.'))
-   entry(info description('Potential invalid connection in circuit RINGO, subcircuit cell reference at r0 *1 1.8,0'))
-   entry(error description('No equivalent pin VSS from reference netlist found in netlist.\nThis is an indication that a physical connection is not made to the subcircuit.'))
-  )
-  xref(
-   net(5 4 match)
-   net(4 3 mismatch)
-   net(7 6 match)
-   net(6 5 match)
-   net(2 2 match)
-   net(8 7 mismatch)
-   net(1 1 match)
-   net(3 8 mismatch)
-   pin(() 2 mismatch)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 () mismatch)
-   device(3 3 match)
-   device(4 4 mismatch)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO skipped description('Circuits RINGO and RINGO could not be compared because the following subcircuits failed to compare:\n  A: ND2X1\n  B: ND2X1')
-  xref(
-  )
- )
-)
diff --git a/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.1 b/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.1
index 8ef823a92..1c3128438 100644
--- a/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.1
+++ b/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.1
@@ -413,27 +413,27 @@ layout(
    rect(l15 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l4 (500 4500) (1400 3500))
-   rect(l4 (-1900 -3500) (600 3500))
+   rect(l4 (0 4500) (600 3500))
    rect(l4 (23300 -3500) (1400 3500))
    rect(l4 (-100 -3500) (600 3500))
-   rect(l10 (-24690 -1240) (180 180))
+   rect(l4 (-25300 -3500) (1400 3500))
+   rect(l10 (22610 -1240) (180 180))
    rect(l10 (-180 370) (180 180))
    rect(l10 (-180 -1280) (180 180))
-   rect(l10 (23220 370) (180 180))
+   rect(l10 (-23580 370) (180 180))
    rect(l10 (-180 370) (180 180))
    rect(l10 (-180 -1280) (180 180))
-   rect(l13 (-21740 860) (0 0))
-   rect(l13 (-2350 -450) (1200 800))
-   rect(l13 (-750 -1450) (300 1400))
-   rect(l13 (-100 -350) (0 0))
-   rect(l13 (-1250 -400) (600 800))
+   rect(l13 (1660 860) (0 0))
+   rect(l13 (-2950 -450) (600 800))
    rect(l13 (23400 -800) (1200 800))
    rect(l13 (-750 -1450) (300 1400))
    rect(l13 (-100 -350) (0 0))
    rect(l13 (550 -400) (600 800))
-   rect(l11 (-24850 -1500) (500 1500))
-   rect(l11 (22900 -1500) (500 1500))
+   rect(l13 (-25200 -800) (1200 800))
+   rect(l13 (-750 -1450) (300 1400))
+   rect(l13 (-100 -350) (0 0))
+   rect(l11 (23100 -1100) (500 1500))
+   rect(l11 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l13 (23440 3840) (320 320))
@@ -448,23 +448,23 @@ layout(
    rect(l15 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l10 (1110 1610) (180 180))
+   rect(l10 (24510 1610) (180 180))
    rect(l10 (-180 -1280) (180 180))
    rect(l10 (-180 370) (180 180))
-   rect(l10 (23220 370) (180 180))
+   rect(l10 (-23580 370) (180 180))
    rect(l10 (-180 -1280) (180 180))
    rect(l10 (-180 370) (180 180))
-   rect(l13 (-21740 -390) (0 0))
-   rect(l13 (-1900 -400) (300 1400))
-   rect(l13 (-750 -1450) (1200 800))
-   rect(l13 (-550 -400) (0 0))
-   rect(l13 (-1250 -400) (600 800))
-   rect(l13 (23850 -750) (300 1400))
+   rect(l13 (1660 -390) (0 0))
+   rect(l13 (21500 -400) (300 1400))
    rect(l13 (-750 -1450) (1200 800))
    rect(l13 (-550 -400) (0 0))
    rect(l13 (550 -400) (600 800))
-   rect(l12 (-24850 -800) (500 1500))
-   rect(l12 (22900 -1500) (500 1500))
+   rect(l13 (-25800 -800) (600 800))
+   rect(l13 (450 -750) (300 1400))
+   rect(l13 (-750 -1450) (1200 800))
+   rect(l13 (-550 -400) (0 0))
+   rect(l12 (23100 -400) (500 1500))
+   rect(l12 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.2 b/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.2
deleted file mode 100644
index e8b7f3655..000000000
--- a/testdata/lvs/ringo_simple_dmos_fixed.lvsdb.2
+++ /dev/null
@@ -1,918 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l4 '1/0')
- layer(l5 '5/0')
- layer(l10 '8/0')
- layer(l13 '9/0')
- layer(l14 '10/0')
- layer(l15 '11/0')
- layer(l9)
- layer(l3)
- layer(l1)
- layer(l11)
- layer(l8)
- layer(l6)
- layer(l12)
-
- # Mask layer connectivity
- connect(l4 l4 l11)
- connect(l5 l5 l10)
- connect(l10 l5 l10 l13 l3 l1 l11 l8 l6 l12)
- connect(l13 l10 l13 l14)
- connect(l14 l13 l14 l15)
- connect(l15 l14 l15)
- connect(l9 l9)
- connect(l3 l10 l3 l1)
- connect(l1 l10 l3 l1)
- connect(l11 l4 l10 l11)
- connect(l8 l10 l8 l6)
- connect(l6 l10 l8 l6)
- connect(l12 l10 l12)
-
- # Global nets and connectivity
- global(l9 SUBSTRATE)
- global(l12 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l3 (125 -750) (450 1500))
-  )
-  terminal(G
-   rect(l5 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l1 (-550 -750) (425 1500))
-  )
-  terminal(B
-   rect(l4 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l3 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l5 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l1 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l4 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l3 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l5 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l1 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l4 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l8 (-342 -475) (217 950))
-  )
-  terminal(G
-   rect(l5 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l9 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l8 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l5 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (233 950))
-  )
-  terminal(B
-   rect(l9 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l8 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l5 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l9 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l10 (1110 5160) (180 180))
-   rect(l10 (-180 920) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l13 (-240 -790) (300 1700))
-   rect(l13 (-1350 0) (2400 800))
-   rect(l13 (-1150 -400) (0 0))
-   rect(l3 (-250 -2150) (425 1500))
-   rect(l3 (-450 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l10 (1810 1770) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l10 (-1580 3760) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l10 (1220 920) (180 180))
-   rect(l10 (-180 -1280) (180 180))
-   rect(l10 (-180 370) (180 180))
-   polygon(l13 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l13 (-110 1390) (300 1400))
-   polygon(l13 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l13 (-140 -500) (0 0))
-   rect(l13 (-1750 1100) (300 1400))
-   rect(l13 (1100 -1700) (300 300))
-   rect(l13 (-300 0) (300 1400))
-   rect(l1 (-1750 -1450) (425 1500))
-   rect(l1 (950 -1500) (425 1500))
-   rect(l6 (-192 -4890) (192 950))
-   rect(l6 (-425 -950) (233 950))
-  )
-  net(3 name(VSS)
-   rect(l10 (410 1770) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l13 (-240 -1300) (300 1360))
-   rect(l13 (-650 -2160) (2400 800))
-   rect(l13 (-1150 -400) (0 0))
-   rect(l8 (-950 860) (208 950))
-   rect(l8 (0 -950) (217 950))
-  )
-  net(4 name($4)
-   rect(l8 (1208 1660) (192 950))
-   rect(l8 (-192 -950) (217 950))
-   rect(l6 (-425 -950) (208 950))
-   rect(l6 (-233 -950) (233 950))
-  )
-  net(5 name($5)
-   rect(l4 (-100 4500) (2600 3500))
-  )
-  net(6 name(B)
-   rect(l5 (1425 2860) (250 1940))
-   rect(l5 (-345 -950) (300 300))
-   rect(l5 (-205 650) (250 2000))
-   rect(l5 (-250 -2000) (250 2000))
-   rect(l5 (-250 -5390) (250 1450))
-   rect(l10 (-285 1050) (180 180))
-   rect(l13 (-70 -90) (0 0))
-   rect(l13 (-170 -150) (300 300))
-  )
-  net(7 name(A)
-   rect(l5 (725 2860) (250 1940))
-   rect(l5 (-325 -1850) (300 300))
-   rect(l5 (-225 1550) (250 2000))
-   rect(l5 (-250 -2000) (250 2000))
-   rect(l5 (-250 -5390) (250 1450))
-   rect(l10 (-265 150) (180 180))
-   rect(l13 (-90 -90) (0 0))
-   rect(l13 (-150 -150) (300 300))
-  )
-  net(8 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(5)
-  pin(6 name(B))
-  pin(7 name(A))
-  pin(8 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 7)
-   terminal(D 2)
-   terminal(B 5)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 5)
-  )
-  device(3 D$NMOS
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.20615)
-   param(AD 0.40375)
-   param(PS 2.334)
-   param(PD 2.75)
-   terminal(S 4)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 8)
-  )
-  device(4 D$NMOS$1
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.22135)
-   param(PS 2.75)
-   param(PD 2.366)
-   terminal(S 3)
-   terminal(G 7)
-   terminal(D 4)
-   terminal(B 8)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l10 (410 6260) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l13 (-240 -240) (300 1400))
-   rect(l13 (-650 300) (1800 800))
-   rect(l13 (-1450 -1100) (300 300))
-   rect(l13 (300 400) (0 0))
-   rect(l3 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l10 (1110 5160) (180 180))
-   rect(l10 (-180 920) (180 180))
-   rect(l10 (-180 -730) (180 180))
-   rect(l10 (-180 -4120) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l13 (-240 -790) (300 4790))
-   rect(l13 (-150 -2500) (0 0))
-   rect(l1 (-225 1050) (425 1500))
-   rect(l6 (-192 -4890) (192 950))
-   rect(l6 (-425 -950) (233 950))
-  )
-  net(3 name(VSS)
-   rect(l10 (410 1770) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l13 (-240 -1300) (300 1360))
-   rect(l13 (-650 -2160) (1800 800))
-   rect(l13 (-850 -400) (0 0))
-   rect(l8 (-650 860) (208 950))
-   rect(l8 (0 -950) (217 950))
-  )
-  net(4 name($4)
-   rect(l4 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l5 (725 2860) (250 1940))
-   rect(l5 (-525 -1850) (300 300))
-   rect(l5 (-25 1550) (250 2000))
-   rect(l5 (-250 -2000) (250 2000))
-   rect(l5 (-250 -5390) (250 1450))
-   rect(l10 (-465 150) (180 180))
-   rect(l13 (-90 -90) (0 0))
-   rect(l13 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l13 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l13 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l13 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l13 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l13 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l13 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l13 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l13 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l13 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l13 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l13 (21750 2950) (900 300))
-   rect(l13 (-19530 590) (320 320))
-   rect(l13 (17820 -320) (320 320))
-   rect(l14 (-18400 -260) (200 200))
-   rect(l14 (17940 -200) (200 200))
-   rect(l15 (-18040 -300) (17740 400))
-   rect(l15 (-17920 -200) (0 0))
-   rect(l15 (-220 -200) (400 400))
-   rect(l15 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l4 (500 4500) (1400 3500))
-   rect(l4 (-1900 -3500) (600 3500))
-   rect(l4 (23300 -3500) (1400 3500))
-   rect(l4 (-100 -3500) (600 3500))
-   rect(l10 (-24690 -1240) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l10 (-180 -1280) (180 180))
-   rect(l10 (23220 370) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l10 (-180 -1280) (180 180))
-   rect(l13 (-21740 860) (0 0))
-   rect(l13 (-2350 -450) (1200 800))
-   rect(l13 (-750 -1450) (300 1400))
-   rect(l13 (-100 -350) (0 0))
-   rect(l13 (-1250 -400) (600 800))
-   rect(l13 (23400 -800) (1200 800))
-   rect(l13 (-750 -1450) (300 1400))
-   rect(l13 (-100 -350) (0 0))
-   rect(l13 (550 -400) (600 800))
-   rect(l11 (-24850 -1500) (500 1500))
-   rect(l11 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l13 (23440 3840) (320 320))
-   rect(l14 (-260 -260) (200 200))
-   rect(l15 (-100 -100) (0 0))
-   rect(l15 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l13 (2440 2940) (320 320))
-   rect(l14 (-260 -260) (200 200))
-   rect(l15 (-100 -100) (0 0))
-   rect(l15 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l10 (1110 1610) (180 180))
-   rect(l10 (-180 -1280) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l10 (23220 370) (180 180))
-   rect(l10 (-180 -1280) (180 180))
-   rect(l10 (-180 370) (180 180))
-   rect(l13 (-21740 -390) (0 0))
-   rect(l13 (-1900 -400) (300 1400))
-   rect(l13 (-750 -1450) (1200 800))
-   rect(l13 (-550 -400) (0 0))
-   rect(l13 (-1250 -400) (600 800))
-   rect(l13 (23850 -750) (300 1400))
-   rect(l13 (-750 -1450) (1200 800))
-   rect(l13 (-550 -400) (0 0))
-   rect(l13 (550 -400) (600 800))
-   rect(l12 (-24850 -800) (500 1500))
-   rect(l12 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(4 8 match)
-   net(5 4 match)
-   net(7 6 match)
-   net(6 5 match)
-   net(2 2 match)
-   net(8 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(4 3 match)
-   device(3 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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_dummy_device.lvsdb.1 b/testdata/lvs/ringo_simple_dummy_device.lvsdb.1
index 34f8ebd41..bd9b37fe3 100644
--- a/testdata/lvs/ringo_simple_dummy_device.lvsdb.1
+++ b/testdata/lvs/ringo_simple_dummy_device.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -410,33 +410,33 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(13 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
+   rect(l3 (27000 4500) (600 3500))
+   rect(l3 (-1200 -3500) (600 3500))
+   rect(l3 (-1200 -3500) (600 3500))
+   rect(l3 (-26400 -3500) (600 3500))
    rect(l3 (23300 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l3 (0 -3500) (600 3500))
-   rect(l3 (0 -3500) (600 3500))
-   rect(l3 (0 -3500) (600 3500))
-   rect(l8 (-26490 -1240) (180 180))
+   rect(l3 (-25300 -3500) (1400 3500))
+   rect(l8 (22610 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
+   rect(l11 (1660 860) (0 0))
+   rect(l11 (24050 -450) (600 800))
+   rect(l11 (-1200 -800) (600 800))
+   rect(l11 (-1200 -800) (600 800))
+   rect(l11 (-26400 -800) (600 800))
    rect(l11 (23400 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l9 (-26650 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
+   rect(l11 (-25200 -800) (1200 800))
+   rect(l11 (-750 -1450) (300 1400))
+   rect(l11 (-100 -350) (0 0))
+   rect(l9 (23100 -1100) (500 1500))
+   rect(l9 (-23900 -1500) (500 1500))
   )
   net(14 name(OUT)
    rect(l11 (23440 3840) (320 320))
@@ -455,30 +455,30 @@ layout(
    rect(l8 (-180 370) (180 180))
    rect(l8 (520 -730) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (-25780 -890) (180 180))
+   rect(l8 (-2380 -890) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (1260 -40) (300 1360))
+   rect(l11 (24660 -40) (300 1360))
    rect(l11 (400 -1360) (300 1360))
    rect(l11 (-24000 -1710) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (21500 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l6 (-1700 400) (425 950))
+   rect(l11 (1200 -800) (600 800))
+   rect(l11 (-1200 -800) (600 800))
+   rect(l11 (-1200 -800) (600 800))
+   rect(l11 (-26400 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l6 (24650 800) (425 950))
    rect(l6 (250 -950) (425 950))
-   rect(l10 (-26050 -2150) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l10 (-2650 -2150) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple_dummy_device.lvsdb.2 b/testdata/lvs/ringo_simple_dummy_device.lvsdb.2
deleted file mode 100644
index dbecf1b84..000000000
--- a/testdata/lvs/ringo_simple_dummy_device.lvsdb.2
+++ /dev/null
@@ -1,965 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS$1
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$2
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (27600 7650))
-
-  # Nets with their geometries
-  net(1 name($3)
-   rect(l4 (26050 2800) (525 550))
-   rect(l4 (-525 -300) (300 300))
-   rect(l4 (-25 -2000) (250 1450))
-   rect(l8 (-465 310) (180 180))
-   rect(l11 (-240 -240) (300 300))
-  )
-  net(2 name($4)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(3 name($5)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(4 name($6)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(5 name($7)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(6 name($8)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(7 name($9)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(8 name($10)
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(9 name($11)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(10 name($12)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(11 name($13)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(12 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(13 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l3 (0 -3500) (600 3500))
-   rect(l3 (0 -3500) (600 3500))
-   rect(l3 (0 -3500) (600 3500))
-   rect(l8 (-26490 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l9 (-26650 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(14 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(16 name(VSS)
-   rect(l8 (26010 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (520 -730) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-25780 -890) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (1260 -40) (300 1360))
-   rect(l11 (400 -1360) (300 1360))
-   rect(l11 (-24000 -1710) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l11 (0 -800) (600 800))
-   rect(l6 (-1025 400) (425 950))
-   rect(l6 (-1100 -950) (425 950))
-   rect(l10 (-25375 -2150) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(12 name(FB))
-  pin(13 name(VDD))
-  pin(14 name(OUT))
-  pin(15 name(ENABLE))
-  pin(16 name(VSS))
-
-  # Devices and their connections
-  device(1 D$NMOS
-   location(26450 2075)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 16)
-   terminal(G 1)
-   terminal(D 16)
-   terminal(B 16)
-  )
-
-  # Subcircuits and their connections
-  circuit(3 ND2X1 location(1800 0)
-   pin(0 13)
-   pin(1 2)
-   pin(2 16)
-   pin(3 13)
-   pin(4 12)
-   pin(5 15)
-   pin(6 16)
-  )
-  circuit(4 INVX1 location(4200 0)
-   pin(0 13)
-   pin(1 3)
-   pin(2 16)
-   pin(3 13)
-   pin(4 2)
-   pin(5 16)
-  )
-  circuit(5 INVX1 location(6000 0)
-   pin(0 13)
-   pin(1 4)
-   pin(2 16)
-   pin(3 13)
-   pin(4 3)
-   pin(5 16)
-  )
-  circuit(6 INVX1 location(7800 0)
-   pin(0 13)
-   pin(1 5)
-   pin(2 16)
-   pin(3 13)
-   pin(4 4)
-   pin(5 16)
-  )
-  circuit(7 INVX1 location(9600 0)
-   pin(0 13)
-   pin(1 6)
-   pin(2 16)
-   pin(3 13)
-   pin(4 5)
-   pin(5 16)
-  )
-  circuit(8 INVX1 location(11400 0)
-   pin(0 13)
-   pin(1 7)
-   pin(2 16)
-   pin(3 13)
-   pin(4 6)
-   pin(5 16)
-  )
-  circuit(9 INVX1 location(13200 0)
-   pin(0 13)
-   pin(1 8)
-   pin(2 16)
-   pin(3 13)
-   pin(4 7)
-   pin(5 16)
-  )
-  circuit(10 INVX1 location(15000 0)
-   pin(0 13)
-   pin(1 9)
-   pin(2 16)
-   pin(3 13)
-   pin(4 8)
-   pin(5 16)
-  )
-  circuit(11 INVX1 location(16800 0)
-   pin(0 13)
-   pin(1 10)
-   pin(2 16)
-   pin(3 13)
-   pin(4 9)
-   pin(5 16)
-  )
-  circuit(12 INVX1 location(18600 0)
-   pin(0 13)
-   pin(1 11)
-   pin(2 16)
-   pin(3 13)
-   pin(4 10)
-   pin(5 16)
-  )
-  circuit(13 INVX1 location(20400 0)
-   pin(0 13)
-   pin(1 12)
-   pin(2 16)
-   pin(3 13)
-   pin(4 11)
-   pin(5 16)
-  )
-  circuit(14 INVX1 location(22200 0)
-   pin(0 13)
-   pin(1 14)
-   pin(2 16)
-   pin(3 13)
-   pin(4 12)
-   pin(5 16)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 6)
-   terminal(D 3)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 8)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-  net(16 name(DUMMY))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Devices and their connections
-  device(1 NMOS
-   name($1)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 16)
-   terminal(D 1)
-   terminal(B 1)
-  )
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(2 6 match)
-   net(11 15 match)
-   net(3 7 match)
-   net(4 8 match)
-   net(5 9 match)
-   net(6 10 match)
-   net(7 11 match)
-   net(8 12 match)
-   net(9 13 match)
-   net(10 14 match)
-   net(1 16 match)
-   net(15 4 match)
-   net(12 3 match)
-   net(14 5 match)
-   net(13 2 match)
-   net(16 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   device(1 1 match)
-   circuit(4 2 match)
-   circuit(5 3 match)
-   circuit(6 4 match)
-   circuit(7 5 match)
-   circuit(8 6 match)
-   circuit(9 7 match)
-   circuit(10 8 match)
-   circuit(11 9 match)
-   circuit(12 10 match)
-   circuit(13 11 match)
-   circuit(14 12 match)
-   circuit(3 1 match)
-  )
- )
-)
diff --git a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1 b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1
index cd3ac06ea..0dfd69794 100644
--- a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1
+++ b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.1
@@ -147,8 +147,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -202,9 +202,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -407,9 +407,9 @@ layout(
   )
   net(12 name(VDD)
    rect(l3 (22600 4500) (1400 3500))
-   rect(l3 (2400 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l3 (-27800 -3500) (1400 3500))
+   rect(l3 (3700 -3500) (600 3500))
+   rect(l3 (-1900 -3500) (1400 3500))
+   rect(l3 (-27300 -3500) (1400 3500))
    rect(l3 (-1900 -3500) (600 3500))
    rect(l8 (22610 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
@@ -426,11 +426,11 @@ layout(
    rect(l11 (19750 -450) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
-   rect(l11 (3150 -400) (1200 800))
+   rect(l11 (4350 -400) (600 800))
+   rect(l11 (-1800 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l11 (-27700 -800) (1200 800))
+   rect(l11 (-26550 -400) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (-1250 -400) (600 800))
diff --git a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2 b/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2
deleted file mode 100644
index dcfb4d716..000000000
--- a/testdata/lvs/ringo_simple_implicit_connections.lvsdb.2
+++ /dev/null
@@ -1,930 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Log entries
- message(warning description('Must-connect subnets of VDD must be connected further up in the hierarchy - this is an error at chip top level') cell(RINGO) cat('must-connect') polygon('(2.95,7.25;2.95,7.4;25.1,7.4;25.1,7.25)'))
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (28300 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (1160 300))
-  )
-  net(2 name($2)
-   rect(l11 (6050 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (7850 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (9650 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l11 (11450 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l11 (13250 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l11 (15050 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l11 (16850 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l11 (18650 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l11 (20450 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (22250 2950) (2900 300))
-   rect(l11 (-21980 590) (320 320))
-   rect(l11 (18570 -320) (320 320))
-   rect(l12 (-19150 -260) (200 200))
-   rect(l12 (18690 -200) (200 200))
-   rect(l13 (-18840 -300) (18890 400))
-   rect(l13 (-19070 -200) (0 0))
-   rect(l13 (-170 -200) (400 400))
-   rect(l13 (18490 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (22600 4500) (1400 3500))
-   rect(l3 (2400 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l3 (-27800 -3500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l8 (22610 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (3620 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-26080 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (21010 1010) (0 0))
-   rect(l11 (2800 -50) (0 0))
-   rect(l11 (-22150 -100) (0 0))
-   rect(l11 (19750 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (3150 -400) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l11 (-27700 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l9 (22450 -1500) (500 1500))
-   rect(l9 (3300 -1500) (500 1500))
-   rect(l9 (-26400 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l11 (25990 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-150 -100) (0 0))
-   rect(l13 (-150 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l11 (2490 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-150 -100) (0 0))
-   rect(l13 (-150 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (21920 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (3620 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-24240 -390) (0 0))
-   rect(l11 (19200 100) (0 0))
-   rect(l11 (3850 0) (0 0))
-   rect(l11 (-24950 -500) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (22550 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (3600 -350) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-27350 -800) (500 1500))
-   rect(l10 (21600 -1500) (500 1500))
-   rect(l10 (3300 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4700 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6500 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(8300 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(10100 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11900 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13700 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15500 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(17300 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(19100 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20900 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(24700 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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.cir.1 b/testdata/lvs/ringo_simple_io.cir.1
index 4d7ccf791..f13c18461 100644
--- a/testdata/lvs/ringo_simple_io.cir.1
+++ b/testdata/lvs/ringo_simple_io.cir.1
@@ -24,8 +24,8 @@ M$2 OUT IN VSS SUBSTRATE NMOS L=0.25U W=0.95U AS=0.40375P AD=0.40375P PS=2.75U
 .SUBCKT ND2X1 VDD OUT VSS \$4 B A SUBSTRATE
 M$1 VDD A OUT \$4 PMOS L=0.25U W=1.5U AS=0.6375P AD=0.3375P PS=3.85U PD=1.95U
 M$2 OUT B VDD \$4 PMOS L=0.25U W=1.5U AS=0.3375P AD=0.6375P PS=1.95U PD=3.85U
-M$3 \$I3 A VSS SUBSTRATE NMOS L=0.25U W=0.95U AS=0.40375P AD=0.21375P PS=2.75U
+M$3 \$I6 A VSS SUBSTRATE NMOS L=0.25U W=0.95U AS=0.40375P AD=0.21375P PS=2.75U
 + PD=1.4U
-M$4 OUT B \$I3 SUBSTRATE NMOS L=0.25U W=0.95U AS=0.21375P AD=0.40375P PS=1.4U
+M$4 OUT B \$I6 SUBSTRATE NMOS L=0.25U W=0.95U AS=0.21375P AD=0.40375P PS=1.4U
 + PD=2.75U
 .ENDS ND2X1
diff --git a/testdata/lvs/ringo_simple_io.cir.2 b/testdata/lvs/ringo_simple_io.cir.2
deleted file mode 100644
index 3f2524e11..000000000
--- a/testdata/lvs/ringo_simple_io.cir.2
+++ /dev/null
@@ -1,31 +0,0 @@
-* Extracted by KLayout
-
-.SUBCKT RINGO FB VDD OUT ENABLE VSS
-X$1 VDD \$1 VSS VDD FB ENABLE VSS ND2X1
-X$2 VDD \$2 VSS VDD \$1 VSS INVX1
-X$3 VDD \$3 VSS VDD \$2 VSS INVX1
-X$4 VDD \$4 VSS VDD \$3 VSS INVX1
-X$5 VDD \$5 VSS VDD \$4 VSS INVX1
-X$6 VDD \$6 VSS VDD \$5 VSS INVX1
-X$7 VDD \$7 VSS VDD \$6 VSS INVX1
-X$8 VDD \$8 VSS VDD \$7 VSS INVX1
-X$9 VDD \$9 VSS VDD \$8 VSS INVX1
-X$10 VDD \$10 VSS VDD \$9 VSS INVX1
-X$11 VDD FB VSS VDD \$10 VSS INVX1
-X$12 VDD OUT VSS VDD FB VSS INVX1
-.ENDS RINGO
-
-.SUBCKT INVX1 VDD OUT VSS \$4 IN SUBSTRATE
-M$1 OUT IN VDD \$4 PMOS L=0.25U W=1.5U AS=0.6375P AD=0.6375P PS=3.85U PD=3.85U
-M$2 OUT IN VSS SUBSTRATE NMOS L=0.25U W=0.95U AS=0.40375P AD=0.40375P PS=2.75U
-+ PD=2.75U
-.ENDS INVX1
-
-.SUBCKT ND2X1 VDD OUT VSS \$4 B A SUBSTRATE
-M$1 VDD A OUT \$4 PMOS L=0.25U W=1.5U AS=0.6375P AD=0.3375P PS=3.85U PD=1.95U
-M$2 OUT B VDD \$4 PMOS L=0.25U W=1.5U AS=0.3375P AD=0.6375P PS=1.95U PD=3.85U
-M$3 \$I5 A VSS SUBSTRATE NMOS L=0.25U W=0.95U AS=0.40375P AD=0.21375P PS=2.75U
-+ PD=1.4U
-M$4 OUT B \$I5 SUBSTRATE NMOS L=0.25U W=0.95U AS=0.21375P AD=0.40375P PS=1.4U
-+ PD=2.75U
-.ENDS ND2X1
diff --git a/testdata/lvs/ringo_simple_io.lvsdb.1 b/testdata/lvs/ringo_simple_io.lvsdb.1
index 584f02e4e..11dc59eb2 100644
--- a/testdata/lvs/ringo_simple_io.lvsdb.1
+++ b/testdata/lvs/ringo_simple_io.lvsdb.1
@@ -121,8 +121,8 @@ J(
    R(l11 (-240 -790) (300 1700))
    R(l11 (-1350 0) (2400 800))
    R(l11 (-1150 -400) (0 0))
-   R(l2 (-275 -2150) (425 1500))
-   R(l2 (-400 -1500) (425 1500))
+   R(l2 (-250 -2150) (425 1500))
+   R(l2 (-450 -1500) (425 1500))
   )
   N(2 I(OUT)
    R(l8 (1810 1770) (180 180))
@@ -176,9 +176,9 @@ J(
    R(l11 (-150 -150) (300 300))
   )
   N(7 I(SUBSTRATE))
-  N(8 I($I3)
-   R(l6 (975 1660) (425 950))
-   R(l6 (-400 -950) (425 950))
+  N(8 I($I6)
+   R(l6 (1000 1660) (425 950))
+   R(l6 (-450 -950) (425 950))
   )
   P(1 I(VDD))
   P(2 I(OUT))
@@ -362,27 +362,27 @@ J(
    R(l13 (17740 -400) (400 400))
   )
   N(12 I(VDD)
-   R(l3 (500 4500) (1400 3500))
-   R(l3 (-1900 -3500) (600 3500))
+   R(l3 (0 4500) (600 3500))
    R(l3 (23300 -3500) (1400 3500))
    R(l3 (-100 -3500) (600 3500))
-   R(l8 (-24690 -1240) (180 180))
+   R(l3 (-25300 -3500) (1400 3500))
+   R(l8 (22610 -1240) (180 180))
    R(l8 (-180 370) (180 180))
    R(l8 (-180 -1280) (180 180))
-   R(l8 (23220 370) (180 180))
+   R(l8 (-23580 370) (180 180))
    R(l8 (-180 370) (180 180))
    R(l8 (-180 -1280) (180 180))
-   R(l11 (-21740 860) (0 0))
-   R(l11 (-2350 -450) (1200 800))
-   R(l11 (-750 -1450) (300 1400))
-   R(l11 (-100 -350) (0 0))
-   R(l11 (-1250 -400) (600 800))
+   R(l11 (1660 860) (0 0))
+   R(l11 (-2950 -450) (600 800))
    R(l11 (23400 -800) (1200 800))
    R(l11 (-750 -1450) (300 1400))
    R(l11 (-100 -350) (0 0))
    R(l11 (550 -400) (600 800))
-   R(l9 (-24850 -1500) (500 1500))
-   R(l9 (22900 -1500) (500 1500))
+   R(l11 (-25200 -800) (1200 800))
+   R(l11 (-750 -1450) (300 1400))
+   R(l11 (-100 -350) (0 0))
+   R(l9 (23100 -1100) (500 1500))
+   R(l9 (-23900 -1500) (500 1500))
   )
   N(13 I(OUT)
    R(l11 (23440 3840) (320 320))
@@ -397,23 +397,23 @@ J(
    R(l13 (-200 -200) (400 400))
   )
   N(15 I(VSS)
-   R(l8 (1110 1610) (180 180))
+   R(l8 (24510 1610) (180 180))
    R(l8 (-180 -1280) (180 180))
    R(l8 (-180 370) (180 180))
-   R(l8 (23220 370) (180 180))
+   R(l8 (-23580 370) (180 180))
    R(l8 (-180 -1280) (180 180))
    R(l8 (-180 370) (180 180))
-   R(l11 (-21740 -390) (0 0))
-   R(l11 (-1900 -400) (300 1400))
-   R(l11 (-750 -1450) (1200 800))
-   R(l11 (-550 -400) (0 0))
-   R(l11 (-1250 -400) (600 800))
-   R(l11 (23850 -750) (300 1400))
+   R(l11 (1660 -390) (0 0))
+   R(l11 (21500 -400) (300 1400))
    R(l11 (-750 -1450) (1200 800))
    R(l11 (-550 -400) (0 0))
    R(l11 (550 -400) (600 800))
-   R(l10 (-24850 -800) (500 1500))
-   R(l10 (22900 -1500) (500 1500))
+   R(l11 (-25800 -800) (600 800))
+   R(l11 (450 -750) (300 1400))
+   R(l11 (-750 -1450) (1200 800))
+   R(l11 (-550 -400) (0 0))
+   R(l10 (23100 -400) (500 1500))
+   R(l10 (-23900 -1500) (500 1500))
   )
   P(11 I(FB))
   P(12 I(VDD))
diff --git a/testdata/lvs/ringo_simple_io.lvsdb.2 b/testdata/lvs/ringo_simple_io.lvsdb.2
deleted file mode 100644
index d4ce3d5dc..000000000
--- a/testdata/lvs/ringo_simple_io.lvsdb.2
+++ /dev/null
@@ -1,832 +0,0 @@
-#%lvsdb-klayout
-J(
- W(RINGO)
- U(0.001)
- L(l3 '1/0')
- L(l4 '5/0')
- L(l8 '8/0')
- L(l11 '9/0')
- L(l12 '10/0')
- L(l13 '11/0')
- L(l7)
- L(l2)
- L(l9)
- L(l6)
- L(l10)
- C(l3 l3 l9)
- C(l4 l4 l8)
- C(l8 l4 l8 l11 l2 l9 l6 l10)
- C(l11 l8 l11 l12)
- C(l12 l11 l12 l13)
- C(l13 l12 l13)
- C(l7 l7)
- C(l2 l8 l2)
- C(l9 l3 l8 l9)
- C(l6 l8 l6)
- C(l10 l8 l10)
- G(l7 SUBSTRATE)
- G(l10 SUBSTRATE)
- K(PMOS MOS4)
- K(NMOS MOS4)
- D(D$PMOS PMOS
-  T(S
-   R(l2 (-550 -750) (425 1500))
-  )
-  T(G
-   R(l4 (-125 -750) (250 1500))
-  )
-  T(D
-   R(l2 (125 -750) (450 1500))
-  )
-  T(B
-   R(l3 (-125 -750) (250 1500))
-  )
- )
- D(D$PMOS$1 PMOS
-  T(S
-   R(l2 (-575 -750) (450 1500))
-  )
-  T(G
-   R(l4 (-125 -750) (250 1500))
-  )
-  T(D
-   R(l2 (125 -750) (425 1500))
-  )
-  T(B
-   R(l3 (-125 -750) (250 1500))
-  )
- )
- D(D$PMOS$2 PMOS
-  T(S
-   R(l2 (-550 -750) (425 1500))
-  )
-  T(G
-   R(l4 (-125 -750) (250 1500))
-  )
-  T(D
-   R(l2 (125 -750) (425 1500))
-  )
-  T(B
-   R(l3 (-125 -750) (250 1500))
-  )
- )
- D(D$NMOS NMOS
-  T(S
-   R(l6 (-550 -475) (425 950))
-  )
-  T(G
-   R(l4 (-125 -475) (250 950))
-  )
-  T(D
-   R(l6 (125 -475) (450 950))
-  )
-  T(B
-   R(l7 (-125 -475) (250 950))
-  )
- )
- D(D$NMOS$1 NMOS
-  T(S
-   R(l6 (-575 -475) (450 950))
-  )
-  T(G
-   R(l4 (-125 -475) (250 950))
-  )
-  T(D
-   R(l6 (125 -475) (425 950))
-  )
-  T(B
-   R(l7 (-125 -475) (250 950))
-  )
- )
- D(D$NMOS$2 NMOS
-  T(S
-   R(l6 (-550 -475) (425 950))
-  )
-  T(G
-   R(l4 (-125 -475) (250 950))
-  )
-  T(D
-   R(l6 (125 -475) (425 950))
-  )
-  T(B
-   R(l7 (-125 -475) (250 950))
-  )
- )
- X(ND2X1
-  R((-100 400) (2600 7600))
-  N(1 I(VDD)
-   R(l8 (1110 5160) (180 180))
-   R(l8 (-180 920) (180 180))
-   R(l8 (-180 -730) (180 180))
-   R(l11 (-240 -790) (300 1700))
-   R(l11 (-1350 0) (2400 800))
-   R(l11 (-1150 -400) (0 0))
-   R(l2 (-275 -2150) (425 1500))
-   R(l2 (-400 -1500) (425 1500))
-  )
-  N(2 I(OUT)
-   R(l8 (1810 1770) (180 180))
-   R(l8 (-180 370) (180 180))
-   R(l8 (-1580 3760) (180 180))
-   R(l8 (-180 -730) (180 180))
-   R(l8 (-180 -730) (180 180))
-   R(l8 (1220 920) (180 180))
-   R(l8 (-180 -1280) (180 180))
-   R(l8 (-180 370) (180 180))
-   Q(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   R(l11 (-110 1390) (300 1400))
-   Q(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   R(l11 (-140 -500) (0 0))
-   R(l11 (-1750 1100) (300 1400))
-   R(l11 (1100 -1700) (300 300))
-   R(l11 (-300 0) (300 1400))
-   R(l2 (-375 -1450) (425 1500))
-   R(l2 (-1800 -1500) (425 1500))
-   R(l6 (950 -4890) (425 950))
-  )
-  N(3 I(VSS)
-   R(l8 (410 1770) (180 180))
-   R(l8 (-180 370) (180 180))
-   R(l11 (-240 -1300) (300 1360))
-   R(l11 (-650 -2160) (2400 800))
-   R(l11 (-1150 -400) (0 0))
-   R(l6 (-950 860) (425 950))
-  )
-  N(4 I($4)
-   R(l3 (-100 4500) (2600 3500))
-  )
-  N(5 I(B)
-   R(l4 (1425 2860) (250 1940))
-   R(l4 (-345 -950) (300 300))
-   R(l4 (-205 650) (250 2000))
-   R(l4 (-250 -2000) (250 2000))
-   R(l4 (-250 -5390) (250 1450))
-   R(l8 (-285 1050) (180 180))
-   R(l11 (-70 -90) (0 0))
-   R(l11 (-170 -150) (300 300))
-  )
-  N(6 I(A)
-   R(l4 (725 2860) (250 1940))
-   R(l4 (-325 -1850) (300 300))
-   R(l4 (-225 1550) (250 2000))
-   R(l4 (-250 -2000) (250 2000))
-   R(l4 (-250 -5390) (250 1450))
-   R(l8 (-265 150) (180 180))
-   R(l11 (-90 -90) (0 0))
-   R(l11 (-150 -150) (300 300))
-  )
-  N(7 I(SUBSTRATE))
-  N(8 I($I5)
-   R(l6 (975 1660) (425 950))
-   R(l6 (-400 -950) (425 950))
-  )
-  P(1 I(VDD))
-  P(2 I(OUT))
-  P(3 I(VSS))
-  P(4)
-  P(5 I(B))
-  P(6 I(A))
-  P(7 I(SUBSTRATE))
-  D(1 D$PMOS
-   Y(850 5800)
-   E(L 0.25)
-   E(W 1.5)
-   E(AS 0.6375)
-   E(AD 0.3375)
-   E(PS 3.85)
-   E(PD 1.95)
-   T(S 2)
-   T(G 6)
-   T(D 1)
-   T(B 4)
-  )
-  D(2 D$PMOS$1
-   Y(1550 5800)
-   E(L 0.25)
-   E(W 1.5)
-   E(AS 0.3375)
-   E(AD 0.6375)
-   E(PS 1.95)
-   E(PD 3.85)
-   T(S 1)
-   T(G 5)
-   T(D 2)
-   T(B 4)
-  )
-  D(3 D$NMOS
-   Y(850 2135)
-   E(L 0.25)
-   E(W 0.95)
-   E(AS 0.40375)
-   E(AD 0.21375)
-   E(PS 2.75)
-   E(PD 1.4)
-   T(S 3)
-   T(G 6)
-   T(D 8)
-   T(B 7)
-  )
-  D(4 D$NMOS$1
-   Y(1550 2135)
-   E(L 0.25)
-   E(W 0.95)
-   E(AS 0.21375)
-   E(AD 0.40375)
-   E(PS 1.4)
-   E(PD 2.75)
-   T(S 8)
-   T(G 5)
-   T(D 2)
-   T(B 7)
-  )
- )
- X(INVX1
-  R((-100 400) (2000 7600))
-  N(1 I(VDD)
-   R(l8 (410 6260) (180 180))
-   R(l8 (-180 -730) (180 180))
-   R(l8 (-180 -730) (180 180))
-   R(l11 (-240 -240) (300 1400))
-   R(l11 (-650 300) (1800 800))
-   R(l11 (-1450 -1100) (300 300))
-   R(l11 (300 400) (0 0))
-   R(l2 (-650 -2150) (425 1500))
-  )
-  N(2 I(OUT)
-   R(l8 (1110 5160) (180 180))
-   R(l8 (-180 920) (180 180))
-   R(l8 (-180 -730) (180 180))
-   R(l8 (-180 -4120) (180 180))
-   R(l8 (-180 370) (180 180))
-   R(l11 (-240 -790) (300 4790))
-   R(l11 (-150 -2500) (0 0))
-   R(l2 (-225 1050) (425 1500))
-   R(l6 (-425 -4890) (425 950))
-  )
-  N(3 I(VSS)
-   R(l8 (410 1770) (180 180))
-   R(l8 (-180 370) (180 180))
-   R(l11 (-240 -1300) (300 1360))
-   R(l11 (-650 -2160) (1800 800))
-   R(l11 (-850 -400) (0 0))
-   R(l6 (-650 860) (425 950))
-  )
-  N(4 I($4)
-   R(l3 (-100 4500) (2000 3500))
-  )
-  N(5 I(IN)
-   R(l4 (725 2860) (250 1940))
-   R(l4 (-525 -1850) (300 300))
-   R(l4 (-25 1550) (250 2000))
-   R(l4 (-250 -2000) (250 2000))
-   R(l4 (-250 -5390) (250 1450))
-   R(l8 (-465 150) (180 180))
-   R(l11 (-90 -90) (0 0))
-   R(l11 (-150 -150) (300 300))
-  )
-  N(6 I(SUBSTRATE))
-  P(1 I(VDD))
-  P(2 I(OUT))
-  P(3 I(VSS))
-  P(4)
-  P(5 I(IN))
-  P(6 I(SUBSTRATE))
-  D(1 D$PMOS$2
-   Y(850 5800)
-   E(L 0.25)
-   E(W 1.5)
-   E(AS 0.6375)
-   E(AD 0.6375)
-   E(PS 3.85)
-   E(PD 3.85)
-   T(S 1)
-   T(G 5)
-   T(D 2)
-   T(B 4)
-  )
-  D(2 D$NMOS$2
-   Y(850 2135)
-   E(L 0.25)
-   E(W 0.95)
-   E(AS 0.40375)
-   E(AD 0.40375)
-   E(PS 2.75)
-   E(PD 2.75)
-   T(S 3)
-   T(G 5)
-   T(D 2)
-   T(B 6)
-  )
- )
- X(RINGO
-  R((0 350) (25800 7650))
-  N(1 I($1)
-   R(l11 (4040 2950) (610 300))
-  )
-  N(2 I($2)
-   R(l11 (5550 2950) (900 300))
-  )
-  N(3 I($3)
-   R(l11 (7350 2950) (900 300))
-  )
-  N(4 I($4)
-   R(l11 (9150 2950) (900 300))
-  )
-  N(5 I($5)
-   R(l11 (10950 2950) (900 300))
-  )
-  N(6 I($6)
-   R(l11 (12750 2950) (900 300))
-  )
-  N(7 I($7)
-   R(l11 (14550 2950) (900 300))
-  )
-  N(8 I($8)
-   R(l11 (16350 2950) (900 300))
-  )
-  N(9 I($9)
-   R(l11 (18150 2950) (900 300))
-  )
-  N(10 I($10)
-   R(l11 (19950 2950) (900 300))
-  )
-  N(11 I(FB)
-   R(l11 (21750 2950) (900 300))
-   R(l11 (-19530 590) (320 320))
-   R(l11 (17820 -320) (320 320))
-   R(l12 (-18400 -260) (200 200))
-   R(l12 (17940 -200) (200 200))
-   R(l13 (-18040 -300) (17740 400))
-   R(l13 (-17920 -200) (0 0))
-   R(l13 (-220 -200) (400 400))
-   R(l13 (17740 -400) (400 400))
-  )
-  N(12 I(VDD)
-   R(l3 (500 4500) (1400 3500))
-   R(l3 (-1900 -3500) (600 3500))
-   R(l3 (23300 -3500) (1400 3500))
-   R(l3 (-100 -3500) (600 3500))
-   R(l8 (-24690 -1240) (180 180))
-   R(l8 (-180 370) (180 180))
-   R(l8 (-180 -1280) (180 180))
-   R(l8 (23220 370) (180 180))
-   R(l8 (-180 370) (180 180))
-   R(l8 (-180 -1280) (180 180))
-   R(l11 (-21740 860) (0 0))
-   R(l11 (-2350 -450) (1200 800))
-   R(l11 (-750 -1450) (300 1400))
-   R(l11 (-100 -350) (0 0))
-   R(l11 (-1250 -400) (600 800))
-   R(l11 (23400 -800) (1200 800))
-   R(l11 (-750 -1450) (300 1400))
-   R(l11 (-100 -350) (0 0))
-   R(l11 (550 -400) (600 800))
-   R(l9 (-24850 -1500) (500 1500))
-   R(l9 (22900 -1500) (500 1500))
-  )
-  N(13 I(OUT)
-   R(l11 (23440 3840) (320 320))
-   R(l12 (-260 -260) (200 200))
-   R(l13 (-100 -100) (0 0))
-   R(l13 (-200 -200) (400 400))
-  )
-  N(14 I(ENABLE)
-   R(l11 (2440 2940) (320 320))
-   R(l12 (-260 -260) (200 200))
-   R(l13 (-100 -100) (0 0))
-   R(l13 (-200 -200) (400 400))
-  )
-  N(15 I(VSS)
-   R(l8 (1110 1610) (180 180))
-   R(l8 (-180 -1280) (180 180))
-   R(l8 (-180 370) (180 180))
-   R(l8 (23220 370) (180 180))
-   R(l8 (-180 -1280) (180 180))
-   R(l8 (-180 370) (180 180))
-   R(l11 (-21740 -390) (0 0))
-   R(l11 (-1900 -400) (300 1400))
-   R(l11 (-750 -1450) (1200 800))
-   R(l11 (-550 -400) (0 0))
-   R(l11 (-1250 -400) (600 800))
-   R(l11 (23850 -750) (300 1400))
-   R(l11 (-750 -1450) (1200 800))
-   R(l11 (-550 -400) (0 0))
-   R(l11 (550 -400) (600 800))
-   R(l10 (-24850 -800) (500 1500))
-   R(l10 (22900 -1500) (500 1500))
-  )
-  P(11 I(FB))
-  P(12 I(VDD))
-  P(13 I(OUT))
-  P(14 I(ENABLE))
-  P(15 I(VSS))
-  X(1 ND2X1 Y(1800 0)
-   P(0 12)
-   P(1 1)
-   P(2 15)
-   P(3 12)
-   P(4 11)
-   P(5 14)
-   P(6 15)
-  )
-  X(2 INVX1 Y(4200 0)
-   P(0 12)
-   P(1 2)
-   P(2 15)
-   P(3 12)
-   P(4 1)
-   P(5 15)
-  )
-  X(3 INVX1 Y(6000 0)
-   P(0 12)
-   P(1 3)
-   P(2 15)
-   P(3 12)
-   P(4 2)
-   P(5 15)
-  )
-  X(4 INVX1 Y(7800 0)
-   P(0 12)
-   P(1 4)
-   P(2 15)
-   P(3 12)
-   P(4 3)
-   P(5 15)
-  )
-  X(5 INVX1 Y(9600 0)
-   P(0 12)
-   P(1 5)
-   P(2 15)
-   P(3 12)
-   P(4 4)
-   P(5 15)
-  )
-  X(6 INVX1 Y(11400 0)
-   P(0 12)
-   P(1 6)
-   P(2 15)
-   P(3 12)
-   P(4 5)
-   P(5 15)
-  )
-  X(7 INVX1 Y(13200 0)
-   P(0 12)
-   P(1 7)
-   P(2 15)
-   P(3 12)
-   P(4 6)
-   P(5 15)
-  )
-  X(8 INVX1 Y(15000 0)
-   P(0 12)
-   P(1 8)
-   P(2 15)
-   P(3 12)
-   P(4 7)
-   P(5 15)
-  )
-  X(9 INVX1 Y(16800 0)
-   P(0 12)
-   P(1 9)
-   P(2 15)
-   P(3 12)
-   P(4 8)
-   P(5 15)
-  )
-  X(10 INVX1 Y(18600 0)
-   P(0 12)
-   P(1 10)
-   P(2 15)
-   P(3 12)
-   P(4 9)
-   P(5 15)
-  )
-  X(11 INVX1 Y(20400 0)
-   P(0 12)
-   P(1 11)
-   P(2 15)
-   P(3 12)
-   P(4 10)
-   P(5 15)
-  )
-  X(12 INVX1 Y(22200 0)
-   P(0 12)
-   P(1 13)
-   P(2 15)
-   P(3 12)
-   P(4 11)
-   P(5 15)
-  )
- )
-)
-H(
- K(PMOS MOS4)
- K(NMOS MOS4)
- X(ND2X1
-  N(1 I(VDD))
-  N(2 I(OUT))
-  N(3 I(VSS))
-  N(4 I(NWELL))
-  N(5 I(B))
-  N(6 I(A))
-  N(7 I(BULK))
-  N(8 I('1'))
-  P(1 I(VDD))
-  P(2 I(OUT))
-  P(3 I(VSS))
-  P(4 I(NWELL))
-  P(5 I(B))
-  P(6 I(A))
-  P(7 I(BULK))
-  D(1 PMOS
-   I($1)
-   E(L 0.25)
-   E(W 1.5)
-   E(AS 0)
-   E(AD 0)
-   E(PS 0)
-   E(PD 0)
-   T(S 1)
-   T(G 6)
-   T(D 2)
-   T(B 4)
-  )
-  D(2 PMOS
-   I($2)
-   E(L 0.25)
-   E(W 1.5)
-   E(AS 0)
-   E(AD 0)
-   E(PS 0)
-   E(PD 0)
-   T(S 1)
-   T(G 5)
-   T(D 2)
-   T(B 4)
-  )
-  D(3 NMOS
-   I($3)
-   E(L 0.25)
-   E(W 0.95)
-   E(AS 0)
-   E(AD 0)
-   E(PS 0)
-   E(PD 0)
-   T(S 3)
-   T(G 6)
-   T(D 8)
-   T(B 7)
-  )
-  D(4 NMOS
-   I($4)
-   E(L 0.25)
-   E(W 0.95)
-   E(AS 0)
-   E(AD 0)
-   E(PS 0)
-   E(PD 0)
-   T(S 8)
-   T(G 5)
-   T(D 2)
-   T(B 7)
-  )
- )
- X(INVX1
-  N(1 I(VDD))
-  N(2 I(OUT))
-  N(3 I(VSS))
-  N(4 I(NWELL))
-  N(5 I(IN))
-  N(6 I(BULK))
-  P(1 I(VDD))
-  P(2 I(OUT))
-  P(3 I(VSS))
-  P(4 I(NWELL))
-  P(5 I(IN))
-  P(6 I(BULK))
-  D(1 PMOS
-   I($1)
-   E(L 0.25)
-   E(W 1.5)
-   E(AS 0)
-   E(AD 0)
-   E(PS 0)
-   E(PD 0)
-   T(S 1)
-   T(G 5)
-   T(D 2)
-   T(B 4)
-  )
-  D(2 NMOS
-   I($2)
-   E(L 0.25)
-   E(W 0.95)
-   E(AS 0)
-   E(AD 0)
-   E(PS 0)
-   E(PD 0)
-   T(S 3)
-   T(G 5)
-   T(D 2)
-   T(B 6)
-  )
- )
- X(RINGO
-  N(1 I(VSS))
-  N(2 I(VDD))
-  N(3 I(FB))
-  N(4 I(ENABLE))
-  N(5 I(OUT))
-  N(6 I('1'))
-  N(7 I('2'))
-  N(8 I('3'))
-  N(9 I('4'))
-  N(10 I('5'))
-  N(11 I('6'))
-  N(12 I('7'))
-  N(13 I('8'))
-  N(14 I('9'))
-  N(15 I('10'))
-  P(1 I(VSS))
-  P(2 I(VDD))
-  P(3 I(FB))
-  P(4 I(ENABLE))
-  P(5 I(OUT))
-  X(1 ND2X1 I($1)
-   P(0 2)
-   P(1 6)
-   P(2 1)
-   P(3 2)
-   P(4 3)
-   P(5 4)
-   P(6 1)
-  )
-  X(2 INVX1 I($2)
-   P(0 2)
-   P(1 7)
-   P(2 1)
-   P(3 2)
-   P(4 6)
-   P(5 1)
-  )
-  X(3 INVX1 I($3)
-   P(0 2)
-   P(1 8)
-   P(2 1)
-   P(3 2)
-   P(4 7)
-   P(5 1)
-  )
-  X(4 INVX1 I($4)
-   P(0 2)
-   P(1 9)
-   P(2 1)
-   P(3 2)
-   P(4 8)
-   P(5 1)
-  )
-  X(5 INVX1 I($5)
-   P(0 2)
-   P(1 10)
-   P(2 1)
-   P(3 2)
-   P(4 9)
-   P(5 1)
-  )
-  X(6 INVX1 I($6)
-   P(0 2)
-   P(1 11)
-   P(2 1)
-   P(3 2)
-   P(4 10)
-   P(5 1)
-  )
-  X(7 INVX1 I($7)
-   P(0 2)
-   P(1 12)
-   P(2 1)
-   P(3 2)
-   P(4 11)
-   P(5 1)
-  )
-  X(8 INVX1 I($8)
-   P(0 2)
-   P(1 13)
-   P(2 1)
-   P(3 2)
-   P(4 12)
-   P(5 1)
-  )
-  X(9 INVX1 I($9)
-   P(0 2)
-   P(1 14)
-   P(2 1)
-   P(3 2)
-   P(4 13)
-   P(5 1)
-  )
-  X(10 INVX1 I($10)
-   P(0 2)
-   P(1 15)
-   P(2 1)
-   P(3 2)
-   P(4 14)
-   P(5 1)
-  )
-  X(11 INVX1 I($11)
-   P(0 2)
-   P(1 3)
-   P(2 1)
-   P(3 2)
-   P(4 15)
-   P(5 1)
-  )
-  X(12 INVX1 I($12)
-   P(0 2)
-   P(1 5)
-   P(2 1)
-   P(3 2)
-   P(4 3)
-   P(5 1)
-  )
- )
-)
-Z(
- X(INVX1 INVX1 1
-  Z(
-   N(4 4 1)
-   N(5 5 1)
-   N(2 2 1)
-   N(6 6 1)
-   N(1 1 1)
-   N(3 3 1)
-   P(3 3 1)
-   P(4 4 1)
-   P(1 1 1)
-   P(5 5 1)
-   P(0 0 1)
-   P(2 2 1)
-   D(2 2 1)
-   D(1 1 1)
-  )
- )
- X(ND2X1 ND2X1 1
-  Z(
-   N(8 8 1)
-   N(4 4 1)
-   N(6 6 1)
-   N(5 5 1)
-   N(2 2 1)
-   N(7 7 1)
-   N(1 1 1)
-   N(3 3 1)
-   P(3 3 1)
-   P(5 5 1)
-   P(4 4 1)
-   P(1 1 1)
-   P(6 6 1)
-   P(0 0 1)
-   P(2 2 1)
-   D(3 3 1)
-   D(4 4 1)
-   D(1 1 1)
-   D(2 2 1)
-  )
- )
- X(RINGO RINGO 1
-  Z(
-   N(1 6 1)
-   N(10 15 1)
-   N(2 7 1)
-   N(3 8 1)
-   N(4 9 1)
-   N(5 10 1)
-   N(6 11 1)
-   N(7 12 1)
-   N(8 13 1)
-   N(9 14 1)
-   N(14 4 1)
-   N(11 3 1)
-   N(13 5 1)
-   N(12 2 1)
-   N(15 1 1)
-   P(3 3 1)
-   P(0 2 1)
-   P(2 4 1)
-   P(1 1 1)
-   P(4 0 1)
-   X(2 2 1)
-   X(3 3 1)
-   X(4 4 1)
-   X(5 5 1)
-   X(6 6 1)
-   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.cir.1 b/testdata/lvs/ringo_simple_io2.cir.1
index b74e1a251..61c5913b9 100644
--- a/testdata/lvs/ringo_simple_io2.cir.1
+++ b/testdata/lvs/ringo_simple_io2.cir.1
@@ -25,8 +25,8 @@ X$2 VSS IN OUT SUBSTRATE NMOS PARAMS: L=0.25 W=0.95 AS=0.40375 AD=0.40375
 .SUBCKT ND2X1 VDD OUT VSS \$4 B A SUBSTRATE
 X$1 OUT A VDD \$4 PMOS PARAMS: L=0.25 W=1.5 AS=0.6375 AD=0.3375 PS=3.85 PD=1.95
 X$2 VDD B OUT \$4 PMOS PARAMS: L=0.25 W=1.5 AS=0.3375 AD=0.6375 PS=1.95 PD=3.85
-X$3 VSS A \$I3 SUBSTRATE NMOS PARAMS: L=0.25 W=0.95 AS=0.40375 AD=0.21375
+X$3 VSS A \$I6 SUBSTRATE NMOS PARAMS: L=0.25 W=0.95 AS=0.40375 AD=0.21375
 + PS=2.75 PD=1.4
-X$4 \$I3 B OUT SUBSTRATE NMOS PARAMS: L=0.25 W=0.95 AS=0.21375 AD=0.40375
+X$4 \$I6 B OUT SUBSTRATE NMOS PARAMS: L=0.25 W=0.95 AS=0.21375 AD=0.40375
 + PS=1.4 PD=2.75
 .ENDS ND2X1
diff --git a/testdata/lvs/ringo_simple_io2.cir.2 b/testdata/lvs/ringo_simple_io2.cir.2
deleted file mode 100644
index 0b0a9783a..000000000
--- a/testdata/lvs/ringo_simple_io2.cir.2
+++ /dev/null
@@ -1,32 +0,0 @@
-* Extracted by KLayout
-.INCLUDE 'models.cir'
-
-.SUBCKT RINGO FB VDD OUT ENABLE VSS
-X$1 VDD \$1 VSS VDD FB ENABLE VSS ND2X1
-X$2 VDD \$2 VSS VDD \$1 VSS INVX1
-X$3 VDD \$3 VSS VDD \$2 VSS INVX1
-X$4 VDD \$4 VSS VDD \$3 VSS INVX1
-X$5 VDD \$5 VSS VDD \$4 VSS INVX1
-X$6 VDD \$6 VSS VDD \$5 VSS INVX1
-X$7 VDD \$7 VSS VDD \$6 VSS INVX1
-X$8 VDD \$8 VSS VDD \$7 VSS INVX1
-X$9 VDD \$9 VSS VDD \$8 VSS INVX1
-X$10 VDD \$10 VSS VDD \$9 VSS INVX1
-X$11 VDD FB VSS VDD \$10 VSS INVX1
-X$12 VDD OUT VSS VDD FB VSS INVX1
-.ENDS RINGO
-
-.SUBCKT INVX1 VDD OUT VSS \$4 IN SUBSTRATE
-X$1 VDD IN OUT \$4 PMOS PARAMS: L=0.25 W=1.5 AS=0.6375 AD=0.6375 PS=3.85 PD=3.85
-X$2 VSS IN OUT SUBSTRATE NMOS PARAMS: L=0.25 W=0.95 AS=0.40375 AD=0.40375
-+ PS=2.75 PD=2.75
-.ENDS INVX1
-
-.SUBCKT ND2X1 VDD OUT VSS \$4 B A SUBSTRATE
-X$1 OUT A VDD \$4 PMOS PARAMS: L=0.25 W=1.5 AS=0.6375 AD=0.3375 PS=3.85 PD=1.95
-X$2 VDD B OUT \$4 PMOS PARAMS: L=0.25 W=1.5 AS=0.3375 AD=0.6375 PS=1.95 PD=3.85
-X$3 VSS A \$I5 SUBSTRATE NMOS PARAMS: L=0.25 W=0.95 AS=0.40375 AD=0.21375
-+ PS=2.75 PD=1.4
-X$4 \$I5 B OUT SUBSTRATE NMOS PARAMS: L=0.25 W=0.95 AS=0.21375 AD=0.40375
-+ PS=1.4 PD=2.75
-.ENDS ND2X1
diff --git a/testdata/lvs/ringo_simple_io2.l2n.1 b/testdata/lvs/ringo_simple_io2.l2n.1
index d766d4aec..ec0d0004e 100644
--- a/testdata/lvs/ringo_simple_io2.l2n.1
+++ b/testdata/lvs/ringo_simple_io2.l2n.1
@@ -120,8 +120,8 @@ X(ND2X1
   R(l11 (-240 -790) (300 1700))
   R(l11 (-1350 0) (2400 800))
   R(l11 (-1150 -400) (0 0))
-  R(l2 (-275 -2150) (425 1500))
-  R(l2 (-400 -1500) (425 1500))
+  R(l2 (-250 -2150) (425 1500))
+  R(l2 (-450 -1500) (425 1500))
  )
  N(2 I(OUT)
   R(l8 (1810 1770) (180 180))
@@ -175,9 +175,9 @@ X(ND2X1
   R(l11 (-150 -150) (300 300))
  )
  N(7 I(SUBSTRATE))
- N(8 I($I3)
-  R(l6 (975 1660) (425 950))
-  R(l6 (-400 -950) (425 950))
+ N(8 I($I6)
+  R(l6 (1000 1660) (425 950))
+  R(l6 (-450 -950) (425 950))
  )
  P(1 I(VDD))
  P(2 I(OUT))
@@ -361,27 +361,27 @@ X(RINGO
   R(l13 (17740 -400) (400 400))
  )
  N(12 I(VDD)
-  R(l3 (500 4500) (1400 3500))
-  R(l3 (-1900 -3500) (600 3500))
+  R(l3 (0 4500) (600 3500))
   R(l3 (23300 -3500) (1400 3500))
   R(l3 (-100 -3500) (600 3500))
-  R(l8 (-24690 -1240) (180 180))
+  R(l3 (-25300 -3500) (1400 3500))
+  R(l8 (22610 -1240) (180 180))
   R(l8 (-180 370) (180 180))
   R(l8 (-180 -1280) (180 180))
-  R(l8 (23220 370) (180 180))
+  R(l8 (-23580 370) (180 180))
   R(l8 (-180 370) (180 180))
   R(l8 (-180 -1280) (180 180))
-  R(l11 (-21740 860) (0 0))
-  R(l11 (-2350 -450) (1200 800))
-  R(l11 (-750 -1450) (300 1400))
-  R(l11 (-100 -350) (0 0))
-  R(l11 (-1250 -400) (600 800))
+  R(l11 (1660 860) (0 0))
+  R(l11 (-2950 -450) (600 800))
   R(l11 (23400 -800) (1200 800))
   R(l11 (-750 -1450) (300 1400))
   R(l11 (-100 -350) (0 0))
   R(l11 (550 -400) (600 800))
-  R(l9 (-24850 -1500) (500 1500))
-  R(l9 (22900 -1500) (500 1500))
+  R(l11 (-25200 -800) (1200 800))
+  R(l11 (-750 -1450) (300 1400))
+  R(l11 (-100 -350) (0 0))
+  R(l9 (23100 -1100) (500 1500))
+  R(l9 (-23900 -1500) (500 1500))
  )
  N(13 I(OUT)
   R(l11 (23440 3840) (320 320))
@@ -396,23 +396,23 @@ X(RINGO
   R(l13 (-200 -200) (400 400))
  )
  N(15 I(VSS)
-  R(l8 (1110 1610) (180 180))
+  R(l8 (24510 1610) (180 180))
   R(l8 (-180 -1280) (180 180))
   R(l8 (-180 370) (180 180))
-  R(l8 (23220 370) (180 180))
+  R(l8 (-23580 370) (180 180))
   R(l8 (-180 -1280) (180 180))
   R(l8 (-180 370) (180 180))
-  R(l11 (-21740 -390) (0 0))
-  R(l11 (-1900 -400) (300 1400))
-  R(l11 (-750 -1450) (1200 800))
-  R(l11 (-550 -400) (0 0))
-  R(l11 (-1250 -400) (600 800))
-  R(l11 (23850 -750) (300 1400))
+  R(l11 (1660 -390) (0 0))
+  R(l11 (21500 -400) (300 1400))
   R(l11 (-750 -1450) (1200 800))
   R(l11 (-550 -400) (0 0))
   R(l11 (550 -400) (600 800))
-  R(l10 (-24850 -800) (500 1500))
-  R(l10 (22900 -1500) (500 1500))
+  R(l11 (-25800 -800) (600 800))
+  R(l11 (450 -750) (300 1400))
+  R(l11 (-750 -1450) (1200 800))
+  R(l11 (-550 -400) (0 0))
+  R(l10 (23100 -400) (500 1500))
+  R(l10 (-23900 -1500) (500 1500))
  )
  P(11 I(FB))
  P(12 I(VDD))
diff --git a/testdata/lvs/ringo_simple_io2.l2n.2 b/testdata/lvs/ringo_simple_io2.l2n.2
deleted file mode 100644
index 3fe66dec6..000000000
--- a/testdata/lvs/ringo_simple_io2.l2n.2
+++ /dev/null
@@ -1,519 +0,0 @@
-#%l2n-klayout
-W(RINGO)
-U(0.001)
-L(l3 '1/0')
-L(l4 '5/0')
-L(l8 '8/0')
-L(l11 '9/0')
-L(l12 '10/0')
-L(l13 '11/0')
-L(l7)
-L(l2)
-L(l9)
-L(l6)
-L(l10)
-C(l3 l3 l9)
-C(l4 l4 l8)
-C(l8 l4 l8 l11 l2 l9 l6 l10)
-C(l11 l8 l11 l12)
-C(l12 l11 l12 l13)
-C(l13 l12 l13)
-C(l7 l7)
-C(l2 l8 l2)
-C(l9 l3 l8 l9)
-C(l6 l8 l6)
-C(l10 l8 l10)
-G(l7 SUBSTRATE)
-G(l10 SUBSTRATE)
-K(PMOS MOS4)
-K(NMOS MOS4)
-D(D$PMOS PMOS
- T(S
-  R(l2 (-550 -750) (425 1500))
- )
- T(G
-  R(l4 (-125 -750) (250 1500))
- )
- T(D
-  R(l2 (125 -750) (450 1500))
- )
- T(B
-  R(l3 (-125 -750) (250 1500))
- )
-)
-D(D$PMOS$1 PMOS
- T(S
-  R(l2 (-575 -750) (450 1500))
- )
- T(G
-  R(l4 (-125 -750) (250 1500))
- )
- T(D
-  R(l2 (125 -750) (425 1500))
- )
- T(B
-  R(l3 (-125 -750) (250 1500))
- )
-)
-D(D$PMOS$2 PMOS
- T(S
-  R(l2 (-550 -750) (425 1500))
- )
- T(G
-  R(l4 (-125 -750) (250 1500))
- )
- T(D
-  R(l2 (125 -750) (425 1500))
- )
- T(B
-  R(l3 (-125 -750) (250 1500))
- )
-)
-D(D$NMOS NMOS
- T(S
-  R(l6 (-550 -475) (425 950))
- )
- T(G
-  R(l4 (-125 -475) (250 950))
- )
- T(D
-  R(l6 (125 -475) (450 950))
- )
- T(B
-  R(l7 (-125 -475) (250 950))
- )
-)
-D(D$NMOS$1 NMOS
- T(S
-  R(l6 (-575 -475) (450 950))
- )
- T(G
-  R(l4 (-125 -475) (250 950))
- )
- T(D
-  R(l6 (125 -475) (425 950))
- )
- T(B
-  R(l7 (-125 -475) (250 950))
- )
-)
-D(D$NMOS$2 NMOS
- T(S
-  R(l6 (-550 -475) (425 950))
- )
- T(G
-  R(l4 (-125 -475) (250 950))
- )
- T(D
-  R(l6 (125 -475) (425 950))
- )
- T(B
-  R(l7 (-125 -475) (250 950))
- )
-)
-X(ND2X1
- R((-100 400) (2600 7600))
- N(1 I(VDD)
-  R(l8 (1110 5160) (180 180))
-  R(l8 (-180 920) (180 180))
-  R(l8 (-180 -730) (180 180))
-  R(l11 (-240 -790) (300 1700))
-  R(l11 (-1350 0) (2400 800))
-  R(l11 (-1150 -400) (0 0))
-  R(l2 (-275 -2150) (425 1500))
-  R(l2 (-400 -1500) (425 1500))
- )
- N(2 I(OUT)
-  R(l8 (1810 1770) (180 180))
-  R(l8 (-180 370) (180 180))
-  R(l8 (-1580 3760) (180 180))
-  R(l8 (-180 -730) (180 180))
-  R(l8 (-180 -730) (180 180))
-  R(l8 (1220 920) (180 180))
-  R(l8 (-180 -1280) (180 180))
-  R(l8 (-180 370) (180 180))
-  Q(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-  R(l11 (-110 1390) (300 1400))
-  Q(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-  R(l11 (-140 -500) (0 0))
-  R(l11 (-1750 1100) (300 1400))
-  R(l11 (1100 -1700) (300 300))
-  R(l11 (-300 0) (300 1400))
-  R(l2 (-375 -1450) (425 1500))
-  R(l2 (-1800 -1500) (425 1500))
-  R(l6 (950 -4890) (425 950))
- )
- N(3 I(VSS)
-  R(l8 (410 1770) (180 180))
-  R(l8 (-180 370) (180 180))
-  R(l11 (-240 -1300) (300 1360))
-  R(l11 (-650 -2160) (2400 800))
-  R(l11 (-1150 -400) (0 0))
-  R(l6 (-950 860) (425 950))
- )
- N(4 I($4)
-  R(l3 (-100 4500) (2600 3500))
- )
- N(5 I(B)
-  R(l4 (1425 2860) (250 1940))
-  R(l4 (-345 -950) (300 300))
-  R(l4 (-205 650) (250 2000))
-  R(l4 (-250 -2000) (250 2000))
-  R(l4 (-250 -5390) (250 1450))
-  R(l8 (-285 1050) (180 180))
-  R(l11 (-70 -90) (0 0))
-  R(l11 (-170 -150) (300 300))
- )
- N(6 I(A)
-  R(l4 (725 2860) (250 1940))
-  R(l4 (-325 -1850) (300 300))
-  R(l4 (-225 1550) (250 2000))
-  R(l4 (-250 -2000) (250 2000))
-  R(l4 (-250 -5390) (250 1450))
-  R(l8 (-265 150) (180 180))
-  R(l11 (-90 -90) (0 0))
-  R(l11 (-150 -150) (300 300))
- )
- N(7 I(SUBSTRATE))
- N(8 I($I5)
-  R(l6 (975 1660) (425 950))
-  R(l6 (-400 -950) (425 950))
- )
- P(1 I(VDD))
- P(2 I(OUT))
- P(3 I(VSS))
- P(4)
- P(5 I(B))
- P(6 I(A))
- P(7 I(SUBSTRATE))
- D(1 D$PMOS
-  Y(850 5800)
-  E(L 0.25)
-  E(W 1.5)
-  E(AS 0.6375)
-  E(AD 0.3375)
-  E(PS 3.85)
-  E(PD 1.95)
-  T(S 2)
-  T(G 6)
-  T(D 1)
-  T(B 4)
- )
- D(2 D$PMOS$1
-  Y(1550 5800)
-  E(L 0.25)
-  E(W 1.5)
-  E(AS 0.3375)
-  E(AD 0.6375)
-  E(PS 1.95)
-  E(PD 3.85)
-  T(S 1)
-  T(G 5)
-  T(D 2)
-  T(B 4)
- )
- D(3 D$NMOS
-  Y(850 2135)
-  E(L 0.25)
-  E(W 0.95)
-  E(AS 0.40375)
-  E(AD 0.21375)
-  E(PS 2.75)
-  E(PD 1.4)
-  T(S 3)
-  T(G 6)
-  T(D 8)
-  T(B 7)
- )
- D(4 D$NMOS$1
-  Y(1550 2135)
-  E(L 0.25)
-  E(W 0.95)
-  E(AS 0.21375)
-  E(AD 0.40375)
-  E(PS 1.4)
-  E(PD 2.75)
-  T(S 8)
-  T(G 5)
-  T(D 2)
-  T(B 7)
- )
-)
-X(INVX1
- R((-100 400) (2000 7600))
- N(1 I(VDD)
-  R(l8 (410 6260) (180 180))
-  R(l8 (-180 -730) (180 180))
-  R(l8 (-180 -730) (180 180))
-  R(l11 (-240 -240) (300 1400))
-  R(l11 (-650 300) (1800 800))
-  R(l11 (-1450 -1100) (300 300))
-  R(l11 (300 400) (0 0))
-  R(l2 (-650 -2150) (425 1500))
- )
- N(2 I(OUT)
-  R(l8 (1110 5160) (180 180))
-  R(l8 (-180 920) (180 180))
-  R(l8 (-180 -730) (180 180))
-  R(l8 (-180 -4120) (180 180))
-  R(l8 (-180 370) (180 180))
-  R(l11 (-240 -790) (300 4790))
-  R(l11 (-150 -2500) (0 0))
-  R(l2 (-225 1050) (425 1500))
-  R(l6 (-425 -4890) (425 950))
- )
- N(3 I(VSS)
-  R(l8 (410 1770) (180 180))
-  R(l8 (-180 370) (180 180))
-  R(l11 (-240 -1300) (300 1360))
-  R(l11 (-650 -2160) (1800 800))
-  R(l11 (-850 -400) (0 0))
-  R(l6 (-650 860) (425 950))
- )
- N(4 I($4)
-  R(l3 (-100 4500) (2000 3500))
- )
- N(5 I(IN)
-  R(l4 (725 2860) (250 1940))
-  R(l4 (-525 -1850) (300 300))
-  R(l4 (-25 1550) (250 2000))
-  R(l4 (-250 -2000) (250 2000))
-  R(l4 (-250 -5390) (250 1450))
-  R(l8 (-465 150) (180 180))
-  R(l11 (-90 -90) (0 0))
-  R(l11 (-150 -150) (300 300))
- )
- N(6 I(SUBSTRATE))
- P(1 I(VDD))
- P(2 I(OUT))
- P(3 I(VSS))
- P(4)
- P(5 I(IN))
- P(6 I(SUBSTRATE))
- D(1 D$PMOS$2
-  Y(850 5800)
-  E(L 0.25)
-  E(W 1.5)
-  E(AS 0.6375)
-  E(AD 0.6375)
-  E(PS 3.85)
-  E(PD 3.85)
-  T(S 1)
-  T(G 5)
-  T(D 2)
-  T(B 4)
- )
- D(2 D$NMOS$2
-  Y(850 2135)
-  E(L 0.25)
-  E(W 0.95)
-  E(AS 0.40375)
-  E(AD 0.40375)
-  E(PS 2.75)
-  E(PD 2.75)
-  T(S 3)
-  T(G 5)
-  T(D 2)
-  T(B 6)
- )
-)
-X(RINGO
- R((0 350) (25800 7650))
- N(1 I($1)
-  R(l11 (4040 2950) (610 300))
- )
- N(2 I($2)
-  R(l11 (5550 2950) (900 300))
- )
- N(3 I($3)
-  R(l11 (7350 2950) (900 300))
- )
- N(4 I($4)
-  R(l11 (9150 2950) (900 300))
- )
- N(5 I($5)
-  R(l11 (10950 2950) (900 300))
- )
- N(6 I($6)
-  R(l11 (12750 2950) (900 300))
- )
- N(7 I($7)
-  R(l11 (14550 2950) (900 300))
- )
- N(8 I($8)
-  R(l11 (16350 2950) (900 300))
- )
- N(9 I($9)
-  R(l11 (18150 2950) (900 300))
- )
- N(10 I($10)
-  R(l11 (19950 2950) (900 300))
- )
- N(11 I(FB)
-  R(l11 (21750 2950) (900 300))
-  R(l11 (-19530 590) (320 320))
-  R(l11 (17820 -320) (320 320))
-  R(l12 (-18400 -260) (200 200))
-  R(l12 (17940 -200) (200 200))
-  R(l13 (-18040 -300) (17740 400))
-  R(l13 (-17920 -200) (0 0))
-  R(l13 (-220 -200) (400 400))
-  R(l13 (17740 -400) (400 400))
- )
- N(12 I(VDD)
-  R(l3 (500 4500) (1400 3500))
-  R(l3 (-1900 -3500) (600 3500))
-  R(l3 (23300 -3500) (1400 3500))
-  R(l3 (-100 -3500) (600 3500))
-  R(l8 (-24690 -1240) (180 180))
-  R(l8 (-180 370) (180 180))
-  R(l8 (-180 -1280) (180 180))
-  R(l8 (23220 370) (180 180))
-  R(l8 (-180 370) (180 180))
-  R(l8 (-180 -1280) (180 180))
-  R(l11 (-21740 860) (0 0))
-  R(l11 (-2350 -450) (1200 800))
-  R(l11 (-750 -1450) (300 1400))
-  R(l11 (-100 -350) (0 0))
-  R(l11 (-1250 -400) (600 800))
-  R(l11 (23400 -800) (1200 800))
-  R(l11 (-750 -1450) (300 1400))
-  R(l11 (-100 -350) (0 0))
-  R(l11 (550 -400) (600 800))
-  R(l9 (-24850 -1500) (500 1500))
-  R(l9 (22900 -1500) (500 1500))
- )
- N(13 I(OUT)
-  R(l11 (23440 3840) (320 320))
-  R(l12 (-260 -260) (200 200))
-  R(l13 (-100 -100) (0 0))
-  R(l13 (-200 -200) (400 400))
- )
- N(14 I(ENABLE)
-  R(l11 (2440 2940) (320 320))
-  R(l12 (-260 -260) (200 200))
-  R(l13 (-100 -100) (0 0))
-  R(l13 (-200 -200) (400 400))
- )
- N(15 I(VSS)
-  R(l8 (1110 1610) (180 180))
-  R(l8 (-180 -1280) (180 180))
-  R(l8 (-180 370) (180 180))
-  R(l8 (23220 370) (180 180))
-  R(l8 (-180 -1280) (180 180))
-  R(l8 (-180 370) (180 180))
-  R(l11 (-21740 -390) (0 0))
-  R(l11 (-1900 -400) (300 1400))
-  R(l11 (-750 -1450) (1200 800))
-  R(l11 (-550 -400) (0 0))
-  R(l11 (-1250 -400) (600 800))
-  R(l11 (23850 -750) (300 1400))
-  R(l11 (-750 -1450) (1200 800))
-  R(l11 (-550 -400) (0 0))
-  R(l11 (550 -400) (600 800))
-  R(l10 (-24850 -800) (500 1500))
-  R(l10 (22900 -1500) (500 1500))
- )
- P(11 I(FB))
- P(12 I(VDD))
- P(13 I(OUT))
- P(14 I(ENABLE))
- P(15 I(VSS))
- X(1 ND2X1 Y(1800 0)
-  P(0 12)
-  P(1 1)
-  P(2 15)
-  P(3 12)
-  P(4 11)
-  P(5 14)
-  P(6 15)
- )
- X(2 INVX1 Y(4200 0)
-  P(0 12)
-  P(1 2)
-  P(2 15)
-  P(3 12)
-  P(4 1)
-  P(5 15)
- )
- X(3 INVX1 Y(6000 0)
-  P(0 12)
-  P(1 3)
-  P(2 15)
-  P(3 12)
-  P(4 2)
-  P(5 15)
- )
- X(4 INVX1 Y(7800 0)
-  P(0 12)
-  P(1 4)
-  P(2 15)
-  P(3 12)
-  P(4 3)
-  P(5 15)
- )
- X(5 INVX1 Y(9600 0)
-  P(0 12)
-  P(1 5)
-  P(2 15)
-  P(3 12)
-  P(4 4)
-  P(5 15)
- )
- X(6 INVX1 Y(11400 0)
-  P(0 12)
-  P(1 6)
-  P(2 15)
-  P(3 12)
-  P(4 5)
-  P(5 15)
- )
- X(7 INVX1 Y(13200 0)
-  P(0 12)
-  P(1 7)
-  P(2 15)
-  P(3 12)
-  P(4 6)
-  P(5 15)
- )
- X(8 INVX1 Y(15000 0)
-  P(0 12)
-  P(1 8)
-  P(2 15)
-  P(3 12)
-  P(4 7)
-  P(5 15)
- )
- X(9 INVX1 Y(16800 0)
-  P(0 12)
-  P(1 9)
-  P(2 15)
-  P(3 12)
-  P(4 8)
-  P(5 15)
- )
- X(10 INVX1 Y(18600 0)
-  P(0 12)
-  P(1 10)
-  P(2 15)
-  P(3 12)
-  P(4 9)
-  P(5 15)
- )
- X(11 INVX1 Y(20400 0)
-  P(0 12)
-  P(1 11)
-  P(2 15)
-  P(3 12)
-  P(4 10)
-  P(5 15)
- )
- X(12 INVX1 Y(22200 0)
-  P(0 12)
-  P(1 13)
-  P(2 15)
-  P(3 12)
-  P(4 11)
-  P(5 15)
- )
-)
diff --git a/testdata/lvs/ringo_simple_io2.lvsdb.1 b/testdata/lvs/ringo_simple_io2.lvsdb.1
index c7c49dbe7..5069e8e32 100644
--- a/testdata/lvs/ringo_simple_io2.lvsdb.1
+++ b/testdata/lvs/ringo_simple_io2.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -403,27 +403,27 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
+   rect(l3 (0 4500) (600 3500))
    rect(l3 (23300 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
+   rect(l3 (-25300 -3500) (1400 3500))
+   rect(l8 (22610 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
+   rect(l11 (1660 860) (0 0))
+   rect(l11 (-2950 -450) (600 800))
    rect(l11 (23400 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
+   rect(l11 (-25200 -800) (1200 800))
+   rect(l11 (-750 -1450) (300 1400))
+   rect(l11 (-100 -350) (0 0))
+   rect(l9 (23100 -1100) (500 1500))
+   rect(l9 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l11 (23440 3840) (320 320))
@@ -438,23 +438,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
+   rect(l8 (24510 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1660 -390) (0 0))
+   rect(l11 (21500 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple_io2.lvsdb.2 b/testdata/lvs/ringo_simple_io2.lvsdb.2
deleted file mode 100644
index ef872de19..000000000
--- a/testdata/lvs/ringo_simple_io2.lvsdb.2
+++ /dev/null
@@ -1,908 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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 82d084acd..0d464eda1 100644
--- a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1
+++ b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -403,27 +403,27 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
+   rect(l3 (0 4500) (600 3500))
    rect(l3 (23300 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
+   rect(l3 (-25300 -3500) (1400 3500))
+   rect(l8 (22610 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
+   rect(l11 (1660 860) (0 0))
+   rect(l11 (-2950 -450) (600 800))
    rect(l11 (23400 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
+   rect(l11 (-25200 -800) (1200 800))
+   rect(l11 (-750 -1450) (300 1400))
+   rect(l11 (-100 -350) (0 0))
+   rect(l9 (23100 -1100) (500 1500))
+   rect(l9 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l11 (23440 3840) (320 320))
@@ -438,23 +438,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
+   rect(l8 (24510 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1660 -390) (0 0))
+   rect(l11 (21500 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2 b/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2
deleted file mode 100644
index 2f1d004f9..000000000
--- a/testdata/lvs/ringo_simple_net_and_circuit_equivalence.lvsdb.2
+++ /dev/null
@@ -1,908 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(top)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(nd2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INV
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(top
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 nd2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INV location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INV location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INV location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INV location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INV location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INV location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INV location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INV location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INV location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INV location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INV location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INV INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(nd2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(top RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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 540484692..af1277122 100644
--- a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1
+++ b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -403,27 +403,27 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
+   rect(l3 (0 4500) (600 3500))
    rect(l3 (23300 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
+   rect(l3 (-25300 -3500) (1400 3500))
+   rect(l8 (22610 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
+   rect(l11 (1660 860) (0 0))
+   rect(l11 (-2950 -450) (600 800))
    rect(l11 (23400 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
+   rect(l11 (-25200 -800) (1200 800))
+   rect(l11 (-750 -1450) (300 1400))
+   rect(l11 (-100 -350) (0 0))
+   rect(l9 (23100 -1100) (500 1500))
+   rect(l9 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l11 (23440 3840) (320 320))
@@ -438,23 +438,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
+   rect(l8 (24510 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1660 -390) (0 0))
+   rect(l11 (21500 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2 b/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2
deleted file mode 100644
index 99f73ad33..000000000
--- a/testdata/lvs/ringo_simple_pin_swapping.lvsdb.2
+++ /dev/null
@@ -1,908 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(A))
-  net(6 name(B))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(A))
-  pin(6 name(B))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 3)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 5 match)
-   net(5 6 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 4 match)
-   pin(4 5 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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.cir.1 b/testdata/lvs/ringo_simple_same_device_classes.cir.1
index 577bc3ef4..4b0b16cb1 100644
--- a/testdata/lvs/ringo_simple_same_device_classes.cir.1
+++ b/testdata/lvs/ringo_simple_same_device_classes.cir.1
@@ -24,8 +24,8 @@ M$2 OUT IN VSS SUBSTRATE NM L=0.25U W=0.95U AS=0.40375P AD=0.40375P PS=2.75U
 .SUBCKT ND2X1 VDD OUT VSS \$4 B A SUBSTRATE
 M$1 VDD A OUT \$4 PM L=0.25U W=1.5U AS=0.6375P AD=0.3375P PS=3.85U PD=1.95U
 M$2 OUT B VDD \$4 PM L=0.25U W=1.5U AS=0.3375P AD=0.6375P PS=1.95U PD=3.85U
-M$3 \$I3 A VSS SUBSTRATE NM L=0.25U W=0.95U AS=0.40375P AD=0.21375P PS=2.75U
+M$3 \$I6 A VSS SUBSTRATE NM L=0.25U W=0.95U AS=0.40375P AD=0.21375P PS=2.75U
 + PD=1.4U
-M$4 OUT B \$I3 SUBSTRATE NM L=0.25U W=0.95U AS=0.21375P AD=0.40375P PS=1.4U
+M$4 OUT B \$I6 SUBSTRATE NM L=0.25U W=0.95U AS=0.21375P AD=0.40375P PS=1.4U
 + PD=2.75U
 .ENDS ND2X1
diff --git a/testdata/lvs/ringo_simple_same_device_classes.cir.2 b/testdata/lvs/ringo_simple_same_device_classes.cir.2
deleted file mode 100644
index 20ac90c01..000000000
--- a/testdata/lvs/ringo_simple_same_device_classes.cir.2
+++ /dev/null
@@ -1,31 +0,0 @@
-* Extracted by KLayout
-
-.SUBCKT RINGO FB VDD OUT ENABLE VSS
-X$1 VDD \$1 VSS VDD FB ENABLE VSS ND2X1
-X$2 VDD \$2 VSS VDD \$1 VSS INVX1
-X$3 VDD \$3 VSS VDD \$2 VSS INVX1
-X$4 VDD \$4 VSS VDD \$3 VSS INVX1
-X$5 VDD \$5 VSS VDD \$4 VSS INVX1
-X$6 VDD \$6 VSS VDD \$5 VSS INVX1
-X$7 VDD \$7 VSS VDD \$6 VSS INVX1
-X$8 VDD \$8 VSS VDD \$7 VSS INVX1
-X$9 VDD \$9 VSS VDD \$8 VSS INVX1
-X$10 VDD \$10 VSS VDD \$9 VSS INVX1
-X$11 VDD FB VSS VDD \$10 VSS INVX1
-X$12 VDD OUT VSS VDD FB VSS INVX1
-.ENDS RINGO
-
-.SUBCKT INVX1 VDD OUT VSS \$4 IN SUBSTRATE
-M$1 OUT IN VDD \$4 PM L=0.25U W=1.5U AS=0.6375P AD=0.6375P PS=3.85U PD=3.85U
-M$2 OUT IN VSS SUBSTRATE NM L=0.25U W=0.95U AS=0.40375P AD=0.40375P PS=2.75U
-+ PD=2.75U
-.ENDS INVX1
-
-.SUBCKT ND2X1 VDD OUT VSS \$4 B A SUBSTRATE
-M$1 VDD A OUT \$4 PM L=0.25U W=1.5U AS=0.6375P AD=0.3375P PS=3.85U PD=1.95U
-M$2 OUT B VDD \$4 PM L=0.25U W=1.5U AS=0.3375P AD=0.6375P PS=1.95U PD=3.85U
-M$3 \$I5 A VSS SUBSTRATE NM L=0.25U W=0.95U AS=0.40375P AD=0.21375P PS=2.75U
-+ PD=1.4U
-M$4 OUT B \$I5 SUBSTRATE NM L=0.25U W=0.95U AS=0.21375P AD=0.40375P PS=1.4U
-+ PD=2.75U
-.ENDS ND2X1
diff --git a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1 b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1
index 0b35a65e1..b4a1f4b5f 100644
--- a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1
+++ b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.1
@@ -146,8 +146,8 @@ layout(
    rect(l17 (-240 -790) (300 1700))
    rect(l17 (-1350 0) (2400 800))
    rect(l17 (-1150 -400) (0 0))
-   rect(l4 (-275 -2150) (425 1500))
-   rect(l4 (-400 -1500) (425 1500))
+   rect(l4 (-250 -2150) (425 1500))
+   rect(l4 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l14 (1810 1770) (180 180))
@@ -201,9 +201,9 @@ layout(
    rect(l17 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l9 (975 1660) (425 950))
-   rect(l9 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l9 (1000 1660) (425 950))
+   rect(l9 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -405,27 +405,27 @@ layout(
    rect(l19 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
+   rect(l3 (0 4500) (600 3500))
    rect(l3 (23300 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l14 (-24690 -1240) (180 180))
+   rect(l3 (-25300 -3500) (1400 3500))
+   rect(l14 (22610 -1240) (180 180))
    rect(l14 (-180 370) (180 180))
    rect(l14 (-180 -1280) (180 180))
-   rect(l14 (23220 370) (180 180))
+   rect(l14 (-23580 370) (180 180))
    rect(l14 (-180 370) (180 180))
    rect(l14 (-180 -1280) (180 180))
-   rect(l17 (-21740 860) (0 0))
-   rect(l17 (-2350 -450) (1200 800))
-   rect(l17 (-750 -1450) (300 1400))
-   rect(l17 (-100 -350) (0 0))
-   rect(l17 (-1250 -400) (600 800))
+   rect(l17 (1660 860) (0 0))
+   rect(l17 (-2950 -450) (600 800))
    rect(l17 (23400 -800) (1200 800))
    rect(l17 (-750 -1450) (300 1400))
    rect(l17 (-100 -350) (0 0))
    rect(l17 (550 -400) (600 800))
-   rect(l15 (-24850 -1500) (500 1500))
-   rect(l15 (22900 -1500) (500 1500))
+   rect(l17 (-25200 -800) (1200 800))
+   rect(l17 (-750 -1450) (300 1400))
+   rect(l17 (-100 -350) (0 0))
+   rect(l15 (23100 -1100) (500 1500))
+   rect(l15 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l17 (23440 3840) (320 320))
@@ -440,23 +440,23 @@ layout(
    rect(l19 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l14 (1110 1610) (180 180))
+   rect(l14 (24510 1610) (180 180))
    rect(l14 (-180 -1280) (180 180))
    rect(l14 (-180 370) (180 180))
-   rect(l14 (23220 370) (180 180))
+   rect(l14 (-23580 370) (180 180))
    rect(l14 (-180 -1280) (180 180))
    rect(l14 (-180 370) (180 180))
-   rect(l17 (-21740 -390) (0 0))
-   rect(l17 (-1900 -400) (300 1400))
-   rect(l17 (-750 -1450) (1200 800))
-   rect(l17 (-550 -400) (0 0))
-   rect(l17 (-1250 -400) (600 800))
-   rect(l17 (23850 -750) (300 1400))
+   rect(l17 (1660 -390) (0 0))
+   rect(l17 (21500 -400) (300 1400))
    rect(l17 (-750 -1450) (1200 800))
    rect(l17 (-550 -400) (0 0))
    rect(l17 (550 -400) (600 800))
-   rect(l16 (-24850 -800) (500 1500))
-   rect(l16 (22900 -1500) (500 1500))
+   rect(l17 (-25800 -800) (600 800))
+   rect(l17 (450 -750) (300 1400))
+   rect(l17 (-750 -1450) (1200 800))
+   rect(l17 (-550 -400) (0 0))
+   rect(l16 (23100 -400) (500 1500))
+   rect(l16 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2 b/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2
deleted file mode 100644
index 01a5f5ee4..000000000
--- a/testdata/lvs/ringo_simple_same_device_classes.lvsdb.2
+++ /dev/null
@@ -1,910 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l5 '5/0')
- layer(l14 '8/0')
- layer(l17 '9/0')
- layer(l18 '10/0')
- layer(l19 '11/0')
- layer(l8)
- layer(l4)
- layer(l15)
- layer(l9)
- layer(l16)
-
- # Mask layer connectivity
- connect(l3 l3 l15)
- connect(l5 l5 l14)
- connect(l14 l5 l14 l17 l4 l15 l9 l16)
- connect(l17 l14 l17 l18)
- connect(l18 l17 l18 l19)
- connect(l19 l18 l19)
- connect(l8 l8)
- connect(l4 l14 l4)
- connect(l15 l3 l14 l15)
- connect(l9 l14 l9)
- connect(l16 l14 l16)
-
- # Global nets and connectivity
- global(l8 SUBSTRATE)
- global(l16 SUBSTRATE)
-
- # Device class section
- class(PM MOS4)
- class(NM MOS4)
- class(PMHV MOS4)
- class(NMHV MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PM PM
-  terminal(S
-   rect(l4 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l5 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l4 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PM$1 PM
-  terminal(S
-   rect(l4 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l5 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l4 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PM$2 PM
-  terminal(S
-   rect(l4 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l5 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l4 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NM NM
-  terminal(S
-   rect(l9 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l5 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l9 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l8 (-125 -475) (250 950))
-  )
- )
- device(D$NM$1 NM
-  terminal(S
-   rect(l9 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l5 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l9 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l8 (-125 -475) (250 950))
-  )
- )
- device(D$NM$2 NM
-  terminal(S
-   rect(l9 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l5 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l9 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l8 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l14 (1110 5160) (180 180))
-   rect(l14 (-180 920) (180 180))
-   rect(l14 (-180 -730) (180 180))
-   rect(l17 (-240 -790) (300 1700))
-   rect(l17 (-1350 0) (2400 800))
-   rect(l17 (-1150 -400) (0 0))
-   rect(l4 (-275 -2150) (425 1500))
-   rect(l4 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l14 (1810 1770) (180 180))
-   rect(l14 (-180 370) (180 180))
-   rect(l14 (-1580 3760) (180 180))
-   rect(l14 (-180 -730) (180 180))
-   rect(l14 (-180 -730) (180 180))
-   rect(l14 (1220 920) (180 180))
-   rect(l14 (-180 -1280) (180 180))
-   rect(l14 (-180 370) (180 180))
-   polygon(l17 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l17 (-110 1390) (300 1400))
-   polygon(l17 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l17 (-140 -500) (0 0))
-   rect(l17 (-1750 1100) (300 1400))
-   rect(l17 (1100 -1700) (300 300))
-   rect(l17 (-300 0) (300 1400))
-   rect(l4 (-375 -1450) (425 1500))
-   rect(l4 (-1800 -1500) (425 1500))
-   rect(l9 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l14 (410 1770) (180 180))
-   rect(l14 (-180 370) (180 180))
-   rect(l17 (-240 -1300) (300 1360))
-   rect(l17 (-650 -2160) (2400 800))
-   rect(l17 (-1150 -400) (0 0))
-   rect(l9 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l5 (1425 2860) (250 1940))
-   rect(l5 (-345 -950) (300 300))
-   rect(l5 (-205 650) (250 2000))
-   rect(l5 (-250 -2000) (250 2000))
-   rect(l5 (-250 -5390) (250 1450))
-   rect(l14 (-285 1050) (180 180))
-   rect(l17 (-70 -90) (0 0))
-   rect(l17 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l5 (725 2860) (250 1940))
-   rect(l5 (-325 -1850) (300 300))
-   rect(l5 (-225 1550) (250 2000))
-   rect(l5 (-250 -2000) (250 2000))
-   rect(l5 (-250 -5390) (250 1450))
-   rect(l14 (-265 150) (180 180))
-   rect(l17 (-90 -90) (0 0))
-   rect(l17 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l9 (975 1660) (425 950))
-   rect(l9 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PM
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PM$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NM
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NM$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l14 (410 6260) (180 180))
-   rect(l14 (-180 -730) (180 180))
-   rect(l14 (-180 -730) (180 180))
-   rect(l17 (-240 -240) (300 1400))
-   rect(l17 (-650 300) (1800 800))
-   rect(l17 (-1450 -1100) (300 300))
-   rect(l17 (300 400) (0 0))
-   rect(l4 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l14 (1110 5160) (180 180))
-   rect(l14 (-180 920) (180 180))
-   rect(l14 (-180 -730) (180 180))
-   rect(l14 (-180 -4120) (180 180))
-   rect(l14 (-180 370) (180 180))
-   rect(l17 (-240 -790) (300 4790))
-   rect(l17 (-150 -2500) (0 0))
-   rect(l4 (-225 1050) (425 1500))
-   rect(l9 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l14 (410 1770) (180 180))
-   rect(l14 (-180 370) (180 180))
-   rect(l17 (-240 -1300) (300 1360))
-   rect(l17 (-650 -2160) (1800 800))
-   rect(l17 (-850 -400) (0 0))
-   rect(l9 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l5 (725 2860) (250 1940))
-   rect(l5 (-525 -1850) (300 300))
-   rect(l5 (-25 1550) (250 2000))
-   rect(l5 (-250 -2000) (250 2000))
-   rect(l5 (-250 -5390) (250 1450))
-   rect(l14 (-465 150) (180 180))
-   rect(l17 (-90 -90) (0 0))
-   rect(l17 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PM$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NM$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l17 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l17 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l17 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l17 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l17 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l17 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l17 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l17 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l17 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l17 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l17 (21750 2950) (900 300))
-   rect(l17 (-19530 590) (320 320))
-   rect(l17 (17820 -320) (320 320))
-   rect(l18 (-18400 -260) (200 200))
-   rect(l18 (17940 -200) (200 200))
-   rect(l19 (-18040 -300) (17740 400))
-   rect(l19 (-17920 -200) (0 0))
-   rect(l19 (-220 -200) (400 400))
-   rect(l19 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l14 (-24690 -1240) (180 180))
-   rect(l14 (-180 370) (180 180))
-   rect(l14 (-180 -1280) (180 180))
-   rect(l14 (23220 370) (180 180))
-   rect(l14 (-180 370) (180 180))
-   rect(l14 (-180 -1280) (180 180))
-   rect(l17 (-21740 860) (0 0))
-   rect(l17 (-2350 -450) (1200 800))
-   rect(l17 (-750 -1450) (300 1400))
-   rect(l17 (-100 -350) (0 0))
-   rect(l17 (-1250 -400) (600 800))
-   rect(l17 (23400 -800) (1200 800))
-   rect(l17 (-750 -1450) (300 1400))
-   rect(l17 (-100 -350) (0 0))
-   rect(l17 (550 -400) (600 800))
-   rect(l15 (-24850 -1500) (500 1500))
-   rect(l15 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l17 (23440 3840) (320 320))
-   rect(l18 (-260 -260) (200 200))
-   rect(l19 (-100 -100) (0 0))
-   rect(l19 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l17 (2440 2940) (320 320))
-   rect(l18 (-260 -260) (200 200))
-   rect(l19 (-100 -100) (0 0))
-   rect(l19 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l14 (1110 1610) (180 180))
-   rect(l14 (-180 -1280) (180 180))
-   rect(l14 (-180 370) (180 180))
-   rect(l14 (23220 370) (180 180))
-   rect(l14 (-180 -1280) (180 180))
-   rect(l14 (-180 370) (180 180))
-   rect(l17 (-21740 -390) (0 0))
-   rect(l17 (-1900 -400) (300 1400))
-   rect(l17 (-750 -1450) (1200 800))
-   rect(l17 (-550 -400) (0 0))
-   rect(l17 (-1250 -400) (600 800))
-   rect(l17 (23850 -750) (300 1400))
-   rect(l17 (-750 -1450) (1200 800))
-   rect(l17 (-550 -400) (0 0))
-   rect(l17 (550 -400) (600 800))
-   rect(l16 (-24850 -800) (500 1500))
-   rect(l16 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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 673eeb9e6..6199fa815 100644
--- a/testdata/lvs/ringo_simple_simplification.lvsdb.1
+++ b/testdata/lvs/ringo_simple_simplification.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I18)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -400,10 +400,10 @@ layout(
    rect(l8 (-180 370) (180 180))
    rect(l11 (-240 -790) (300 4790))
    rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-   rect(l6 (-450 -4890) (425 950))
-   rect(l6 (-400 -950) (425 950))
+   rect(l2 (-200 1050) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
+   rect(l6 (-400 -4890) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
   net(4 name(VSS)
    rect(l8 (410 1770) (180 180))
@@ -507,9 +507,9 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(6 name(VDD)
-   rect(l3 (1100 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
+   rect(l3 (600 4500) (600 3500))
+   rect(l3 (-100 -3500) (1400 3500))
+   rect(l3 (22000 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
    rect(l8 (-24690 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
@@ -518,11 +518,11 @@ layout(
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l11 (-22340 860) (0 0))
-   rect(l11 (-1750 -450) (1200 800))
+   rect(l11 (-2350 -450) (600 800))
+   rect(l11 (0 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
+   rect(l11 (22750 -400) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
@@ -542,23 +542,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(9 name(VSS)
-   rect(l8 (1710 1610) (180 180))
+   rect(l8 (25110 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-22340 -390) (0 0))
-   rect(l11 (-1300 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1060 -390) (0 0))
+   rect(l11 (22100 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
   net(10 name($I22)
    rect(l11 (7350 2950) (900 300))
diff --git a/testdata/lvs/ringo_simple_simplification.lvsdb.2 b/testdata/lvs/ringo_simple_simplification.lvsdb.2
deleted file mode 100644
index 86f2734bf..000000000
--- a/testdata/lvs/ringo_simple_simplification.lvsdb.2
+++ /dev/null
@@ -1,1095 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(INVX2
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-225 -1300) (675 450))
-   rect(l4 (0 -1100) (250 1950))
-   rect(l4 (-1225 -1850) (300 300))
-   rect(l4 (675 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-950 -2000) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (450 -5390) (250 1450))
-   rect(l4 (-950 -1450) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(2 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-1640 -240) (300 1400))
-   rect(l11 (-650 300) (2400 800))
-   rect(l11 (-2050 -1100) (300 300))
-   rect(l11 (1100 -300) (300 300))
-   rect(l11 (-1100 400) (0 0))
-   rect(l11 (800 -2100) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-  )
-  net(3 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-   rect(l6 (-450 -4890) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-  net(4 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (1220 -730) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-1640 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-650 0) (300 1360))
-   rect(l11 (-1100 -1760) (0 0))
-   rect(l6 (725 860) (425 950))
-   rect(l6 (-1800 -950) (425 950))
-  )
-  net(5 name($5)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(IN))
-  pin(2 name(VDD))
-  pin(3 name(OUT))
-  pin(4 name(VSS))
-  pin(5)
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   device(D$PMOS$1 location(700 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(850 5800)
-   param(L 0.25)
-   param(W 3)
-   param(AS 0.975)
-   param(AD 0.975)
-   param(PS 5.8)
-   param(PD 5.8)
-   terminal(S 2)
-   terminal(G 1)
-   terminal(D 3)
-   terminal(B 5)
-  )
-  device(3 D$NMOS
-   device(D$NMOS$1 location(700 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(850 2135)
-   param(L 0.25)
-   param(W 1.9)
-   param(AS 0.6175)
-   param(AD 0.6175)
-   param(PS 4.15)
-   param(PD 4.15)
-   terminal(S 4)
-   terminal(G 1)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((600 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(5 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(6 name(VDD)
-   rect(l3 (1100 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-22340 860) (0 0))
-   rect(l11 (-1750 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(7 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(8 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(9 name(VSS)
-   rect(l8 (1710 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-22340 -390) (0 0))
-   rect(l11 (-1300 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-  net(10 name($I22)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(11 name($I18)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(12 name($I36)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(13 name($I37)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(14 name($I38)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(15 name($I39)
-   rect(l11 (14550 2950) (900 300))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(5 name(FB))
-  pin(6 name(VDD))
-  pin(7 name(OUT))
-  pin(8 name(ENABLE))
-  pin(9 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 6)
-   pin(1 1)
-   pin(2 9)
-   pin(3 6)
-   pin(4 5)
-   pin(5 8)
-   pin(6 9)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 6)
-   pin(1 2)
-   pin(2 9)
-   pin(3 6)
-   pin(4 1)
-   pin(5 9)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 6)
-   pin(1 10)
-   pin(2 9)
-   pin(3 6)
-   pin(4 2)
-   pin(5 9)
-  )
-  circuit(4 INVX1 location(16800 0)
-   pin(0 6)
-   pin(1 3)
-   pin(2 9)
-   pin(3 6)
-   pin(4 11)
-   pin(5 9)
-  )
-  circuit(5 INVX1 location(18600 0)
-   pin(0 6)
-   pin(1 4)
-   pin(2 9)
-   pin(3 6)
-   pin(4 3)
-   pin(5 9)
-  )
-  circuit(6 INVX1 location(20400 0)
-   pin(0 6)
-   pin(1 5)
-   pin(2 9)
-   pin(3 6)
-   pin(4 4)
-   pin(5 9)
-  )
-  circuit(7 INVX2 location(22200 0)
-   pin(0 5)
-   pin(1 6)
-   pin(2 7)
-   pin(3 9)
-   pin(4 6)
-   pin(5 9)
-  )
-  circuit(17 INVX1 location(7800 0)
-   pin(0 6)
-   pin(1 12)
-   pin(2 9)
-   pin(3 6)
-   pin(4 10)
-   pin(5 9)
-  )
-  circuit(18 INVX1 location(9600 0)
-   pin(0 6)
-   pin(1 13)
-   pin(2 9)
-   pin(3 6)
-   pin(4 12)
-   pin(5 9)
-  )
-  circuit(19 INVX1 location(11400 0)
-   pin(0 6)
-   pin(1 14)
-   pin(2 9)
-   pin(3 6)
-   pin(4 13)
-   pin(5 9)
-  )
-  circuit(20 INVX1 location(13200 0)
-   pin(0 6)
-   pin(1 15)
-   pin(2 9)
-   pin(3 6)
-   pin(4 14)
-   pin(5 9)
-  )
-  circuit(21 INVX1 location(15000 0)
-   pin(0 6)
-   pin(1 11)
-   pin(2 9)
-   pin(3 6)
-   pin(4 15)
-   pin(5 9)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 6)
-   terminal(D 3)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 8)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(INVX2
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 3)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.9)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX2 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(INVX2 INVX2 match
-  xref(
-   net(5 4 match)
-   net(1 5 match)
-   net(3 2 match)
-   net(6 6 match)
-   net(2 1 match)
-   net(4 3 match)
-   pin(4 3 match)
-   pin(0 4 match)
-   pin(2 1 match)
-   pin(5 5 match)
-   pin(1 0 match)
-   pin(3 2 match)
-   device(3 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(4 15 match)
-   net(2 7 match)
-   net(10 8 match)
-   net(12 9 match)
-   net(13 10 match)
-   net(14 11 match)
-   net(15 12 match)
-   net(11 13 match)
-   net(3 14 match)
-   net(8 4 match)
-   net(5 3 match)
-   net(7 5 match)
-   net(6 2 match)
-   net(9 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(17 4 match)
-   circuit(18 5 match)
-   circuit(19 6 match)
-   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.cir b/testdata/lvs/ringo_simple_simplification_with_align.cir
index 4996f57fa..2470e20bc 100644
--- a/testdata/lvs/ringo_simple_simplification_with_align.cir
+++ b/testdata/lvs/ringo_simple_simplification_with_align.cir
@@ -26,16 +26,16 @@ X$5 6 4 9 6 3 9 INVX1
 X$6 6 5 9 6 4 9 INVX1
 * cell instance $7 r0 *1 22.2,0
 X$7 5 6 7 9 6 9 INVX2
-* cell instance $13 r0 *1 7.8,0
-X$13 6 12 9 6 10 9 INVX1
-* cell instance $14 r0 *1 9.6,0
-X$14 6 13 9 6 12 9 INVX1
-* cell instance $15 r0 *1 11.4,0
-X$15 6 14 9 6 13 9 INVX1
-* cell instance $16 r0 *1 13.2,0
-X$16 6 15 9 6 14 9 INVX1
-* cell instance $17 r0 *1 15,0
-X$17 6 11 9 6 15 9 INVX1
+* cell instance $15 r0 *1 7.8,0
+X$15 6 12 9 6 10 9 INVX1
+* cell instance $16 r0 *1 9.6,0
+X$16 6 13 9 6 12 9 INVX1
+* cell instance $17 r0 *1 11.4,0
+X$17 6 14 9 6 13 9 INVX1
+* cell instance $18 r0 *1 13.2,0
+X$18 6 15 9 6 14 9 INVX1
+* cell instance $19 r0 *1 15,0
+X$19 6 11 9 6 15 9 INVX1
 .ENDS RINGO
 
 * cell INVX2
diff --git a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1 b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1
index e92e8e9a5..19e8ddc00 100644
--- a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1
+++ b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I18)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -400,10 +400,10 @@ layout(
    rect(l8 (-180 370) (180 180))
    rect(l11 (-240 -790) (300 4790))
    rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-   rect(l6 (-450 -4890) (425 950))
-   rect(l6 (-400 -950) (425 950))
+   rect(l2 (-200 1050) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
+   rect(l6 (-400 -4890) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
   net(4 name(VSS)
    rect(l8 (410 1770) (180 180))
@@ -507,9 +507,9 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(6 name(VDD)
-   rect(l3 (1100 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
+   rect(l3 (600 4500) (600 3500))
+   rect(l3 (-100 -3500) (1400 3500))
+   rect(l3 (22000 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
    rect(l8 (-24690 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
@@ -518,11 +518,11 @@ layout(
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l11 (-22340 860) (0 0))
-   rect(l11 (-1750 -450) (1200 800))
+   rect(l11 (-2350 -450) (600 800))
+   rect(l11 (0 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
+   rect(l11 (22750 -400) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
@@ -542,23 +542,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(9 name(VSS)
-   rect(l8 (1710 1610) (180 180))
+   rect(l8 (25110 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-22340 -390) (0 0))
-   rect(l11 (-1300 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1060 -390) (0 0))
+   rect(l11 (22100 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
   net(10 name($I22)
    rect(l11 (7350 2950) (900 300))
@@ -644,7 +644,7 @@ layout(
    pin(4 6)
    pin(5 9)
   )
-  circuit(13 INVX1 location(7800 0)
+  circuit(15 INVX1 location(7800 0)
    pin(0 6)
    pin(1 12)
    pin(2 9)
@@ -652,7 +652,7 @@ layout(
    pin(4 10)
    pin(5 9)
   )
-  circuit(14 INVX1 location(9600 0)
+  circuit(16 INVX1 location(9600 0)
    pin(0 6)
    pin(1 13)
    pin(2 9)
@@ -660,7 +660,7 @@ layout(
    pin(4 12)
    pin(5 9)
   )
-  circuit(15 INVX1 location(11400 0)
+  circuit(17 INVX1 location(11400 0)
    pin(0 6)
    pin(1 14)
    pin(2 9)
@@ -668,7 +668,7 @@ layout(
    pin(4 13)
    pin(5 9)
   )
-  circuit(16 INVX1 location(13200 0)
+  circuit(18 INVX1 location(13200 0)
    pin(0 6)
    pin(1 15)
    pin(2 9)
@@ -676,7 +676,7 @@ layout(
    pin(4 14)
    pin(5 9)
   )
-  circuit(17 INVX1 location(15000 0)
+  circuit(19 INVX1 location(15000 0)
    pin(0 6)
    pin(1 11)
    pin(2 9)
@@ -1080,11 +1080,11 @@ xref(
    pin(4 0 match)
    circuit(2 2 match)
    circuit(3 3 match)
-   circuit(13 4 match)
-   circuit(14 5 match)
-   circuit(15 6 match)
-   circuit(16 7 match)
-   circuit(17 8 match)
+   circuit(15 4 match)
+   circuit(16 5 match)
+   circuit(17 6 match)
+   circuit(18 7 match)
+   circuit(19 8 match)
    circuit(4 9 match)
    circuit(5 10 match)
    circuit(6 11 match)
diff --git a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2 b/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2
deleted file mode 100644
index a0eab7f51..000000000
--- a/testdata/lvs/ringo_simple_simplification_with_align.lvsdb.2
+++ /dev/null
@@ -1,1095 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(INVX2
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-225 -1300) (675 450))
-   rect(l4 (0 -1100) (250 1950))
-   rect(l4 (-1225 -1850) (300 300))
-   rect(l4 (675 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-950 -2000) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (450 -5390) (250 1450))
-   rect(l4 (-950 -1450) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(2 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-1640 -240) (300 1400))
-   rect(l11 (-650 300) (2400 800))
-   rect(l11 (-2050 -1100) (300 300))
-   rect(l11 (1100 -300) (300 300))
-   rect(l11 (-1100 400) (0 0))
-   rect(l11 (800 -2100) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-  )
-  net(3 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-   rect(l6 (-450 -4890) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-  net(4 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (1220 -730) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-1640 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-650 0) (300 1360))
-   rect(l11 (-1100 -1760) (0 0))
-   rect(l6 (725 860) (425 950))
-   rect(l6 (-1800 -950) (425 950))
-  )
-  net(5 name($5)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(IN))
-  pin(2 name(VDD))
-  pin(3 name(OUT))
-  pin(4 name(VSS))
-  pin(5)
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   device(D$PMOS$1 location(700 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(850 5800)
-   param(L 0.25)
-   param(W 3)
-   param(AS 0.975)
-   param(AD 0.975)
-   param(PS 5.8)
-   param(PD 5.8)
-   terminal(S 2)
-   terminal(G 1)
-   terminal(D 3)
-   terminal(B 5)
-  )
-  device(3 D$NMOS
-   device(D$NMOS$1 location(700 0))
-   connect(0 S S)
-   connect(1 S D)
-   connect(0 G G)
-   connect(1 G G)
-   connect(0 D D)
-   connect(1 D S)
-   connect(0 B B)
-   connect(1 B B)
-   location(850 2135)
-   param(L 0.25)
-   param(W 1.9)
-   param(AS 0.6175)
-   param(AD 0.6175)
-   param(PS 4.15)
-   param(PD 4.15)
-   terminal(S 4)
-   terminal(G 1)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((600 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(5 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(6 name(VDD)
-   rect(l3 (1100 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-22340 860) (0 0))
-   rect(l11 (-1750 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(7 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(8 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(9 name(VSS)
-   rect(l8 (1710 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-22340 -390) (0 0))
-   rect(l11 (-1300 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-  net(10 name($I22)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(11 name($I18)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(12 name($I36)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(13 name($I37)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(14 name($I38)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(15 name($I39)
-   rect(l11 (14550 2950) (900 300))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(5 name(FB))
-  pin(6 name(VDD))
-  pin(7 name(OUT))
-  pin(8 name(ENABLE))
-  pin(9 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 6)
-   pin(1 1)
-   pin(2 9)
-   pin(3 6)
-   pin(4 5)
-   pin(5 8)
-   pin(6 9)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 6)
-   pin(1 2)
-   pin(2 9)
-   pin(3 6)
-   pin(4 1)
-   pin(5 9)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 6)
-   pin(1 10)
-   pin(2 9)
-   pin(3 6)
-   pin(4 2)
-   pin(5 9)
-  )
-  circuit(4 INVX1 location(16800 0)
-   pin(0 6)
-   pin(1 3)
-   pin(2 9)
-   pin(3 6)
-   pin(4 11)
-   pin(5 9)
-  )
-  circuit(5 INVX1 location(18600 0)
-   pin(0 6)
-   pin(1 4)
-   pin(2 9)
-   pin(3 6)
-   pin(4 3)
-   pin(5 9)
-  )
-  circuit(6 INVX1 location(20400 0)
-   pin(0 6)
-   pin(1 5)
-   pin(2 9)
-   pin(3 6)
-   pin(4 4)
-   pin(5 9)
-  )
-  circuit(7 INVX2 location(22200 0)
-   pin(0 5)
-   pin(1 6)
-   pin(2 7)
-   pin(3 9)
-   pin(4 6)
-   pin(5 9)
-  )
-  circuit(13 INVX1 location(7800 0)
-   pin(0 6)
-   pin(1 12)
-   pin(2 9)
-   pin(3 6)
-   pin(4 10)
-   pin(5 9)
-  )
-  circuit(14 INVX1 location(9600 0)
-   pin(0 6)
-   pin(1 13)
-   pin(2 9)
-   pin(3 6)
-   pin(4 12)
-   pin(5 9)
-  )
-  circuit(15 INVX1 location(11400 0)
-   pin(0 6)
-   pin(1 14)
-   pin(2 9)
-   pin(3 6)
-   pin(4 13)
-   pin(5 9)
-  )
-  circuit(16 INVX1 location(13200 0)
-   pin(0 6)
-   pin(1 15)
-   pin(2 9)
-   pin(3 6)
-   pin(4 14)
-   pin(5 9)
-  )
-  circuit(17 INVX1 location(15000 0)
-   pin(0 6)
-   pin(1 11)
-   pin(2 9)
-   pin(3 6)
-   pin(4 15)
-   pin(5 9)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 6)
-   terminal(D 3)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 8)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(INVX2
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 3)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.9)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX2 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(INVX2 INVX2 match
-  xref(
-   net(5 4 match)
-   net(1 5 match)
-   net(3 2 match)
-   net(6 6 match)
-   net(2 1 match)
-   net(4 3 match)
-   pin(4 3 match)
-   pin(0 4 match)
-   pin(2 1 match)
-   pin(5 5 match)
-   pin(1 0 match)
-   pin(3 2 match)
-   device(3 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(4 15 match)
-   net(2 7 match)
-   net(10 8 match)
-   net(12 9 match)
-   net(13 10 match)
-   net(14 11 match)
-   net(15 12 match)
-   net(11 13 match)
-   net(3 14 match)
-   net(8 4 match)
-   net(5 3 match)
-   net(7 5 match)
-   net(6 2 match)
-   net(9 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(13 4 match)
-   circuit(14 5 match)
-   circuit(15 6 match)
-   circuit(16 7 match)
-   circuit(17 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_with_tol.lvsdb.1 b/testdata/lvs/ringo_simple_with_tol.lvsdb.1
index ce2a291d8..37dfa8777 100644
--- a/testdata/lvs/ringo_simple_with_tol.lvsdb.1
+++ b/testdata/lvs/ringo_simple_with_tol.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -403,27 +403,27 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
+   rect(l3 (0 4500) (600 3500))
    rect(l3 (23300 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
+   rect(l3 (-25300 -3500) (1400 3500))
+   rect(l8 (22610 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
+   rect(l11 (1660 860) (0 0))
+   rect(l11 (-2950 -450) (600 800))
    rect(l11 (23400 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
+   rect(l11 (-25200 -800) (1200 800))
+   rect(l11 (-750 -1450) (300 1400))
+   rect(l11 (-100 -350) (0 0))
+   rect(l9 (23100 -1100) (500 1500))
+   rect(l9 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l11 (23440 3840) (320 320))
@@ -438,23 +438,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
+   rect(l8 (24510 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1660 -390) (0 0))
+   rect(l11 (21500 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple_with_tol.lvsdb.2 b/testdata/lvs/ringo_simple_with_tol.lvsdb.2
deleted file mode 100644
index 03805ce69..000000000
--- a/testdata/lvs/ringo_simple_with_tol.lvsdb.2
+++ /dev/null
@@ -1,908 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.251)
-   param(W 1.6)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.26)
-   param(W 1)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 6)
-   terminal(D 3)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 8)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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_with_tol_early.lvsdb.1 b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.1
index ce2a291d8..37dfa8777 100644
--- a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.1
+++ b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.1
@@ -144,8 +144,8 @@ layout(
    rect(l11 (-240 -790) (300 1700))
    rect(l11 (-1350 0) (2400 800))
    rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
+   rect(l2 (-250 -2150) (425 1500))
+   rect(l2 (-450 -1500) (425 1500))
   )
   net(2 name(OUT)
    rect(l8 (1810 1770) (180 180))
@@ -199,9 +199,9 @@ layout(
    rect(l11 (-150 -150) (300 300))
   )
   net(7 name(SUBSTRATE))
-  net(8 name($I3)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
+  net(8 name($I6)
+   rect(l6 (1000 1660) (425 950))
+   rect(l6 (-450 -950) (425 950))
   )
 
   # Outgoing pins and their connections to nets
@@ -403,27 +403,27 @@ layout(
    rect(l13 (17740 -400) (400 400))
   )
   net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
+   rect(l3 (0 4500) (600 3500))
    rect(l3 (23300 -3500) (1400 3500))
    rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
+   rect(l3 (-25300 -3500) (1400 3500))
+   rect(l8 (22610 -1240) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
+   rect(l11 (1660 860) (0 0))
+   rect(l11 (-2950 -450) (600 800))
    rect(l11 (23400 -800) (1200 800))
    rect(l11 (-750 -1450) (300 1400))
    rect(l11 (-100 -350) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
+   rect(l11 (-25200 -800) (1200 800))
+   rect(l11 (-750 -1450) (300 1400))
+   rect(l11 (-100 -350) (0 0))
+   rect(l9 (23100 -1100) (500 1500))
+   rect(l9 (-23900 -1500) (500 1500))
   )
   net(13 name(OUT)
    rect(l11 (23440 3840) (320 320))
@@ -438,23 +438,23 @@ layout(
    rect(l13 (-200 -200) (400 400))
   )
   net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
+   rect(l8 (24510 1610) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
+   rect(l8 (-23580 370) (180 180))
    rect(l8 (-180 -1280) (180 180))
    rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
+   rect(l11 (1660 -390) (0 0))
+   rect(l11 (21500 -400) (300 1400))
    rect(l11 (-750 -1450) (1200 800))
    rect(l11 (-550 -400) (0 0))
    rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
+   rect(l11 (-25800 -800) (600 800))
+   rect(l11 (450 -750) (300 1400))
+   rect(l11 (-750 -1450) (1200 800))
+   rect(l11 (-550 -400) (0 0))
+   rect(l10 (23100 -400) (500 1500))
+   rect(l10 (-23900 -1500) (500 1500))
   )
 
   # Outgoing pins and their connections to nets
diff --git a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2 b/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2
deleted file mode 100644
index 03805ce69..000000000
--- a/testdata/lvs/ringo_simple_with_tol_early.lvsdb.2
+++ /dev/null
@@ -1,908 +0,0 @@
-#%lvsdb-klayout
-
-# Layout
-layout(
- top(RINGO)
- unit(0.001)
-
- # Layer section
- # This section lists the mask layers (drawing or derived) and their connections.
-
- # Mask layers
- layer(l3 '1/0')
- layer(l4 '5/0')
- layer(l8 '8/0')
- layer(l11 '9/0')
- layer(l12 '10/0')
- layer(l13 '11/0')
- layer(l7)
- layer(l2)
- layer(l9)
- layer(l6)
- layer(l10)
-
- # Mask layer connectivity
- connect(l3 l3 l9)
- connect(l4 l4 l8)
- connect(l8 l4 l8 l11 l2 l9 l6 l10)
- connect(l11 l8 l11 l12)
- connect(l12 l11 l12 l13)
- connect(l13 l12 l13)
- connect(l7 l7)
- connect(l2 l8 l2)
- connect(l9 l3 l8 l9)
- connect(l6 l8 l6)
- connect(l10 l8 l10)
-
- # Global nets and connectivity
- global(l7 SUBSTRATE)
- global(l10 SUBSTRATE)
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Device abstracts section
- # Device abstracts list the pin shapes of the devices.
- device(D$PMOS PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (450 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$1 PMOS
-  terminal(S
-   rect(l2 (-575 -750) (450 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$PMOS$2 PMOS
-  terminal(S
-   rect(l2 (-550 -750) (425 1500))
-  )
-  terminal(G
-   rect(l4 (-125 -750) (250 1500))
-  )
-  terminal(D
-   rect(l2 (125 -750) (425 1500))
-  )
-  terminal(B
-   rect(l3 (-125 -750) (250 1500))
-  )
- )
- device(D$NMOS NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (450 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$1 NMOS
-  terminal(S
-   rect(l6 (-575 -475) (450 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
- device(D$NMOS$2 NMOS
-  terminal(S
-   rect(l6 (-550 -475) (425 950))
-  )
-  terminal(G
-   rect(l4 (-125 -475) (250 950))
-  )
-  terminal(D
-   rect(l6 (125 -475) (425 950))
-  )
-  terminal(B
-   rect(l7 (-125 -475) (250 950))
-  )
- )
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Circuit boundary
-  rect((-100 400) (2600 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -790) (300 1700))
-   rect(l11 (-1350 0) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l2 (-275 -2150) (425 1500))
-   rect(l2 (-400 -1500) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1810 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-1580 3760) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (1220 920) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   polygon(l11 (-240 -4180) (0 1390) (490 0) (0 -300) (-190 0) (0 -1090))
-   rect(l11 (-110 1390) (300 1400))
-   polygon(l11 (-1890 0) (0 600) (300 0) (0 -300) (1590 0) (0 -300))
-   rect(l11 (-140 -500) (0 0))
-   rect(l11 (-1750 1100) (300 1400))
-   rect(l11 (1100 -1700) (300 300))
-   rect(l11 (-300 0) (300 1400))
-   rect(l2 (-375 -1450) (425 1500))
-   rect(l2 (-1800 -1500) (425 1500))
-   rect(l6 (950 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (2400 800))
-   rect(l11 (-1150 -400) (0 0))
-   rect(l6 (-950 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2600 3500))
-  )
-  net(5 name(B)
-   rect(l4 (1425 2860) (250 1940))
-   rect(l4 (-345 -950) (300 300))
-   rect(l4 (-205 650) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-285 1050) (180 180))
-   rect(l11 (-70 -90) (0 0))
-   rect(l11 (-170 -150) (300 300))
-  )
-  net(6 name(A)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-325 -1850) (300 300))
-   rect(l4 (-225 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-265 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(7 name(SUBSTRATE))
-  net(8 name($I5)
-   rect(l6 (975 1660) (425 950))
-   rect(l6 (-400 -950) (425 950))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.3375)
-   param(PS 3.85)
-   param(PD 1.95)
-   terminal(S 2)
-   terminal(G 6)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 D$PMOS$1
-   location(1550 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.3375)
-   param(AD 0.6375)
-   param(PS 1.95)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(3 D$NMOS
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.21375)
-   param(PS 2.75)
-   param(PD 1.4)
-   terminal(S 3)
-   terminal(G 6)
-   terminal(D 8)
-   terminal(B 7)
-  )
-  device(4 D$NMOS$1
-   location(1550 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.21375)
-   param(AD 0.40375)
-   param(PS 1.4)
-   param(PD 2.75)
-   terminal(S 8)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Circuit boundary
-  rect((-100 400) (2000 7600))
-
-  # Nets with their geometries
-  net(1 name(VDD)
-   rect(l8 (410 6260) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l11 (-240 -240) (300 1400))
-   rect(l11 (-650 300) (1800 800))
-   rect(l11 (-1450 -1100) (300 300))
-   rect(l11 (300 400) (0 0))
-   rect(l2 (-650 -2150) (425 1500))
-  )
-  net(2 name(OUT)
-   rect(l8 (1110 5160) (180 180))
-   rect(l8 (-180 920) (180 180))
-   rect(l8 (-180 -730) (180 180))
-   rect(l8 (-180 -4120) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -790) (300 4790))
-   rect(l11 (-150 -2500) (0 0))
-   rect(l2 (-225 1050) (425 1500))
-   rect(l6 (-425 -4890) (425 950))
-  )
-  net(3 name(VSS)
-   rect(l8 (410 1770) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-240 -1300) (300 1360))
-   rect(l11 (-650 -2160) (1800 800))
-   rect(l11 (-850 -400) (0 0))
-   rect(l6 (-650 860) (425 950))
-  )
-  net(4 name($4)
-   rect(l3 (-100 4500) (2000 3500))
-  )
-  net(5 name(IN)
-   rect(l4 (725 2860) (250 1940))
-   rect(l4 (-525 -1850) (300 300))
-   rect(l4 (-25 1550) (250 2000))
-   rect(l4 (-250 -2000) (250 2000))
-   rect(l4 (-250 -5390) (250 1450))
-   rect(l8 (-465 150) (180 180))
-   rect(l11 (-90 -90) (0 0))
-   rect(l11 (-150 -150) (300 300))
-  )
-  net(6 name(SUBSTRATE))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4)
-  pin(5 name(IN))
-  pin(6 name(SUBSTRATE))
-
-  # Devices and their connections
-  device(1 D$PMOS$2
-   location(850 5800)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0.6375)
-   param(AD 0.6375)
-   param(PS 3.85)
-   param(PD 3.85)
-   terminal(S 1)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 D$NMOS$2
-   location(850 2135)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0.40375)
-   param(AD 0.40375)
-   param(PS 2.75)
-   param(PD 2.75)
-   terminal(S 3)
-   terminal(G 5)
-   terminal(D 2)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Circuit boundary
-  rect((0 350) (25800 7650))
-
-  # Nets with their geometries
-  net(1 name($1)
-   rect(l11 (4040 2950) (610 300))
-  )
-  net(2 name($2)
-   rect(l11 (5550 2950) (900 300))
-  )
-  net(3 name($3)
-   rect(l11 (7350 2950) (900 300))
-  )
-  net(4 name($4)
-   rect(l11 (9150 2950) (900 300))
-  )
-  net(5 name($5)
-   rect(l11 (10950 2950) (900 300))
-  )
-  net(6 name($6)
-   rect(l11 (12750 2950) (900 300))
-  )
-  net(7 name($7)
-   rect(l11 (14550 2950) (900 300))
-  )
-  net(8 name($8)
-   rect(l11 (16350 2950) (900 300))
-  )
-  net(9 name($9)
-   rect(l11 (18150 2950) (900 300))
-  )
-  net(10 name($10)
-   rect(l11 (19950 2950) (900 300))
-  )
-  net(11 name(FB)
-   rect(l11 (21750 2950) (900 300))
-   rect(l11 (-19530 590) (320 320))
-   rect(l11 (17820 -320) (320 320))
-   rect(l12 (-18400 -260) (200 200))
-   rect(l12 (17940 -200) (200 200))
-   rect(l13 (-18040 -300) (17740 400))
-   rect(l13 (-17920 -200) (0 0))
-   rect(l13 (-220 -200) (400 400))
-   rect(l13 (17740 -400) (400 400))
-  )
-  net(12 name(VDD)
-   rect(l3 (500 4500) (1400 3500))
-   rect(l3 (-1900 -3500) (600 3500))
-   rect(l3 (23300 -3500) (1400 3500))
-   rect(l3 (-100 -3500) (600 3500))
-   rect(l8 (-24690 -1240) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l11 (-21740 860) (0 0))
-   rect(l11 (-2350 -450) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23400 -800) (1200 800))
-   rect(l11 (-750 -1450) (300 1400))
-   rect(l11 (-100 -350) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l9 (-24850 -1500) (500 1500))
-   rect(l9 (22900 -1500) (500 1500))
-  )
-  net(13 name(OUT)
-   rect(l11 (23440 3840) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(14 name(ENABLE)
-   rect(l11 (2440 2940) (320 320))
-   rect(l12 (-260 -260) (200 200))
-   rect(l13 (-100 -100) (0 0))
-   rect(l13 (-200 -200) (400 400))
-  )
-  net(15 name(VSS)
-   rect(l8 (1110 1610) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l8 (23220 370) (180 180))
-   rect(l8 (-180 -1280) (180 180))
-   rect(l8 (-180 370) (180 180))
-   rect(l11 (-21740 -390) (0 0))
-   rect(l11 (-1900 -400) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (-1250 -400) (600 800))
-   rect(l11 (23850 -750) (300 1400))
-   rect(l11 (-750 -1450) (1200 800))
-   rect(l11 (-550 -400) (0 0))
-   rect(l11 (550 -400) (600 800))
-   rect(l10 (-24850 -800) (500 1500))
-   rect(l10 (22900 -1500) (500 1500))
-  )
-
-  # Outgoing pins and their connections to nets
-  pin(11 name(FB))
-  pin(12 name(VDD))
-  pin(13 name(OUT))
-  pin(14 name(ENABLE))
-  pin(15 name(VSS))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 location(1800 0)
-   pin(0 12)
-   pin(1 1)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 14)
-   pin(6 15)
-  )
-  circuit(2 INVX1 location(4200 0)
-   pin(0 12)
-   pin(1 2)
-   pin(2 15)
-   pin(3 12)
-   pin(4 1)
-   pin(5 15)
-  )
-  circuit(3 INVX1 location(6000 0)
-   pin(0 12)
-   pin(1 3)
-   pin(2 15)
-   pin(3 12)
-   pin(4 2)
-   pin(5 15)
-  )
-  circuit(4 INVX1 location(7800 0)
-   pin(0 12)
-   pin(1 4)
-   pin(2 15)
-   pin(3 12)
-   pin(4 3)
-   pin(5 15)
-  )
-  circuit(5 INVX1 location(9600 0)
-   pin(0 12)
-   pin(1 5)
-   pin(2 15)
-   pin(3 12)
-   pin(4 4)
-   pin(5 15)
-  )
-  circuit(6 INVX1 location(11400 0)
-   pin(0 12)
-   pin(1 6)
-   pin(2 15)
-   pin(3 12)
-   pin(4 5)
-   pin(5 15)
-  )
-  circuit(7 INVX1 location(13200 0)
-   pin(0 12)
-   pin(1 7)
-   pin(2 15)
-   pin(3 12)
-   pin(4 6)
-   pin(5 15)
-  )
-  circuit(8 INVX1 location(15000 0)
-   pin(0 12)
-   pin(1 8)
-   pin(2 15)
-   pin(3 12)
-   pin(4 7)
-   pin(5 15)
-  )
-  circuit(9 INVX1 location(16800 0)
-   pin(0 12)
-   pin(1 9)
-   pin(2 15)
-   pin(3 12)
-   pin(4 8)
-   pin(5 15)
-  )
-  circuit(10 INVX1 location(18600 0)
-   pin(0 12)
-   pin(1 10)
-   pin(2 15)
-   pin(3 12)
-   pin(4 9)
-   pin(5 15)
-  )
-  circuit(11 INVX1 location(20400 0)
-   pin(0 12)
-   pin(1 11)
-   pin(2 15)
-   pin(3 12)
-   pin(4 10)
-   pin(5 15)
-  )
-  circuit(12 INVX1 location(22200 0)
-   pin(0 12)
-   pin(1 13)
-   pin(2 15)
-   pin(3 12)
-   pin(4 11)
-   pin(5 15)
-  )
-
- )
-)
-
-# Reference netlist
-reference(
-
- # Device class section
- class(PMOS MOS4)
- class(NMOS MOS4)
-
- # Circuit section
- # Circuits are the hierarchical building blocks of the netlist.
- circuit(ND2X1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(B))
-  net(6 name(A))
-  net(7 name(BULK))
-  net(8 name('1'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(B))
-  pin(6 name(A))
-  pin(7 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.251)
-   param(W 1.6)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 1)
-   terminal(G 6)
-   terminal(D 2)
-   terminal(B 4)
-  )
-  device(2 PMOS
-   name($2)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(3 NMOS
-   name($3)
-   param(L 0.26)
-   param(W 1)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 8)
-   terminal(G 6)
-   terminal(D 3)
-   terminal(B 7)
-  )
-  device(4 NMOS
-   name($4)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 8)
-   terminal(B 7)
-  )
-
- )
- circuit(INVX1
-
-  # Nets
-  net(1 name(VDD))
-  net(2 name(OUT))
-  net(3 name(VSS))
-  net(4 name(NWELL))
-  net(5 name(IN))
-  net(6 name(BULK))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VDD))
-  pin(2 name(OUT))
-  pin(3 name(VSS))
-  pin(4 name(NWELL))
-  pin(5 name(IN))
-  pin(6 name(BULK))
-
-  # Devices and their connections
-  device(1 PMOS
-   name($1)
-   param(L 0.25)
-   param(W 1.5)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 1)
-   terminal(B 4)
-  )
-  device(2 NMOS
-   name($2)
-   param(L 0.25)
-   param(W 0.95)
-   param(AS 0)
-   param(AD 0)
-   param(PS 0)
-   param(PD 0)
-   terminal(S 2)
-   terminal(G 5)
-   terminal(D 3)
-   terminal(B 6)
-  )
-
- )
- circuit(RINGO
-
-  # Nets
-  net(1 name(VSS))
-  net(2 name(VDD))
-  net(3 name(FB))
-  net(4 name(ENABLE))
-  net(5 name(OUT))
-  net(6 name('1'))
-  net(7 name('2'))
-  net(8 name('3'))
-  net(9 name('4'))
-  net(10 name('5'))
-  net(11 name('6'))
-  net(12 name('7'))
-  net(13 name('8'))
-  net(14 name('9'))
-  net(15 name('10'))
-
-  # Outgoing pins and their connections to nets
-  pin(1 name(VSS))
-  pin(2 name(VDD))
-  pin(3 name(FB))
-  pin(4 name(ENABLE))
-  pin(5 name(OUT))
-
-  # Subcircuits and their connections
-  circuit(1 ND2X1 name($1)
-   pin(0 2)
-   pin(1 6)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 4)
-   pin(6 1)
-  )
-  circuit(2 INVX1 name($2)
-   pin(0 2)
-   pin(1 7)
-   pin(2 1)
-   pin(3 2)
-   pin(4 6)
-   pin(5 1)
-  )
-  circuit(3 INVX1 name($3)
-   pin(0 2)
-   pin(1 8)
-   pin(2 1)
-   pin(3 2)
-   pin(4 7)
-   pin(5 1)
-  )
-  circuit(4 INVX1 name($4)
-   pin(0 2)
-   pin(1 9)
-   pin(2 1)
-   pin(3 2)
-   pin(4 8)
-   pin(5 1)
-  )
-  circuit(5 INVX1 name($5)
-   pin(0 2)
-   pin(1 10)
-   pin(2 1)
-   pin(3 2)
-   pin(4 9)
-   pin(5 1)
-  )
-  circuit(6 INVX1 name($6)
-   pin(0 2)
-   pin(1 11)
-   pin(2 1)
-   pin(3 2)
-   pin(4 10)
-   pin(5 1)
-  )
-  circuit(7 INVX1 name($7)
-   pin(0 2)
-   pin(1 12)
-   pin(2 1)
-   pin(3 2)
-   pin(4 11)
-   pin(5 1)
-  )
-  circuit(8 INVX1 name($8)
-   pin(0 2)
-   pin(1 13)
-   pin(2 1)
-   pin(3 2)
-   pin(4 12)
-   pin(5 1)
-  )
-  circuit(9 INVX1 name($9)
-   pin(0 2)
-   pin(1 14)
-   pin(2 1)
-   pin(3 2)
-   pin(4 13)
-   pin(5 1)
-  )
-  circuit(10 INVX1 name($10)
-   pin(0 2)
-   pin(1 15)
-   pin(2 1)
-   pin(3 2)
-   pin(4 14)
-   pin(5 1)
-  )
-  circuit(11 INVX1 name($11)
-   pin(0 2)
-   pin(1 3)
-   pin(2 1)
-   pin(3 2)
-   pin(4 15)
-   pin(5 1)
-  )
-  circuit(12 INVX1 name($12)
-   pin(0 2)
-   pin(1 5)
-   pin(2 1)
-   pin(3 2)
-   pin(4 3)
-   pin(5 1)
-  )
-
- )
-)
-
-# Cross reference
-xref(
- circuit(INVX1 INVX1 match
-  xref(
-   net(4 4 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(6 6 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(5 5 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(2 2 match)
-   device(1 1 match)
-  )
- )
- circuit(ND2X1 ND2X1 match
-  xref(
-   net(8 8 match)
-   net(4 4 match)
-   net(6 6 match)
-   net(5 5 match)
-   net(2 2 match)
-   net(7 7 match)
-   net(1 1 match)
-   net(3 3 match)
-   pin(3 3 match)
-   pin(5 5 match)
-   pin(4 4 match)
-   pin(1 1 match)
-   pin(6 6 match)
-   pin(0 0 match)
-   pin(2 2 match)
-   device(3 3 match)
-   device(4 4 match)
-   device(1 1 match)
-   device(2 2 match)
-  )
- )
- circuit(RINGO RINGO match
-  xref(
-   net(1 6 match)
-   net(10 15 match)
-   net(2 7 match)
-   net(3 8 match)
-   net(4 9 match)
-   net(5 10 match)
-   net(6 11 match)
-   net(7 12 match)
-   net(8 13 match)
-   net(9 14 match)
-   net(14 4 match)
-   net(11 3 match)
-   net(13 5 match)
-   net(12 2 match)
-   net(15 1 match)
-   pin(3 3 match)
-   pin(0 2 match)
-   pin(2 4 match)
-   pin(1 1 match)
-   pin(4 0 match)
-   circuit(2 2 match)
-   circuit(3 3 match)
-   circuit(4 4 match)
-   circuit(5 5 match)
-   circuit(6 6 match)
-   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/soft_connect1.l2n b/testdata/lvs/soft_connect1.l2n
index 364e0248a..fb1166fb5 100644
--- a/testdata/lvs/soft_connect1.l2n
+++ b/testdata/lvs/soft_connect1.l2n
@@ -39,10 +39,10 @@ G(l9 SUBSTRATE)
 GS(l9 SUBSTRATE)
 H(W B('Net with incomplete wiring (soft-connected partial nets)') C(TOP) X('soft-connection-check'))
 H(B('\tPartial net #1: TOP - VDD') C(TOP) Q('(0.6,3.95;0.6,4.85;4.5,4.85;4.5,3.95)'))
-H(B('\tPartial net #2: TOP - $I4') C(TOP) Q('(5.1,3.95;5.1,4.85;9,4.85;9,3.95)'))
+H(B('\tPartial net #2: TOP - $I5') C(TOP) Q('(5.1,3.95;5.1,4.85;9,4.85;9,3.95)'))
 H(W B('Net with incomplete wiring (soft-connected partial nets)') C(TOP) X('soft-connection-check'))
 H(B('\tPartial net #1: TOP - VSS') C(TOP) Q('(0.6,1.15;0.6,2.05;4.5,2.05;4.5,1.15)'))
-H(B('\tPartial net #2: TOP - $I1') C(TOP) Q('(5.1,1.15;5.1,2.05;9,2.05;9,1.15)'))
+H(B('\tPartial net #2: TOP - $I2') C(TOP) Q('(5.1,1.15;5.1,2.05;9,2.05;9,1.15)'))
 K(PMOS MOS4)
 K(NMOS MOS4)
 D(D$PMOS PMOS
diff --git a/testdata/lvs/soft_connect1a.l2n b/testdata/lvs/soft_connect1a.l2n
index 9e486321c..826e82f61 100644
--- a/testdata/lvs/soft_connect1a.l2n
+++ b/testdata/lvs/soft_connect1a.l2n
@@ -40,10 +40,10 @@ G(l9 SUBSTRATE)
 GS(l9 SUBSTRATE)
 H(W B('Net with incomplete wiring (soft-connected partial nets)') C(TOP) X('soft-connection-check'))
 H(B('\tPartial net #1: TOP - VDD') C(TOP) Q('(0.6,3.95;0.6,4.85;4.5,4.85;4.5,3.95)'))
-H(B('\tPartial net #2: TOP - $I4') C(TOP) Q('(5.1,3.95;5.1,4.85;9,4.85;9,3.95)'))
+H(B('\tPartial net #2: TOP - $I5') C(TOP) Q('(5.1,3.95;5.1,4.85;9,4.85;9,3.95)'))
 H(W B('Net with incomplete wiring (soft-connected partial nets)') C(TOP) X('soft-connection-check'))
 H(B('\tPartial net #1: TOP - VSS') C(TOP) Q('(0.6,1.15;0.6,2.05;4.5,2.05;4.5,1.15)'))
-H(B('\tPartial net #2: TOP - $I1') C(TOP) Q('(5.1,1.15;5.1,2.05;9,2.05;9,1.15)'))
+H(B('\tPartial net #2: TOP - $I2') C(TOP) Q('(5.1,1.15;5.1,2.05;9,2.05;9,1.15)'))
 K(PMOS MOS4)
 K(NMOS MOS4)
 D(D$PMOS PMOS
diff --git a/testdata/lvs/soft_connect3.l2n b/testdata/lvs/soft_connect3.l2n
index fa0b6f009..bd70fef39 100644
--- a/testdata/lvs/soft_connect3.l2n
+++ b/testdata/lvs/soft_connect3.l2n
@@ -39,10 +39,10 @@ G(l9 SUBSTRATE)
 GS(l9 SUBSTRATE)
 H(W B('Net with incomplete wiring (soft-connected partial nets)') C(TOP) X('soft-connection-check'))
 H(B('\tPartial net #1: TOP - VDD') C(TOP) Q('(0.6,3.95;0.6,4.85;4.5,4.85;4.5,3.95)'))
-H(B('\tPartial net #2: TOP - $I4') C(TOP) Q('(5.1,3.95;5.1,4.85;9,4.85;9,3.95)'))
+H(B('\tPartial net #2: TOP - $I5') C(TOP) Q('(5.1,3.95;5.1,4.85;9,4.85;9,3.95)'))
 H(W B('Net with incomplete wiring (soft-connected partial nets)') C(TOP) X('soft-connection-check'))
 H(B('\tPartial net #1: TOP - VSS') C(TOP) Q('(0.6,1.15;0.6,2.05;4.5,2.05;4.5,1.15)'))
-H(B('\tPartial net #2: TOP - $I1') C(TOP) Q('(5.1,1.15;5.1,2.05;9,2.05;9,1.15)'))
+H(B('\tPartial net #2: TOP - $I2') C(TOP) Q('(5.1,1.15;5.1,2.05;9,2.05;9,1.15)'))
 K(PMOS MOS4)
 K(NMOS MOS4)
 D(D$PMOS PMOS