diff --git a/testdata/lvs/test_22a.cir b/testdata/lvs/test_22a.cir.1
similarity index 100%
rename from testdata/lvs/test_22a.cir
rename to testdata/lvs/test_22a.cir.1
diff --git a/testdata/lvs/test_22a.cir.2 b/testdata/lvs/test_22a.cir.2
new file mode 100644
index 000000000..7526343c0
--- /dev/null
+++ b/testdata/lvs/test_22a.cir.2
@@ -0,0 +1,161 @@
+* Extracted by KLayout
+
+* cell SP6TArray_2X4
+.SUBCKT SP6TArray_2X4
+* net 1 vdd
+* net 2 bl[0]
+* net 3 bl_n[0]
+* net 4 bl[1]
+* net 5 bl_n[1]
+* net 6 bl[2]
+* net 7 bl_n[2]
+* net 8 bl[3]
+* net 9 bl_n[3]
+* net 26 wl[0]
+* net 31 wl[1]
+* net 52 vss
+* device instance $1 r0 *1 0.215,1.935 sky130_fd_pr__nfet_01v8__model
+M$1 52 10 12 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.18165P PS=1.37U PD=1.285U
+* device instance $2 r0 *1 0.605,2.56 sky130_fd_pr__nfet_01v8__model
+M$2 12 26 2 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $3 r0 *1 0.605,2.99 sky130_fd_pr__nfet_01v8__model
+M$3 2 31 32 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $4 r0 *1 0.215,3.615 sky130_fd_pr__nfet_01v8__model
+M$4 32 34 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.1113P PS=1.285U PD=1.37U
+* device instance $5 r0 *1 1.965,1.935 sky130_fd_pr__nfet_01v8__model
+M$5 10 12 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $6 r0 *1 2.395,1.935 sky130_fd_pr__nfet_01v8__model
+M$6 52 15 16 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $7 r0 *1 1.575,2.56 sky130_fd_pr__nfet_01v8__model
+M$7 10 26 3 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $8 r0 *1 2.785,2.56 sky130_fd_pr__nfet_01v8__model
+M$8 16 26 4 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $9 r0 *1 1.575,2.99 sky130_fd_pr__nfet_01v8__model
+M$9 3 31 34 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $10 r0 *1 2.785,2.99 sky130_fd_pr__nfet_01v8__model
+M$10 4 31 35 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $11 r0 *1 1.965,3.615 sky130_fd_pr__nfet_01v8__model
+M$11 34 32 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $12 r0 *1 2.395,3.615 sky130_fd_pr__nfet_01v8__model
+M$12 35 49 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $13 r0 *1 4.145,1.935 sky130_fd_pr__nfet_01v8__model
+M$13 15 16 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $14 r0 *1 4.575,1.935 sky130_fd_pr__nfet_01v8__model
+M$14 52 18 20 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $15 r0 *1 3.755,2.56 sky130_fd_pr__nfet_01v8__model
+M$15 15 26 5 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $16 r0 *1 4.965,2.56 sky130_fd_pr__nfet_01v8__model
+M$16 20 26 6 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $17 r0 *1 3.755,2.99 sky130_fd_pr__nfet_01v8__model
+M$17 5 31 49 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $18 r0 *1 4.965,2.99 sky130_fd_pr__nfet_01v8__model
+M$18 6 31 37 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $19 r0 *1 4.145,3.615 sky130_fd_pr__nfet_01v8__model
+M$19 49 35 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $20 r0 *1 4.575,3.615 sky130_fd_pr__nfet_01v8__model
+M$20 37 39 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $21 r0 *1 6.325,1.935 sky130_fd_pr__nfet_01v8__model
+M$21 18 20 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $22 r0 *1 6.755,1.935 sky130_fd_pr__nfet_01v8__model
+M$22 52 22 24 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $23 r0 *1 5.935,2.56 sky130_fd_pr__nfet_01v8__model
+M$23 18 26 7 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $24 r0 *1 7.145,2.56 sky130_fd_pr__nfet_01v8__model
+M$24 24 26 8 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $25 r0 *1 5.935,2.99 sky130_fd_pr__nfet_01v8__model
+M$25 7 31 39 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $26 r0 *1 7.145,2.99 sky130_fd_pr__nfet_01v8__model
+M$26 8 31 40 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $27 r0 *1 6.325,3.615 sky130_fd_pr__nfet_01v8__model
+M$27 39 37 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $28 r0 *1 6.755,3.615 sky130_fd_pr__nfet_01v8__model
+M$28 40 42 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $29 r0 *1 8.505,1.935 sky130_fd_pr__nfet_01v8__model
+M$29 22 24 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.1113P PS=1.285U PD=1.37U
+* device instance $30 r0 *1 8.115,2.56 sky130_fd_pr__nfet_01v8__model
+M$30 22 26 9 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $31 r0 *1 8.115,2.99 sky130_fd_pr__nfet_01v8__model
+M$31 9 31 42 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $32 r0 *1 8.505,3.615 sky130_fd_pr__nfet_01v8__model
+M$32 42 40 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.1113P PS=1.285U PD=1.37U
+* device instance $33 r0 *1 0.215,0.605 sky130_fd_pr__pfet_01v8__model
+M$33 1 10 12 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.1869P PS=1.37U PD=1.73U
+* device instance $34 r0 *1 1.965,0.605 sky130_fd_pr__pfet_01v8__model
+M$34 10 12 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $35 r0 *1 2.395,0.605 sky130_fd_pr__pfet_01v8__model
+M$35 1 15 16 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $36 r0 *1 4.145,0.605 sky130_fd_pr__pfet_01v8__model
+M$36 15 16 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $37 r0 *1 4.575,0.605 sky130_fd_pr__pfet_01v8__model
+M$37 1 18 20 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $38 r0 *1 6.325,0.605 sky130_fd_pr__pfet_01v8__model
+M$38 18 20 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $39 r0 *1 6.755,0.605 sky130_fd_pr__pfet_01v8__model
+M$39 1 22 24 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $40 r0 *1 8.505,0.605 sky130_fd_pr__pfet_01v8__model
+M$40 22 24 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.1113P PS=1.73U PD=1.37U
+* device instance $41 r0 *1 0.215,4.945 sky130_fd_pr__pfet_01v8__model
+M$41 1 34 32 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.1869P PS=1.37U PD=1.73U
+* device instance $42 r0 *1 1.965,4.945 sky130_fd_pr__pfet_01v8__model
+M$42 34 32 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $43 r0 *1 2.395,4.945 sky130_fd_pr__pfet_01v8__model
+M$43 1 49 35 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $44 r0 *1 4.145,4.945 sky130_fd_pr__pfet_01v8__model
+M$44 49 35 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $45 r0 *1 4.575,4.945 sky130_fd_pr__pfet_01v8__model
+M$45 1 39 37 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $46 r0 *1 6.325,4.945 sky130_fd_pr__pfet_01v8__model
+M$46 39 37 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $47 r0 *1 6.755,4.945 sky130_fd_pr__pfet_01v8__model
+M$47 1 42 40 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $48 r0 *1 8.505,4.945 sky130_fd_pr__pfet_01v8__model
+M$48 42 40 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.1113P PS=1.73U PD=1.37U
+.ENDS SP6TArray_2X4
diff --git a/testdata/lvs/test_22b.cir b/testdata/lvs/test_22b.cir.1
similarity index 100%
rename from testdata/lvs/test_22b.cir
rename to testdata/lvs/test_22b.cir.1
diff --git a/testdata/lvs/test_22b.cir.2 b/testdata/lvs/test_22b.cir.2
new file mode 100644
index 000000000..7526343c0
--- /dev/null
+++ b/testdata/lvs/test_22b.cir.2
@@ -0,0 +1,161 @@
+* Extracted by KLayout
+
+* cell SP6TArray_2X4
+.SUBCKT SP6TArray_2X4
+* net 1 vdd
+* net 2 bl[0]
+* net 3 bl_n[0]
+* net 4 bl[1]
+* net 5 bl_n[1]
+* net 6 bl[2]
+* net 7 bl_n[2]
+* net 8 bl[3]
+* net 9 bl_n[3]
+* net 26 wl[0]
+* net 31 wl[1]
+* net 52 vss
+* device instance $1 r0 *1 0.215,1.935 sky130_fd_pr__nfet_01v8__model
+M$1 52 10 12 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.18165P PS=1.37U PD=1.285U
+* device instance $2 r0 *1 0.605,2.56 sky130_fd_pr__nfet_01v8__model
+M$2 12 26 2 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $3 r0 *1 0.605,2.99 sky130_fd_pr__nfet_01v8__model
+M$3 2 31 32 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $4 r0 *1 0.215,3.615 sky130_fd_pr__nfet_01v8__model
+M$4 32 34 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.1113P PS=1.285U PD=1.37U
+* device instance $5 r0 *1 1.965,1.935 sky130_fd_pr__nfet_01v8__model
+M$5 10 12 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $6 r0 *1 2.395,1.935 sky130_fd_pr__nfet_01v8__model
+M$6 52 15 16 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $7 r0 *1 1.575,2.56 sky130_fd_pr__nfet_01v8__model
+M$7 10 26 3 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $8 r0 *1 2.785,2.56 sky130_fd_pr__nfet_01v8__model
+M$8 16 26 4 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $9 r0 *1 1.575,2.99 sky130_fd_pr__nfet_01v8__model
+M$9 3 31 34 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $10 r0 *1 2.785,2.99 sky130_fd_pr__nfet_01v8__model
+M$10 4 31 35 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $11 r0 *1 1.965,3.615 sky130_fd_pr__nfet_01v8__model
+M$11 34 32 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $12 r0 *1 2.395,3.615 sky130_fd_pr__nfet_01v8__model
+M$12 35 49 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $13 r0 *1 4.145,1.935 sky130_fd_pr__nfet_01v8__model
+M$13 15 16 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $14 r0 *1 4.575,1.935 sky130_fd_pr__nfet_01v8__model
+M$14 52 18 20 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $15 r0 *1 3.755,2.56 sky130_fd_pr__nfet_01v8__model
+M$15 15 26 5 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $16 r0 *1 4.965,2.56 sky130_fd_pr__nfet_01v8__model
+M$16 20 26 6 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $17 r0 *1 3.755,2.99 sky130_fd_pr__nfet_01v8__model
+M$17 5 31 49 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $18 r0 *1 4.965,2.99 sky130_fd_pr__nfet_01v8__model
+M$18 6 31 37 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $19 r0 *1 4.145,3.615 sky130_fd_pr__nfet_01v8__model
+M$19 49 35 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $20 r0 *1 4.575,3.615 sky130_fd_pr__nfet_01v8__model
+M$20 37 39 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $21 r0 *1 6.325,1.935 sky130_fd_pr__nfet_01v8__model
+M$21 18 20 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $22 r0 *1 6.755,1.935 sky130_fd_pr__nfet_01v8__model
+M$22 52 22 24 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $23 r0 *1 5.935,2.56 sky130_fd_pr__nfet_01v8__model
+M$23 18 26 7 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $24 r0 *1 7.145,2.56 sky130_fd_pr__nfet_01v8__model
+M$24 24 26 8 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $25 r0 *1 5.935,2.99 sky130_fd_pr__nfet_01v8__model
+M$25 7 31 39 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $26 r0 *1 7.145,2.99 sky130_fd_pr__nfet_01v8__model
+M$26 8 31 40 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $27 r0 *1 6.325,3.615 sky130_fd_pr__nfet_01v8__model
+M$27 39 37 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $28 r0 *1 6.755,3.615 sky130_fd_pr__nfet_01v8__model
+M$28 40 42 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $29 r0 *1 8.505,1.935 sky130_fd_pr__nfet_01v8__model
+M$29 22 24 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.1113P PS=1.285U PD=1.37U
+* device instance $30 r0 *1 8.115,2.56 sky130_fd_pr__nfet_01v8__model
+M$30 22 26 9 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.0588P PS=1.285U PD=0.7U
+* device instance $31 r0 *1 8.115,2.99 sky130_fd_pr__nfet_01v8__model
+M$31 9 31 42 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.18165P PS=0.7U PD=1.285U
+* device instance $32 r0 *1 8.505,3.615 sky130_fd_pr__nfet_01v8__model
+M$32 42 40 52 52 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.1113P PS=1.285U PD=1.37U
+* device instance $33 r0 *1 0.215,0.605 sky130_fd_pr__pfet_01v8__model
+M$33 1 10 12 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.1869P PS=1.37U PD=1.73U
+* device instance $34 r0 *1 1.965,0.605 sky130_fd_pr__pfet_01v8__model
+M$34 10 12 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $35 r0 *1 2.395,0.605 sky130_fd_pr__pfet_01v8__model
+M$35 1 15 16 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $36 r0 *1 4.145,0.605 sky130_fd_pr__pfet_01v8__model
+M$36 15 16 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $37 r0 *1 4.575,0.605 sky130_fd_pr__pfet_01v8__model
+M$37 1 18 20 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $38 r0 *1 6.325,0.605 sky130_fd_pr__pfet_01v8__model
+M$38 18 20 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $39 r0 *1 6.755,0.605 sky130_fd_pr__pfet_01v8__model
+M$39 1 22 24 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $40 r0 *1 8.505,0.605 sky130_fd_pr__pfet_01v8__model
+M$40 22 24 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.1113P PS=1.73U PD=1.37U
+* device instance $41 r0 *1 0.215,4.945 sky130_fd_pr__pfet_01v8__model
+M$41 1 34 32 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.1869P PS=1.37U PD=1.73U
+* device instance $42 r0 *1 1.965,4.945 sky130_fd_pr__pfet_01v8__model
+M$42 34 32 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $43 r0 *1 2.395,4.945 sky130_fd_pr__pfet_01v8__model
+M$43 1 49 35 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $44 r0 *1 4.145,4.945 sky130_fd_pr__pfet_01v8__model
+M$44 49 35 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $45 r0 *1 4.575,4.945 sky130_fd_pr__pfet_01v8__model
+M$45 1 39 37 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $46 r0 *1 6.325,4.945 sky130_fd_pr__pfet_01v8__model
+M$46 39 37 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.0588P PS=1.73U PD=0.7U
+* device instance $47 r0 *1 6.755,4.945 sky130_fd_pr__pfet_01v8__model
+M$47 1 42 40 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.0588P
++ AD=0.1869P PS=0.7U PD=1.73U
+* device instance $48 r0 *1 8.505,4.945 sky130_fd_pr__pfet_01v8__model
+M$48 42 40 1 1 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.1113P PS=1.73U PD=1.37U
+.ENDS SP6TArray_2X4
diff --git a/testdata/lvs/test_22c.cir b/testdata/lvs/test_22c.cir.1
similarity index 100%
rename from testdata/lvs/test_22c.cir
rename to testdata/lvs/test_22c.cir.1
diff --git a/testdata/lvs/test_22c.cir.2 b/testdata/lvs/test_22c.cir.2
new file mode 100644
index 000000000..77c13a280
--- /dev/null
+++ b/testdata/lvs/test_22c.cir.2
@@ -0,0 +1,97 @@
+* Extracted by KLayout
+
+* cell SP6TArray_2X4
+.SUBCKT SP6TArray_2X4
+* net 1 bl[0]
+* net 2 bl_n[0]
+* net 3 bl[1]
+* net 4 bl_n[1]
+* net 5 bl[2]
+* net 6 bl_n[2]
+* net 7 bl[3]
+* net 8 bl_n[3]
+* net 9 vdd
+* net 10 wl[0]
+* net 11 wl[1]
+* net 12 vss
+* cell instance $1 r0 *1 0,0
+X$1 1 2 3 4 9 10 11 12 SP6TArray_2X2
+* cell instance $2 r0 *1 4.36,0
+X$2 5 6 7 8 9 10 11 12 SP6TArray_2X2
+.ENDS SP6TArray_2X4
+
+* cell SP6TArray_2X2
+* pin bl[0]
+* pin bl_n[0]
+* pin bl[1]
+* pin bl_n[1]
+* pin vdd
+* pin wl[0]
+* pin wl[1]
+* pin vss
+.SUBCKT SP6TArray_2X2 1 2 3 4 5 6 7 8
+* net 1 bl[0]
+* net 2 bl_n[0]
+* net 3 bl[1]
+* net 4 bl_n[1]
+* net 5 vdd
+* net 6 wl[0]
+* net 7 wl[1]
+* net 8 vss
+* cell instance $1 r0 *1 0,0
+X$1 1 2 5 6 7 8 SP6TArray_2X1
+* cell instance $2 r0 *1 2.18,0
+X$2 3 4 5 6 7 8 SP6TArray_2X1
+.ENDS SP6TArray_2X2
+
+* cell SP6TArray_2X1
+* pin bl[0]
+* pin bl_n[0]
+* pin vdd
+* pin wl[0]
+* pin wl[1]
+* pin vss
+.SUBCKT SP6TArray_2X1 1 2 3 4 5 6
+* net 1 bl[0]
+* net 2 bl_n[0]
+* net 3 vdd
+* net 4 wl[0]
+* net 5 wl[1]
+* net 6 vss
+* cell instance $1 r0 *1 0,2.775
+X$1 3 5 1 2 6 SP6TCell
+* cell instance $2 m0 *1 0,2.775
+X$2 3 4 1 2 6 SP6TCell
+.ENDS SP6TArray_2X1
+
+* cell SP6TCell
+* pin vdd
+* pin wl
+* pin bl
+* pin bl_n
+* pin vss
+.SUBCKT SP6TCell 5 6 7 8 10
+* net 5 vdd
+* net 6 wl
+* net 7 bl
+* net 8 bl_n
+* net 10 vss
+* device instance $1 r0 *1 0.605,0.215 sky130_fd_pr__nfet_01v8__model
+M$1 7 6 3 10 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.18165P PS=1.37U PD=1.285U
+* device instance $2 r0 *1 0.215,0.84 sky130_fd_pr__nfet_01v8__model
+M$2 3 4 10 10 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.1113P PS=1.285U PD=1.37U
+* device instance $3 r0 *1 1.575,0.215 sky130_fd_pr__nfet_01v8__model
+M$3 8 6 4 10 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.18165P PS=1.37U PD=1.285U
+* device instance $4 r0 *1 1.965,0.84 sky130_fd_pr__nfet_01v8__model
+M$4 4 3 10 10 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.1113P PS=1.285U PD=1.37U
+* device instance $5 r0 *1 1.965,2.17 sky130_fd_pr__pfet_01v8__model
+M$5 4 3 5 5 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.1113P PS=1.73U PD=1.37U
+* device instance $6 r0 *1 0.215,2.17 sky130_fd_pr__pfet_01v8__model
+M$6 5 4 3 5 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.1869P PS=1.37U PD=1.73U
+.ENDS SP6TCell
diff --git a/testdata/lvs/test_22d.cir b/testdata/lvs/test_22d.cir.1
similarity index 100%
rename from testdata/lvs/test_22d.cir
rename to testdata/lvs/test_22d.cir.1
diff --git a/testdata/lvs/test_22d.cir.2 b/testdata/lvs/test_22d.cir.2
new file mode 100644
index 000000000..77c13a280
--- /dev/null
+++ b/testdata/lvs/test_22d.cir.2
@@ -0,0 +1,97 @@
+* Extracted by KLayout
+
+* cell SP6TArray_2X4
+.SUBCKT SP6TArray_2X4
+* net 1 bl[0]
+* net 2 bl_n[0]
+* net 3 bl[1]
+* net 4 bl_n[1]
+* net 5 bl[2]
+* net 6 bl_n[2]
+* net 7 bl[3]
+* net 8 bl_n[3]
+* net 9 vdd
+* net 10 wl[0]
+* net 11 wl[1]
+* net 12 vss
+* cell instance $1 r0 *1 0,0
+X$1 1 2 3 4 9 10 11 12 SP6TArray_2X2
+* cell instance $2 r0 *1 4.36,0
+X$2 5 6 7 8 9 10 11 12 SP6TArray_2X2
+.ENDS SP6TArray_2X4
+
+* cell SP6TArray_2X2
+* pin bl[0]
+* pin bl_n[0]
+* pin bl[1]
+* pin bl_n[1]
+* pin vdd
+* pin wl[0]
+* pin wl[1]
+* pin vss
+.SUBCKT SP6TArray_2X2 1 2 3 4 5 6 7 8
+* net 1 bl[0]
+* net 2 bl_n[0]
+* net 3 bl[1]
+* net 4 bl_n[1]
+* net 5 vdd
+* net 6 wl[0]
+* net 7 wl[1]
+* net 8 vss
+* cell instance $1 r0 *1 0,0
+X$1 1 2 5 6 7 8 SP6TArray_2X1
+* cell instance $2 r0 *1 2.18,0
+X$2 3 4 5 6 7 8 SP6TArray_2X1
+.ENDS SP6TArray_2X2
+
+* cell SP6TArray_2X1
+* pin bl[0]
+* pin bl_n[0]
+* pin vdd
+* pin wl[0]
+* pin wl[1]
+* pin vss
+.SUBCKT SP6TArray_2X1 1 2 3 4 5 6
+* net 1 bl[0]
+* net 2 bl_n[0]
+* net 3 vdd
+* net 4 wl[0]
+* net 5 wl[1]
+* net 6 vss
+* cell instance $1 r0 *1 0,2.775
+X$1 3 5 1 2 6 SP6TCell
+* cell instance $2 m0 *1 0,2.775
+X$2 3 4 1 2 6 SP6TCell
+.ENDS SP6TArray_2X1
+
+* cell SP6TCell
+* pin vdd
+* pin wl
+* pin bl
+* pin bl_n
+* pin vss
+.SUBCKT SP6TCell 5 6 7 8 10
+* net 5 vdd
+* net 6 wl
+* net 7 bl
+* net 8 bl_n
+* net 10 vss
+* device instance $1 r0 *1 0.605,0.215 sky130_fd_pr__nfet_01v8__model
+M$1 7 6 3 10 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.18165P PS=1.37U PD=1.285U
+* device instance $2 r0 *1 0.215,0.84 sky130_fd_pr__nfet_01v8__model
+M$2 3 4 10 10 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.1113P PS=1.285U PD=1.37U
+* device instance $3 r0 *1 1.575,0.215 sky130_fd_pr__nfet_01v8__model
+M$3 8 6 4 10 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.18165P PS=1.37U PD=1.285U
+* device instance $4 r0 *1 1.965,0.84 sky130_fd_pr__nfet_01v8__model
+M$4 4 3 10 10 sky130_fd_pr__nfet_01v8__model L=0.15U W=0.42U AS=0.18165P
++ AD=0.1113P PS=1.285U PD=1.37U
+* device instance $5 r0 *1 1.965,2.17 sky130_fd_pr__pfet_01v8__model
+M$5 4 3 5 5 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1869P
++ AD=0.1113P PS=1.73U PD=1.37U
+* device instance $6 r0 *1 0.215,2.17 sky130_fd_pr__pfet_01v8__model
+M$6 5 4 3 5 sky130_fd_pr__pfet_01v8__model L=0.15U W=0.42U AS=0.1113P
++ AD=0.1869P PS=1.37U PD=1.73U
+.ENDS SP6TCell