diff --git a/testdata/drc/drcSuiteTests_au3.oas b/testdata/drc/drcSuiteTests_au3.oas
index 8717c39e9..50f9a2516 100644
Binary files a/testdata/drc/drcSuiteTests_au3.oas and b/testdata/drc/drcSuiteTests_au3.oas differ
diff --git a/testdata/drc/drcSuiteTests_au4.oas b/testdata/drc/drcSuiteTests_au4.oas
index 6a45d5648..5f3a3ad0f 100644
Binary files a/testdata/drc/drcSuiteTests_au4.oas and b/testdata/drc/drcSuiteTests_au4.oas differ
diff --git a/testdata/lvs/inv.lvsdb b/testdata/lvs/inv.lvsdb
index a20e8a4e8..246a05b96 100644
--- a/testdata/lvs/inv.lvsdb
+++ b/testdata/lvs/inv.lvsdb
@@ -88,7 +88,7 @@ layout(
    rect(l4 (-800 -3100) (550 400))
    rect(l8 (-450 -300) (200 200))
    rect(l9 (-300 -300) (400 400))
-   
+   text(l10 IN (-200 -200))
   )
   net(2 name(VSS)
    rect(l8 (550 300) (200 200))
@@ -97,8 +97,8 @@ layout(
    rect(l11 (-250 -950) (200 200))
    rect(l11 (-200 300) (200 200))
    rect(l12 (-750 -850) (2000 1000))
-   
-   rect(l6 (-1550 -800) (450 900))
+   text(l13 VSS (-100 -850))
+   rect(l6 (-1450 50) (450 900))
   )
   net(3 name(VDD)
    rect(l8 (550 4350) (200 200))
@@ -108,8 +108,8 @@ layout(
    rect(l11 (-250 -800) (200 200))
    rect(l11 (-200 300) (200 200))
    rect(l12 (-750 -850) (2000 1000))
-   
-   rect(l2 (-1550 -1700) (450 1500))
+   text(l13 VDD (-150 -850))
+   rect(l2 (-1400 -850) (450 1500))
   )
   net(4 name(OUT)
    rect(l8 (1300 4350) (200 200))
@@ -121,8 +121,8 @@ layout(
    rect(l9 (-300 -4600) (300 3200))
    rect(l9 (-300 -2900) (450 400))
    rect(l9 (-450 -1550) (300 850))
-   
-   rect(l2 (-400 3150) (450 1500))
+   text(l10 OUT (-50 500))
+   rect(l2 (-350 2650) (450 1500))
    rect(l6 (-450 -5500) (450 900))
   )
   net(5 name(NWELL)
diff --git a/testdata/lvs/inv2.lvsdb b/testdata/lvs/inv2.lvsdb
index c321762cf..3e799862b 100644
--- a/testdata/lvs/inv2.lvsdb
+++ b/testdata/lvs/inv2.lvsdb
@@ -69,7 +69,7 @@ J(
    R(l4 (-800 -3100) (550 400))
    R(l8 (-450 -300) (200 200))
    R(l11 (-300 -300) (400 400))
-   
+   J(l12 IN (-200 -200))
   )
   N(2 I(VDD)
    R(l3 (0 2950) (3000 3200))
@@ -85,8 +85,8 @@ J(
    R(l13 (1400 -700) (200 200))
    R(l13 (-200 300) (200 200))
    R(l14 (-2350 -850) (3000 1000))
-   
-   R(l2 (-2550 -1700) (450 1500))
+   J(l15 VDD (-150 -850))
+   R(l2 (-2400 -850) (450 1500))
    R(l9 (1050 -1200) (600 1200))
   )
   N(3 I(OUT)
@@ -99,8 +99,8 @@ J(
    R(l11 (-300 -4600) (300 3200))
    R(l11 (-300 -2900) (450 400))
    R(l11 (-450 -1550) (300 850))
-   
-   R(l2 (-400 3150) (450 1500))
+   J(l12 OUT (-50 500))
+   R(l2 (-350 2650) (450 1500))
    R(l6 (-450 -5500) (450 900))
   )
   N(4 I(VSS)
@@ -115,8 +115,8 @@ J(
    R(l13 (1400 -700) (200 200))
    R(l13 (-200 300) (200 200))
    R(l14 (-2350 -850) (3000 1000))
-   
-   R(l6 (-2550 -800) (450 900))
+   J(l15 VSS (-150 -850))
+   R(l6 (-2400 50) (450 900))
    R(l10 (1050 -900) (600 1200))
   )
   D(1 D$PMOS
diff --git a/testdata/lvs/nand2_split_gate.lvsdb.1 b/testdata/lvs/nand2_split_gate.lvsdb.1
index 6dbde1217..e0d758a88 100644
--- a/testdata/lvs/nand2_split_gate.lvsdb.1
+++ b/testdata/lvs/nand2_split_gate.lvsdb.1
@@ -121,7 +121,7 @@ layout(
    rect(l4 (-250 300) (250 1050))
    rect(l8 (-700 400) (200 200))
    rect(l11 (-300 -300) (400 400))
-   
+   text(l12 B (-200 -200))
   )
   net(2 name(A)
    rect(l4 (1900 3400) (550 400))
@@ -131,7 +131,7 @@ layout(
    rect(l4 (-250 300) (250 1050))
    rect(l8 (250 1050) (200 200))
    rect(l11 (-300 -300) (400 400))
-   
+   text(l12 A (-200 -200))
   )
   net(3
    rect(l8 (1300 300) (200 200))
@@ -167,8 +167,8 @@ layout(
    rect(l11 (-1200 -300) (1050 300))
    rect(l11 (-1050 1150) (300 1400))
    rect(l11 (-300 -2700) (300 1950))
-   
-   rect(l2 (-400 -700) (500 1500))
+   text(l12 OUT (700 -2000))
+   rect(l2 (-1100 1300) (500 1500))
    rect(l6 (250 -5500) (450 900))
    rect(l6 (-450 450) (450 900))
   )
@@ -192,8 +192,8 @@ layout(
    rect(l13 (700 -700) (200 200))
    rect(l13 (-200 300) (200 200))
    rect(l14 (-3150 -850) (3750 1000))
-   
-   rect(l2 (-3300 -1700) (450 1500))
+   text(l15 VDD (-100 -850))
+   rect(l2 (-3200 -850) (450 1500))
    rect(l2 (1000 -1500) (450 1500))
    rect(l9 (400 -1200) (600 1200))
   )
@@ -212,8 +212,8 @@ layout(
    rect(l13 (2200 -700) (200 200))
    rect(l13 (-200 300) (200 200))
    rect(l14 (-3150 -850) (3750 1000))
-   
-   rect(l6 (-3300 550) (450 900))
+   text(l15 VSS (-100 -850))
+   rect(l6 (-3200 1400) (450 900))
    rect(l6 (-450 -2250) (450 900))
    rect(l10 (1850 -900) (600 1200))
   )
diff --git a/testdata/lvs/nand2_split_gate.lvsdb.2 b/testdata/lvs/nand2_split_gate.lvsdb.2
index 382f1cc89..4742977a2 100644
--- a/testdata/lvs/nand2_split_gate.lvsdb.2
+++ b/testdata/lvs/nand2_split_gate.lvsdb.2
@@ -121,7 +121,7 @@ layout(
    rect(l4 (-250 300) (250 1050))
    rect(l8 (-700 400) (200 200))
    rect(l11 (-300 -300) (400 400))
-   
+   text(l12 B (-200 -200))
   )
   net(2 name(A)
    rect(l4 (1900 3400) (550 400))
@@ -131,7 +131,7 @@ layout(
    rect(l4 (-250 300) (250 1050))
    rect(l8 (250 1050) (200 200))
    rect(l11 (-300 -300) (400 400))
-   
+   text(l12 A (-200 -200))
   )
   net(3
    rect(l8 (1300 300) (200 200))
@@ -167,8 +167,8 @@ layout(
    rect(l11 (-1200 -300) (1050 300))
    rect(l11 (-1050 1150) (300 1400))
    rect(l11 (-300 -2700) (300 1950))
-   
-   rect(l2 (-400 -700) (500 1500))
+   text(l12 OUT (700 -2000))
+   rect(l2 (-1100 1300) (500 1500))
    rect(l6 (250 -5500) (450 900))
    rect(l6 (-450 450) (450 900))
   )
@@ -192,8 +192,8 @@ layout(
    rect(l13 (700 -700) (200 200))
    rect(l13 (-200 300) (200 200))
    rect(l14 (-3150 -850) (3750 1000))
-   
-   rect(l2 (-3300 -1700) (450 1500))
+   text(l15 VDD (-100 -850))
+   rect(l2 (-3200 -850) (450 1500))
    rect(l2 (1000 -1500) (450 1500))
    rect(l9 (400 -1200) (600 1200))
   )
@@ -212,8 +212,8 @@ layout(
    rect(l13 (2200 -700) (200 200))
    rect(l13 (-200 300) (200 200))
    rect(l14 (-3150 -850) (3750 1000))
-   
-   rect(l6 (-3300 550) (450 900))
+   text(l15 VSS (-100 -850))
+   rect(l6 (-3200 1400) (450 900))
    rect(l6 (-450 -2250) (450 900))
    rect(l10 (1850 -900) (600 1200))
   )