diff --git a/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc b/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc
index 1b7bb5b4c..cf1b10997 100644
--- a/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc
+++ b/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc
@@ -317,7 +317,7 @@ TEST(2_ReaderWithGlobalNets)
     std::string au = tl::testsrc ();
     au = tl::combine_path (au, "testdata");
     au = tl::combine_path (au, "algo");
-    au = tl::combine_path (au, "l2n_reader_au_2.gds");
+    au = tl::combine_path (au, "l2n_reader_au_2r.gds");
 
     db::compare_layouts (_this, ly2, au);
   }
@@ -374,7 +374,7 @@ TEST(3_ReaderAbsoluteCoordinates)
     std::string au = tl::testsrc ();
     au = tl::combine_path (au, "testdata");
     au = tl::combine_path (au, "algo");
-    au = tl::combine_path (au, "l2n_reader_au_2.gds");
+    au = tl::combine_path (au, "l2n_reader_au_2r.gds");
 
     db::compare_layouts (_this, ly2, au);
   }
diff --git a/testdata/algo/l2n_reader_au_1.gds b/testdata/algo/l2n_reader_au_1.gds
index 95598a9d6..2b85b42ac 100644
Binary files a/testdata/algo/l2n_reader_au_1.gds and b/testdata/algo/l2n_reader_au_1.gds differ
diff --git a/testdata/algo/l2n_reader_au_2.gds b/testdata/algo/l2n_reader_au_2.gds
index 100f1aee7..ffae4bd90 100644
Binary files a/testdata/algo/l2n_reader_au_2.gds and b/testdata/algo/l2n_reader_au_2.gds differ
diff --git a/testdata/algo/l2n_reader_au_2r.gds b/testdata/algo/l2n_reader_au_2r.gds
new file mode 100644
index 000000000..70dbdd3de
Binary files /dev/null and b/testdata/algo/l2n_reader_au_2r.gds differ
diff --git a/testdata/algo/l2n_writer_au_2.txt b/testdata/algo/l2n_writer_au_2.txt
index c232887a5..2c615dffc 100644
--- a/testdata/algo/l2n_writer_au_2.txt
+++ b/testdata/algo/l2n_writer_au_2.txt
@@ -264,12 +264,6 @@ circuit(INV2PAIR
   rect(diff_cont (-220 180) (220 220))
  )
  net(3
-  rect(diff_cont (790 3290) (220 220))
-  rect(diff_cont (-220 180) (220 220))
-  rect(diff_cont (-220 -3420) (220 220))
-  rect(diff_cont (-220 180) (220 220))
- )
- net(4
   rect(diff_cont (4230 3290) (220 220))
   rect(diff_cont (-220 180) (220 220))
   rect(diff_cont (-220 -220) (220 220))
@@ -283,7 +277,7 @@ circuit(INV2PAIR
   rect(metal1 (-3000 -760) (360 760))
   rect(metal1 (-360 -760) (360 760))
  )
- net(5
+ net(4
   rect(diff_cont (4230 490) (220 220))
   rect(diff_cont (-220 180) (220 220))
   rect(diff_cont (-220 -220) (220 220))
@@ -297,47 +291,46 @@ circuit(INV2PAIR
   rect(metal1 (-3000 -760) (360 760))
   rect(metal1 (-360 -760) (360 760))
  )
- net(6
+ net(5
   rect(diff_cont (2390 3690) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
   rect(diff_cont (-220 -620) (220 220))
  )
- net(7)
- net(8
+ net(6)
+ net(7
   rect(diff_cont (5030 3690) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
   rect(diff_cont (-220 -620) (220 220))
  )
- net(9)
+ net(8)
 
  # Outgoing pins and their connections to nets
  pin(1 name(BULK))
  pin(2)
+ pin(3)
  pin(4)
- pin(5)
+ pin(6)
  pin(7)
  pin(8)
- pin(9)
 
  # Subcircuits and their connections
  circuit(1 INV2 location(1700 800)
-  pin(0 9)
-  pin(1 7)
-  pin(2 3)
-  pin(3 6)
-  pin(4 5)
-  pin(5 4)
+  pin(0 8)
+  pin(1 6)
+  pin(3 5)
+  pin(4 4)
+  pin(5 3)
   pin(6 1)
  )
  circuit(2 INV2 location(4340 800)
-  pin(0 9)
-  pin(1 6)
+  pin(0 8)
+  pin(1 5)
   pin(2 2)
-  pin(3 8)
-  pin(4 5)
-  pin(5 4)
+  pin(3 7)
+  pin(4 4)
+  pin(5 3)
   pin(6 1)
  )
 
@@ -515,48 +508,24 @@ circuit(RINGO
   rect(metal2_lbl (-21301 -381) (2 2))
  )
  net(5
-  rect(diff_cont (17570 2490) (220 220))
-  rect(diff_cont (-220 180) (220 220))
-  rect(diff_cont (-220 -3420) (220 220))
-  rect(diff_cont (-220 180) (220 220))
- )
- net(6
-  rect(diff_cont (12290 2490) (220 220))
-  rect(diff_cont (-220 180) (220 220))
-  rect(diff_cont (-220 -3420) (220 220))
-  rect(diff_cont (-220 180) (220 220))
- )
- net(7
-  rect(diff_cont (7010 2490) (220 220))
-  rect(diff_cont (-220 180) (220 220))
-  rect(diff_cont (-220 -3420) (220 220))
-  rect(diff_cont (-220 180) (220 220))
- )
- net(8
-  rect(diff_cont (1730 2490) (220 220))
-  rect(diff_cont (-220 180) (220 220))
-  rect(diff_cont (-220 -3420) (220 220))
-  rect(diff_cont (-220 180) (220 220))
- )
- net(9
   rect(diff_cont (3330 2890) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
   rect(diff_cont (-220 -620) (220 220))
  )
- net(10
+ net(6
   rect(diff_cont (19170 2890) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
   rect(diff_cont (-220 -620) (220 220))
  )
- net(11
+ net(7
   rect(diff_cont (13890 2890) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
   rect(diff_cont (-220 -620) (220 220))
  )
- net(12
+ net(8
   rect(diff_cont (8610 2890) (220 220))
   rect(diff_cont (-220 -620) (220 220))
   rect(diff_cont (-220 -2620) (220 220))
@@ -575,44 +544,40 @@ circuit(RINGO
   pin(1 1)
   pin(2 3)
   pin(3 4)
-  pin(4 10)
+  pin(4 6)
   pin(5 2)
   pin(6 3)
  )
  circuit(2 INV2PAIR location(-1700 -800)
   pin(0 4)
-  pin(1 8)
   pin(2 3)
   pin(3 4)
   pin(4 1)
-  pin(5 9)
+  pin(5 5)
   pin(6 3)
  )
  circuit(3 INV2PAIR location(3580 -800)
   pin(0 4)
-  pin(1 7)
   pin(2 3)
   pin(3 4)
-  pin(4 9)
-  pin(5 12)
+  pin(4 5)
+  pin(5 8)
   pin(6 3)
  )
  circuit(4 INV2PAIR location(8860 -800)
   pin(0 4)
-  pin(1 6)
   pin(2 3)
   pin(3 4)
-  pin(4 12)
-  pin(5 11)
+  pin(4 8)
+  pin(5 7)
   pin(6 3)
  )
  circuit(5 INV2PAIR location(14140 -800)
   pin(0 4)
-  pin(1 5)
   pin(2 3)
   pin(3 4)
-  pin(4 11)
-  pin(5 10)
+  pin(4 7)
+  pin(5 6)
   pin(6 3)
  )