diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 7dd3c9b..9f5b96a 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -14,8 +14,8 @@
 
 name: code linting
 on:
-#  push:
-#  pull_request:
+  push:
+  pull_request:
   workflow_dispatch:
 
 jobs:
@@ -28,4 +28,3 @@
       - name: Lint with flake8
         run: |
           make lint_python
-
diff --git a/.github/workflows/lvs_regression.yml b/.github/workflows/lvs_regression.yml
index 2335586..57532be 100644
--- a/.github/workflows/lvs_regression.yml
+++ b/.github/workflows/lvs_regression.yml
@@ -1,4 +1,4 @@
-# Copyright 2022 GlobalFoundries PDK Authors
+# Copyright 2023 GlobalFoundries PDK Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,45 +21,27 @@
   cancel-in-progress: true
 
 on:
-#  push:
-#  pull_request:
+  push:
+  pull_request:
   workflow_dispatch:
 
 jobs:
-  lvs_switch:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { tool: klayout, part: lvs, test: switch }
-
-    name: ${{ matrix.part }} | ${{ matrix.test }}
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
-      - name: Testing ${{ matrix.part }} for ${{ matrix.test }}
-        run: |
-          make test-"$(python -c 'print("${{ matrix.part }}".upper())')"-${{ matrix.test }}
-
   build_lvs-matrix:
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
     outputs:
       lvs_table: ${{ steps.set-matrix.outputs.lvs_table }}
     steps:
       - uses: actions/checkout@v3
       - id: set-matrix
         run: |
-          lvs_table=`find -iname '*_extraction.lvs' | grep -i rule_decks | grep -v main | grep -v tail | awk -F'/' '{printf "\"%s-%s\",", $2, $NF}' | sed -e "s/^/[/g" -e "s/,$/]/g" -e "s/_extraction.lvs//g"`
+          lvs_table=`find -iname '*_extraction.lvs' | grep -i rule_decks | awk -F'/' '{printf "\"%s-%s\",", $2, $NF}' | sed -e "s/^/[/g" -e "s/,$/]/g" -e "s/_extraction.lvs//g" | tr '[:lower:]' '[:upper:]'| sed -e "s/LITE/Lite/g"`
           lvs_table=`echo $lvs_table | jq -c .`
           echo $lvs_table
           echo "lvs_table=$lvs_table" >>$GITHUB_OUTPUT
 
   lvs_regression:
     needs: build_lvs-matrix
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
     strategy:
       fail-fast: false
       matrix:
@@ -74,4 +56,22 @@
           submodules: 'recursive'
       - name: Testing ${{ matrix.part }} for ${{ matrix.test }}
         run: |
-          make test-"$(python -c 'print("${{ matrix.part }}".upper())')"-${{ matrix.test }}
+          make test-"$(python3 -c 'print("${{ matrix.part }}".upper())')"-${{ matrix.test }}
+
+  lvs_switch:
+    runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { tool: klayout, part: lvs, test: switch }
+
+    name: ${{ matrix.part }} | ${{ matrix.test }}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
+      - name: Testing ${{ matrix.part }} for ${{ matrix.test }}
+        run: |
+          make test-"$(python3 -c 'print("${{ matrix.part }}".upper())')"-${{ matrix.test }}
diff --git a/BCDLite/klayout/lvs/gf180BCDLite.lvs b/BCDLite/klayout/lvs/gf180BCDLite.lvs
index 2f4578f..34699bc 100644
--- a/BCDLite/klayout/lvs/gf180BCDLite.lvs
+++ b/BCDLite/klayout/lvs/gf180BCDLite.lvs
@@ -260,6 +260,12 @@
 
 # %include rule_decks/diode_derivations.lvs
 
+#=================================
+# ------ DIODE DERIVATIONS -------
+#=================================
+
+# %include rule_decks/res_derivations.lvs
+
 #==================================
 # ------ MIMCAP DERIVATIONS -------
 #==================================
@@ -284,6 +290,12 @@
 
 # %include rule_decks/piscap_derivations.lvs
 
+#==================================
+# ----- MOS-SAB DERIVATIONS -------
+#==================================
+
+# %include rule_decks/mos_sab_derivations.lvs
+
 #================================================
 #------------ DEVICES CONNECTIVITY --------------
 #================================================
@@ -314,6 +326,12 @@
 
 # %include rule_decks/diode_extraction.lvs
 
+#=================================
+# ------- DIODE EXTRACTION -------
+#=================================
+
+# %include rule_decks/res_extraction.lvs
+
 #==================================
 # ------- MIMCAP EXTRACTION -------
 #==================================
@@ -338,6 +356,12 @@
 
 # %include rule_decks/piscap_extraction.lvs
 
+#=================================
+# ------ MOS-SAB EXTRACTION ------
+#=================================
+
+# %include rule_decks/mos_sab_extraction.lvs
+
 #================================================
 #------------- COMPARISON OPTIONS ---------------
 #================================================
diff --git a/BCDLite/klayout/lvs/rule_decks/general_connections.lvs b/BCDLite/klayout/lvs/rule_decks/general_connections.lvs
index dc99427..b7f92ed 100644
--- a/BCDLite/klayout/lvs/rule_decks/general_connections.lvs
+++ b/BCDLite/klayout/lvs/rule_decks/general_connections.lvs
@@ -30,6 +30,7 @@
 connect(sub, ptap)
 connect(lvpwell_con, ptap)
 connect(lvpwell_con, ptap_dn)
+connect(dnw_pw_con, ptap_dn)
 connect(dnwell, ntap_dn)
 connect(nwell_con, ntap)
 connect(ptap, contact)
diff --git a/BCDLite/klayout/lvs/rule_decks/general_derivations.lvs b/BCDLite/klayout/lvs/rule_decks/general_derivations.lvs
index 481531b..2e3c723 100644
--- a/BCDLite/klayout/lvs/rule_decks/general_derivations.lvs
+++ b/BCDLite/klayout/lvs/rule_decks/general_derivations.lvs
@@ -22,26 +22,26 @@
 dnwell_p        = dnwell.and(lvpwell)
 
 all_nwell       = dnwell_n.join(nwell)
-all_nwell_pw    = dnwell.join(nwell)
+all_nw_dnw      = dnwell.join(nwell)
 
 ncomp           = comp.and(nplus)
 pcomp           = comp.and(pplus)
 tgate           = poly2.and(comp).not(res_mk)
 
 nactive         = ncomp.not(all_nwell)
-nactive_pw      = ncomp.not(all_nwell_pw)
+nactive_all     = ncomp.not(all_nw_dnw)
 ngate           = nactive.and(tgate)
-ngate_pw        = nactive_pw.and(tgate)
+ngate_all       = nactive_all.and(tgate)
 nsd             = nactive.interacting(ngate).not(ngate).not(res_mk)
-ptap            = pcomp.not(all_nwell_pw).not(res_mk)
+ptap            = pcomp.not(all_nw_dnw).not(res_mk)
 
 pactive         = pcomp.and(all_nwell)
 pgate           = pactive.and(tgate)
 psd             = pactive.interacting(pgate).not(pgate).not(res_mk)
-ntap            = ncomp.and(all_nwell_pw).not(res_mk)
+ntap            = ncomp.and(all_nwell).not(res_mk)
 
 ngate_dn        = ngate.and(dnwell_p)
-ptap_dn         = ptap.and(dnwell_p).outside(well_diode_mk)
+ptap_dn         = pcomp.and(dnwell_p).outside(well_diode_mk)
 
 pgate_dn        = pgate.and(dnwell_n)
 ntap_dn         = ntap.and(dnwell_n)
@@ -51,6 +51,7 @@
 
 nwell_con       = nwell.not(res_mk)
 lvpwell_con     = lvpwell.not(res_mk)
+dnw_pw_con      = dnwell_p.not(res_mk)
 poly2_con       = poly2.not(res_mk).not(plfuse)
 
 metal1_con      = metal1.not(mom_mk).not(mom_m1_mk)
diff --git a/BCDLite/klayout/lvs/rule_decks/mos_derivations.lvs b/BCDLite/klayout/lvs/rule_decks/mos_derivations.lvs
index f973031..b37f7d8 100644
--- a/BCDLite/klayout/lvs/rule_decks/mos_derivations.lvs
+++ b/BCDLite/klayout/lvs/rule_decks/mos_derivations.lvs
@@ -41,7 +41,7 @@
 logger.info('Starting LV (1.8V) TRANSISTORS layers DERIVATIONS')
 
 # nfet_01v8: Model for LV NMOS outside Dnwell [nmos_1p8]
-ngate_1p8 = ngate_pw.not(dualgate2_d).not(v5_xtor).not(nat).not(mos_exclude)
+ngate_1p8 = ngate_all.not(dualgate2_d).not(v5_xtor).not(nat).not(mos_exclude)
 
 # nfet_01v8_dn: Model for LV NMOS Inside Dnwell [nmos_1p8 _dw]
 ngate_1p8_dn = ngate_dn.not(nwell).not(dualgate2_d).not(v5_xtor).not(nat).not(mos_exclude)
@@ -62,7 +62,7 @@
 logger.info('Starting MV (5V) TRANSISTORS layers DERIVATIONS')
 
 # nfet_05v0: Model for MV NMOS outside Dnwell [nmos_5p0]
-ngate_5p0 = ngate_pw.and(dualgate2_d).and(v5_xtor).not(nat).not(mos_exclude)
+ngate_5p0 = ngate_all.and(dualgate2_d).and(v5_xtor).not(nat).not(mos_exclude)
 
 # nfet_05v0_dn: Model for MV NMOS Inside Dnwell [nmos_5p0_dw]
 ngate_5p0_dn = ngate_dn.and(dualgate2_d).and(v5_xtor).not(nat).not(mos_exclude)
@@ -80,7 +80,7 @@
 logger.info('Starting MV (6V) TRANSISTORS layers DERIVATIONS')
 
 # nfet_06v0: Model for MV NMOS outside Dnwell [nmos_6p0]
-ngate_6p0 = ngate_pw.and(dualgate2_d).not(v5_xtor).not(nat).not(mos_exclude)
+ngate_6p0 = ngate_all.and(dualgate2_d).not(v5_xtor).not(nat).not(mos_exclude)
 
 # nfet_06v0_dn: Model for MV NMOS Inside Dnwell [nmos_6p0_dw]
 ngate_6p0_dn = ngate_dn.and(dualgate2_d).not(v5_xtor).not(nat).not(mos_exclude)
diff --git a/BCDLite/klayout/lvs/rule_decks/mos_sab_derivations.lvs b/BCDLite/klayout/lvs/rule_decks/mos_sab_derivations.lvs
new file mode 100644
index 0000000..3a9ff75
--- /dev/null
+++ b/BCDLite/klayout/lvs/rule_decks/mos_sab_derivations.lvs
@@ -0,0 +1,68 @@
+################################################################################################
+# Copyright 2023 GlobalFoundries PDK Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################################
+
+#================================
+# ---- MOS-SAB DERIVATIONS ------
+#================================
+
+logger.info('Starting MOS SAB DERIVATIONS')
+
+mos_sab_exclude = resistor.join(esd).join(dni)
+                          .join(pwhv).join(fusewindow_d).join(polyfuse)
+                          .join(schottky_diode).join(piscap).join(zener)
+                          .join(res_mk).join(drc_bjt).join(nat)
+                          .join(fhres).join(mos_cap_mk).join(mvsd)
+                          .join(mvpsd).join(elmd_mk).join(lvs_rf)
+                          .join(lvs_source).join(mk_35v).join(lvs_35v)
+                          .join(esd_hbm_mk).join(mos_mk_type1).join(swfet_mk)
+                          .join(hvnddd).join(hvpddd).join(hvpolyrs)
+                          .join(ldmos_xtor)
+
+sab_ngate_lv_base = nplus.and(tgate).not(v5_xtor).not(dualgate2_d).interacting(elmd2_mk)
+sab_ngate_5v_base = nplus.and(tgate).and(v5_xtor).and(dualgate2_d).interacting(elmd2_mk)
+sab_ngate_6v_base = nplus.and(tgate).not(v5_xtor).and(dualgate2_d).interacting(elmd2_mk)
+
+sab_ngate_lv_n_dw = sab_ngate_lv_base.not(dnwell).not(lvpwell)
+sab_ngate_5v_n_dw = sab_ngate_5v_base.not(dnwell).not(lvpwell)
+sab_ngate_6v_n_dw = sab_ngate_6v_base.not(dnwell).not(lvpwell)
+
+sab_ngate_lv_dw = sab_ngate_lv_base.and(ngate_dn)
+sab_ngate_5v_dw = sab_ngate_5v_base.and(ngate_dn)
+sab_ngate_6v_dw = sab_ngate_6v_base.and(ngate_dn)
+
+# ==============
+# ---- NMOS ----
+# ==============
+
+logger.info('Starting NMOS SAB DERIVATIONS')
+
+# nmos_1p8_sab: 1.8V ESD NMOS transistor outside DNWELL
+ngate_sab_1p8v = sab_ngate_lv_n_dw.interacting(sab).not(mos_sab_exclude)
+
+# nmos_1p8_dw_sab: 1.8V ESD NMOS transistor INSIDE DNWELL
+ngate_dw_sab_1p8v = sab_ngate_lv_dw.interacting(sab).not(mos_sab_exclude)
+
+# nmos_5p0_sab: 5V ESD NMOS transistor outside DNWELL
+ngate_sab_5v = sab_ngate_5v_n_dw.interacting(sab).not(mos_sab_exclude)
+
+# nmos_5p0_dw_sab: 5V ESD NMOS transistor inside DNWELL
+ngate_dw_sab_5v = sab_ngate_5v_dw.interacting(sab).not(mos_sab_exclude)
+
+# nmos_6p0_sab: 6V ESD NMOS transistor outside DNWELL
+ngate_sab_6v = sab_ngate_6v_n_dw.interacting(sab).not(mos_sab_exclude)
+
+# nmos_6p0_dw_sab: 6V ESD NMOS transistor inside DNWELL
+ngate_dw_sab_6v = sab_ngate_6v_dw.interacting(sab).not(mos_sab_exclude)
diff --git a/BCDLite/klayout/lvs/rule_decks/mos_sab_extraction.lvs b/BCDLite/klayout/lvs/rule_decks/mos_sab_extraction.lvs
new file mode 100644
index 0000000..4a86cd9
--- /dev/null
+++ b/BCDLite/klayout/lvs/rule_decks/mos_sab_extraction.lvs
@@ -0,0 +1,63 @@
+################################################################################################
+# Copyright 2023 GlobalFoundries PDK Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################################
+
+#================================
+# ----- MOS-SAB EXTRACTION ------
+#================================
+
+logger.info('Starting MOS SAB EXTRACTION')
+
+# ==============
+# ---- NMOS ----
+# ==============
+logger.info('Starting NMOS SAB EXTRACTION')
+
+# nmos_1p8_sab: 1.8V ESD NMOS transistor outside DNWELL
+logger.info('Extracting nfet_01v8_dss transistor')
+extract_devices(mos4('nfet_01v8_dss'), { 'SD' => nsd, 'G' => ngate_sab_1p8v, 
+                                         'tS' => nsd, 'tD' => nsd, 'tG' => poly2_con, 
+                                         'W' => sub })
+
+# nmos_1p8_dw_sab: 1.8V ESD NMOS transistor INSIDE DNWELL
+logger.info('Extracting nfet_01v8_dn_dss transistor')
+extract_devices(mos4('nfet_01v8_dn_dss'), { 'SD' => nsd_dn, 'G' => ngate_dw_sab_1p8v, 
+                                            'tS' => nsd_dn, 'tD' => nsd_dn, 'tG' => poly2_con,
+                                            'W' => dnw_pw_con })
+
+# nmos_5p0_sab: 5V ESD NMOS transistor outside DNWELL
+logger.info('Extracting nfet_05v0_dss transistor')
+extract_devices(mos4('nfet_05v0_dss'), { 'SD' => nsd, 'G' => ngate_sab_5v, 
+                                         'tS' => nsd, 'tD' => nsd, 'tG' => poly2_con, 
+                                         'W' => sub })
+
+# nmos_5p0_dw_sab: 5V ESD NMOS transistor inside DNWELL
+logger.info('Extracting nfet_05v0_dn_dss transistor')
+extract_devices(mos4('nfet_05v0_dn_dss'), { 'SD' => nsd_dn, 'G' => ngate_dw_sab_5v, 
+                                            'tS' => nsd_dn, 'tD' => nsd_dn, 'tG' => poly2_con,
+                                            'W' => dnw_pw_con })
+
+# nmos_6p0_sab: 6V ESD NMOS transistor outside DNWELL
+logger.info('Extracting nfet_06v0_dss transistor')
+extract_devices(mos4('nfet_06v0_dss'), { 'SD' => nsd, 'G' => ngate_sab_6v, 
+                                         'tS' => nsd, 'tD' => nsd, 
+                                         'tG' => poly2_con, 
+                                         'W' => sub })
+
+# nmos_6p0_dw_sab: 6V ESD NMOS transistor inside DNWELL
+logger.info('Extracting nfet_06v0_dn_dss transistor')
+extract_devices(mos4('nfet_06v0_dn_dss'), { 'SD' => nsd_dn, 'G' => ngate_dw_sab_6v, 
+                                            'tS' => nsd_dn, 'tD' => nsd_dn, 'tG' => poly2_con,
+                                            'W' => dnw_pw_con })
diff --git a/BCDLite/klayout/lvs/rule_decks/res_derivations.lvs b/BCDLite/klayout/lvs/rule_decks/res_derivations.lvs
new file mode 100644
index 0000000..fecd082
--- /dev/null
+++ b/BCDLite/klayout/lvs/rule_decks/res_derivations.lvs
@@ -0,0 +1,54 @@
+################################################################################################
+# Copyright 2023 GlobalFoundries PDK Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################################
+
+#================================
+# ---- RESISTOR DERIVATIONS -----
+#================================
+
+logger.info('Starting RESISTOR DERIVATIONS')
+
+res_exclude = esd.join(fusewindow_d).join(dni)
+                 .join(pwhv).join(piscap).join(zener)
+                 .join(v5_xtor).join(fhres).join(polyfuse)
+                 .join(diode_mk).join(drc_bjt).join(nat)
+                 .join(mos_cap_mk).join(esd_mk).join(lvs_source)
+                 .join(efuse_mk).join(plfuse).join(mvsd)
+                 .join(mvpsd).join(ldmos_xtor).join(schottky_diode)
+                 .join(elmd_mk).join(elmd2_mk).join(lvs_rf)
+                 .join(hvnddd).join(hvpddd).join(hvpolyrs)
+
+# ==============
+# ---- POLY ----
+# ==============
+
+# POLY
+poly_exclude = comp.join(res_exclude).join(resistor)
+
+# PPOLY
+ppoly_exclude = poly_exclude.join(nplus)
+ppolyf_res = pplus.and(poly2).and(res_mk).not(ppoly_exclude)
+
+## PPOLYF_U
+ppolyf_u_layer = ppolyf_res.and(sab).not(dnwell)
+
+## PPOLYF_U_DW
+ppolyf_u_dw_layer = ppolyf_res.and(sab).and(dnwell)
+
+## PPOLYF_S
+ppolyf_s_layer = ppolyf_res.not(dnwell).not_interacting(sab)
+
+## PPOLYF_S_DW
+ppolyf_s_dw_layer = ppolyf_res.and(dnwell).not_interacting(sab)
diff --git a/BCDLite/klayout/lvs/rule_decks/res_extraction.lvs b/BCDLite/klayout/lvs/rule_decks/res_extraction.lvs
new file mode 100644
index 0000000..f351fc2
--- /dev/null
+++ b/BCDLite/klayout/lvs/rule_decks/res_extraction.lvs
@@ -0,0 +1,43 @@
+################################################################################################
+# Copyright 2023 GlobalFoundries PDK Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################################
+
+#================================
+# ---- RESISTOR EXTRACTIONS -----
+#================================
+
+logger.info('Starting RESISTOR EXTRACTION')
+
+# ==============
+# ---- POLY ----
+# ==============
+
+# res_ppo_3t_uns [PPOLYF_U]
+logger.info('Extracting res_ppo_3t_uns resistor')
+extract_devices(resistor_with_bulk('res_ppo_3t_uns', 350, BResistor), { 'R' => ppolyf_u_layer, 'C' => poly2_con, 'W' => sub })
+
+# res_ppo_3t_uns_dn [PPOLYF_U_DW]
+logger.info('Extracting res_ppo_3t_uns_dn resistor')
+extract_devices(resistor_with_bulk('res_ppo_3t_uns_dn', 350, BResistor),
+                { 'R' => ppolyf_u_dw_layer, 'C' => poly2_con, 'W' => dnwell })
+
+# res_ppo_3t_sal [PPOLYF_S]
+logger.info('Extracting res_ppo_3t_sal resistor')
+extract_devices(resistor_with_bulk('res_ppo_3t_sal', 7.3, BResistor), { 'R' => ppolyf_s_layer, 'C' => poly2_con, 'W' => sub })
+
+# res_ppo_3t_sal_dn [PPOLYF_S_DW]
+logger.info('Extracting res_ppo_3t_sal_dn resistor')
+extract_devices(resistor_with_bulk('res_ppo_3t_sal_dn', 7.3, BResistor),
+                { 'R' => ppolyf_s_dw_layer, 'C' => poly2_con, 'W' => dnwell })
diff --git a/BCDLite/klayout/lvs/testing/run_regression.py b/BCDLite/klayout/lvs/testing/run_regression.py
index 814058b..7059b0f 100644
--- a/BCDLite/klayout/lvs/testing/run_regression.py
+++ b/BCDLite/klayout/lvs/testing/run_regression.py
@@ -20,7 +20,7 @@
 
 Options:
     --help -h                      Print this help message.
-    --device_name=<device_name>    Name of device that we want to run regression for, Allowed values (MOS, BJT, DIODE, RES, MIMCAP, APMOMCAP, VARACTOR, MOSCAP, PISCAP, ESD, EFUSE).
+    --device_name=<device_name>    Name of device that we want to run regression for, Allowed values (MOS, BJT, DIODE, RES, MIMCAP, MOSCAP, PISCAP, VARACTOR, MOS_SAB).
     --mp=<num>                     The number of threads used in run.
     --run_name=<run_name>          Select your run name.
 """
@@ -519,11 +519,11 @@
     )
 
     ## selected device
-    allowed_devices = ["MOS", "BJT", "DIODE", "RES", "MIMCAP", "MOSCAP", "PISCAP", "APMOMCAP", "VARACTOR" , "EFUSE", "ESD"]
+    allowed_devices = ["MOS", "BJT", "DIODE", "RES", "MIMCAP", "MOSCAP", "PISCAP", "VARACTOR", "MOS_SAB"]
     target_device_group = args["--device_name"]
 
     if target_device_group and target_device_group not in allowed_devices:
-        logging.error("Allowed devices are (MOS, BJT, DIODE, RES, MIMCAP, APMOMCAP, VARACTOR, MOSCAP, PISCAP, ESD, EFUSE) only")
+        logging.error("Allowed devices are (MOS, BJT, DIODE, RES, MIMCAP, MOSCAP, PISCAP, VARACTOR, MOS_SAB) only")
         exit(1)
 
     # Calling main function
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_01v8_dn_dss.gds b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_01v8_dn_dss.gds
new file mode 100644
index 0000000..93926b0
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_01v8_dn_dss.gds
Binary files differ
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_01v8_dss.gds b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_01v8_dss.gds
new file mode 100644
index 0000000..b6b4374
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_01v8_dss.gds
Binary files differ
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_05v0_dn_dss.gds b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_05v0_dn_dss.gds
new file mode 100644
index 0000000..8d45402
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_05v0_dn_dss.gds
Binary files differ
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_05v0_dss.gds b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_05v0_dss.gds
new file mode 100644
index 0000000..5e45b31
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_05v0_dss.gds
Binary files differ
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_06v0_dn_dss.gds b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_06v0_dn_dss.gds
new file mode 100644
index 0000000..88894a7
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_06v0_dn_dss.gds
Binary files differ
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_06v0_dss.gds b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_06v0_dss.gds
new file mode 100644
index 0000000..eb2d030
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/layout/nfet_06v0_dss.gds
Binary files differ
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_01v8_dn_dss.cdl b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_01v8_dn_dss.cdl
new file mode 100644
index 0000000..b2da698
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_01v8_dn_dss.cdl
@@ -0,0 +1,337 @@
+************************************************************************
+* auCdl Netlist:
+* 
+* Library Name:  TCG_library_2
+* Top Cell Name: nfet_01v8_dn_dss
+* View Name:     schematic
+* Netlisted on:  Sep 10 16:29:36 2021
+************************************************************************
+
+*.EQUATION
+*.SCALE METER
+*.MEGA
+.PARAM
+
+*.GLOBAL vdd!
+
+*.PIN vdd!
+
+************************************************************************
+* Library Name: TCG_library_2
+* Cell Name:    nfet_01v8_dn_dss
+* View Name:    schematic
+************************************************************************
+
+.SUBCKT nfet_01v8_dn_dss I1_default_D I1_default_G I1_default_S 
++ I1_lin_default_d_sab_0_R0_D I1_lin_default_d_sab_0_R0_G 
++ I1_lin_default_d_sab_0_R0_S I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S 
++ I1_lin_default_d_sab_2_R0_D I1_lin_default_d_sab_2_R0_G 
++ I1_lin_default_d_sab_2_R0_S I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S 
++ I1_lin_default_d_sab_4_R0_D I1_lin_default_d_sab_4_R0_G 
++ I1_lin_default_d_sab_4_R0_S I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S 
++ I1_lin_default_d_sab_6_R0_D I1_lin_default_d_sab_6_R0_G 
++ I1_lin_default_d_sab_6_R0_S I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S 
++ I1_lin_default_d_sab_8_R0_D I1_lin_default_d_sab_8_R0_G 
++ I1_lin_default_d_sab_8_R0_S I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S 
++ I1_lin_default_gns_0_R0_D I1_lin_default_gns_0_R0_G 
++ I1_lin_default_gns_0_R0_S I1_lin_default_gns_1_R0_D 
++ I1_lin_default_gns_1_R0_G I1_lin_default_gns_1_R0_S 
++ I1_lin_default_guardRing_0_R0_D I1_lin_default_guardRing_0_R0_G 
++ I1_lin_default_guardRing_0_R0_S I1_lin_default_guardRing_1_R0_D 
++ I1_lin_default_guardRing_1_R0_G I1_lin_default_guardRing_1_R0_S 
++ I1_lin_default_l_0_R0_D I1_lin_default_l_0_R0_G I1_lin_default_l_0_R0_S 
++ I1_lin_default_l_1_R0_D I1_lin_default_l_1_R0_G I1_lin_default_l_1_R0_S 
++ I1_lin_default_l_2_R0_D I1_lin_default_l_2_R0_G I1_lin_default_l_2_R0_S 
++ I1_lin_default_l_3_R0_D I1_lin_default_l_3_R0_G I1_lin_default_l_3_R0_S 
++ I1_lin_default_m_0_R0_D I1_lin_default_m_0_R0_G I1_lin_default_m_0_R0_S 
++ I1_lin_default_m_1_R0_D I1_lin_default_m_1_R0_G I1_lin_default_m_1_R0_S 
++ I1_lin_default_m_2_R0_D I1_lin_default_m_2_R0_G I1_lin_default_m_2_R0_S 
++ I1_lin_default_nf_0_R0_D I1_lin_default_nf_0_R0_G I1_lin_default_nf_0_R0_S 
++ I1_lin_default_nf_1_R0_D I1_lin_default_nf_1_R0_G I1_lin_default_nf_1_R0_S 
++ I1_lin_default_nf_2_R0_D I1_lin_default_nf_2_R0_G I1_lin_default_nf_2_R0_S 
++ I1_lin_default_nf_3_R0_D I1_lin_default_nf_3_R0_G I1_lin_default_nf_3_R0_S 
++ I1_lin_default_nf_4_R0_D I1_lin_default_nf_4_R0_G I1_lin_default_nf_4_R0_S 
++ I1_lin_default_nf_5_R0_D I1_lin_default_nf_5_R0_G I1_lin_default_nf_5_R0_S 
++ I1_lin_default_nf_6_R0_D I1_lin_default_nf_6_R0_G I1_lin_default_nf_6_R0_S 
++ I1_lin_default_nf_7_R0_D I1_lin_default_nf_7_R0_G I1_lin_default_nf_7_R0_S 
++ I1_lin_default_nf_8_R0_D I1_lin_default_nf_8_R0_G I1_lin_default_nf_8_R0_S 
++ I1_lin_default_nf_9_R0_D I1_lin_default_nf_9_R0_G I1_lin_default_nf_9_R0_S 
++ I1_lin_default_nf_10_R0_D I1_lin_default_nf_10_R0_G 
++ I1_lin_default_nf_10_R0_S I1_lin_default_nf_11_R0_D 
++ I1_lin_default_nf_11_R0_G I1_lin_default_nf_11_R0_S 
++ I1_lin_default_nf_12_R0_D I1_lin_default_nf_12_R0_G 
++ I1_lin_default_nf_12_R0_S I1_lin_default_nf_13_R0_D 
++ I1_lin_default_nf_13_R0_G I1_lin_default_nf_13_R0_S 
++ I1_lin_default_psub_tap_0_R0_D I1_lin_default_psub_tap_0_R0_G 
++ I1_lin_default_psub_tap_0_R0_S I1_lin_default_s_sab_0_R0_D 
++ I1_lin_default_s_sab_0_R0_G I1_lin_default_s_sab_0_R0_S 
++ I1_lin_default_s_sab_1_R0_D I1_lin_default_s_sab_1_R0_G 
++ I1_lin_default_s_sab_1_R0_S I1_lin_default_s_sab_2_R0_D 
++ I1_lin_default_s_sab_2_R0_G I1_lin_default_s_sab_2_R0_S 
++ I1_lin_default_s_sab_3_R0_D I1_lin_default_s_sab_3_R0_G 
++ I1_lin_default_s_sab_3_R0_S I1_lin_default_s_sab_4_R0_D 
++ I1_lin_default_s_sab_4_R0_G I1_lin_default_s_sab_4_R0_S 
++ I1_lin_default_s_sab_5_R0_D I1_lin_default_s_sab_5_R0_G 
++ I1_lin_default_s_sab_5_R0_S I1_lin_default_s_sab_6_R0_D 
++ I1_lin_default_s_sab_6_R0_G I1_lin_default_s_sab_6_R0_S 
++ I1_lin_default_s_sab_7_R0_D I1_lin_default_s_sab_7_R0_G 
++ I1_lin_default_s_sab_7_R0_S I1_lin_default_strapSD_0_R0_D 
++ I1_lin_default_strapSD_0_R0_G I1_lin_default_strapSD_0_R0_S 
++ I1_lin_default_wf_0_R0_D I1_lin_default_wf_0_R0_G I1_lin_default_wf_0_R0_S 
++ I1_lin_default_wf_1_R0_D I1_lin_default_wf_1_R0_G I1_lin_default_wf_1_R0_S 
++ I1_lin_default_wf_2_R0_D I1_lin_default_wf_2_R0_G I1_lin_default_wf_2_R0_S 
++ I1_lin_default_wf_3_R0_D I1_lin_default_wf_3_R0_G I1_lin_default_wf_3_R0_S 
++ I1_lin_default_wf_4_R0_D I1_lin_default_wf_4_R0_G I1_lin_default_wf_4_R0_S 
++ I1_lin_default_wf_5_R0_D I1_lin_default_wf_5_R0_G I1_lin_default_wf_5_R0_S 
++ I1_lin_default_wf_6_R0_D I1_lin_default_wf_6_R0_G I1_lin_default_wf_6_R0_S 
++ I1_lin_default_wf_7_R0_D I1_lin_default_wf_7_R0_G I1_lin_default_wf_7_R0_S 
++ vdd!
+*.PININFO I1_default_D:I I1_default_G:I I1_default_S:I 
+*.PININFO I1_lin_default_d_sab_0_R0_D:I I1_lin_default_d_sab_0_R0_G:I 
+*.PININFO I1_lin_default_d_sab_0_R0_S:I I1_lin_default_d_sab_1_R0_D:I 
+*.PININFO I1_lin_default_d_sab_1_R0_G:I I1_lin_default_d_sab_1_R0_S:I 
+*.PININFO I1_lin_default_d_sab_2_R0_D:I I1_lin_default_d_sab_2_R0_G:I 
+*.PININFO I1_lin_default_d_sab_2_R0_S:I I1_lin_default_d_sab_3_R0_D:I 
+*.PININFO I1_lin_default_d_sab_3_R0_G:I I1_lin_default_d_sab_3_R0_S:I 
+*.PININFO I1_lin_default_d_sab_4_R0_D:I I1_lin_default_d_sab_4_R0_G:I 
+*.PININFO I1_lin_default_d_sab_4_R0_S:I I1_lin_default_d_sab_5_R0_D:I 
+*.PININFO I1_lin_default_d_sab_5_R0_G:I I1_lin_default_d_sab_5_R0_S:I 
+*.PININFO I1_lin_default_d_sab_6_R0_D:I I1_lin_default_d_sab_6_R0_G:I 
+*.PININFO I1_lin_default_d_sab_6_R0_S:I I1_lin_default_d_sab_7_R0_D:I 
+*.PININFO I1_lin_default_d_sab_7_R0_G:I I1_lin_default_d_sab_7_R0_S:I 
+*.PININFO I1_lin_default_d_sab_8_R0_D:I I1_lin_default_d_sab_8_R0_G:I 
+*.PININFO I1_lin_default_d_sab_8_R0_S:I I1_lin_default_d_sab_9_R0_D:I 
+*.PININFO I1_lin_default_d_sab_9_R0_G:I I1_lin_default_d_sab_9_R0_S:I 
+*.PININFO I1_lin_default_gns_0_R0_D:I I1_lin_default_gns_0_R0_G:I 
+*.PININFO I1_lin_default_gns_0_R0_S:I I1_lin_default_gns_1_R0_D:I 
+*.PININFO I1_lin_default_gns_1_R0_G:I I1_lin_default_gns_1_R0_S:I 
+*.PININFO I1_lin_default_guardRing_0_R0_D:I I1_lin_default_guardRing_0_R0_G:I 
+*.PININFO I1_lin_default_guardRing_0_R0_S:I I1_lin_default_guardRing_1_R0_D:I 
+*.PININFO I1_lin_default_guardRing_1_R0_G:I I1_lin_default_guardRing_1_R0_S:I 
+*.PININFO I1_lin_default_l_0_R0_D:I I1_lin_default_l_0_R0_G:I 
+*.PININFO I1_lin_default_l_0_R0_S:I I1_lin_default_l_1_R0_D:I 
+*.PININFO I1_lin_default_l_1_R0_G:I I1_lin_default_l_1_R0_S:I 
+*.PININFO I1_lin_default_l_2_R0_D:I I1_lin_default_l_2_R0_G:I 
+*.PININFO I1_lin_default_l_2_R0_S:I I1_lin_default_l_3_R0_D:I 
+*.PININFO I1_lin_default_l_3_R0_G:I I1_lin_default_l_3_R0_S:I 
+*.PININFO I1_lin_default_m_0_R0_D:I I1_lin_default_m_0_R0_G:I 
+*.PININFO I1_lin_default_m_0_R0_S:I I1_lin_default_m_1_R0_D:I 
+*.PININFO I1_lin_default_m_1_R0_G:I I1_lin_default_m_1_R0_S:I 
+*.PININFO I1_lin_default_m_2_R0_D:I I1_lin_default_m_2_R0_G:I 
+*.PININFO I1_lin_default_m_2_R0_S:I I1_lin_default_nf_0_R0_D:I 
+*.PININFO I1_lin_default_nf_0_R0_G:I I1_lin_default_nf_0_R0_S:I 
+*.PININFO I1_lin_default_nf_1_R0_D:I I1_lin_default_nf_1_R0_G:I 
+*.PININFO I1_lin_default_nf_1_R0_S:I I1_lin_default_nf_2_R0_D:I 
+*.PININFO I1_lin_default_nf_2_R0_G:I I1_lin_default_nf_2_R0_S:I 
+*.PININFO I1_lin_default_nf_3_R0_D:I I1_lin_default_nf_3_R0_G:I 
+*.PININFO I1_lin_default_nf_3_R0_S:I I1_lin_default_nf_4_R0_D:I 
+*.PININFO I1_lin_default_nf_4_R0_G:I I1_lin_default_nf_4_R0_S:I 
+*.PININFO I1_lin_default_nf_5_R0_D:I I1_lin_default_nf_5_R0_G:I 
+*.PININFO I1_lin_default_nf_5_R0_S:I I1_lin_default_nf_6_R0_D:I 
+*.PININFO I1_lin_default_nf_6_R0_G:I I1_lin_default_nf_6_R0_S:I 
+*.PININFO I1_lin_default_nf_7_R0_D:I I1_lin_default_nf_7_R0_G:I 
+*.PININFO I1_lin_default_nf_7_R0_S:I I1_lin_default_nf_8_R0_D:I 
+*.PININFO I1_lin_default_nf_8_R0_G:I I1_lin_default_nf_8_R0_S:I 
+*.PININFO I1_lin_default_nf_9_R0_D:I I1_lin_default_nf_9_R0_G:I 
+*.PININFO I1_lin_default_nf_9_R0_S:I I1_lin_default_nf_10_R0_D:I 
+*.PININFO I1_lin_default_nf_10_R0_G:I I1_lin_default_nf_10_R0_S:I 
+*.PININFO I1_lin_default_nf_11_R0_D:I I1_lin_default_nf_11_R0_G:I 
+*.PININFO I1_lin_default_nf_11_R0_S:I I1_lin_default_nf_12_R0_D:I 
+*.PININFO I1_lin_default_nf_12_R0_G:I I1_lin_default_nf_12_R0_S:I 
+*.PININFO I1_lin_default_nf_13_R0_D:I I1_lin_default_nf_13_R0_G:I 
+*.PININFO I1_lin_default_nf_13_R0_S:I I1_lin_default_psub_tap_0_R0_D:I 
+*.PININFO I1_lin_default_psub_tap_0_R0_G:I I1_lin_default_psub_tap_0_R0_S:I 
+*.PININFO I1_lin_default_s_sab_0_R0_D:I I1_lin_default_s_sab_0_R0_G:I 
+*.PININFO I1_lin_default_s_sab_0_R0_S:I I1_lin_default_s_sab_1_R0_D:I 
+*.PININFO I1_lin_default_s_sab_1_R0_G:I I1_lin_default_s_sab_1_R0_S:I 
+*.PININFO I1_lin_default_s_sab_2_R0_D:I I1_lin_default_s_sab_2_R0_G:I 
+*.PININFO I1_lin_default_s_sab_2_R0_S:I I1_lin_default_s_sab_3_R0_D:I 
+*.PININFO I1_lin_default_s_sab_3_R0_G:I I1_lin_default_s_sab_3_R0_S:I 
+*.PININFO I1_lin_default_s_sab_4_R0_D:I I1_lin_default_s_sab_4_R0_G:I 
+*.PININFO I1_lin_default_s_sab_4_R0_S:I I1_lin_default_s_sab_5_R0_D:I 
+*.PININFO I1_lin_default_s_sab_5_R0_G:I I1_lin_default_s_sab_5_R0_S:I 
+*.PININFO I1_lin_default_s_sab_6_R0_D:I I1_lin_default_s_sab_6_R0_G:I 
+*.PININFO I1_lin_default_s_sab_6_R0_S:I I1_lin_default_s_sab_7_R0_D:I 
+*.PININFO I1_lin_default_s_sab_7_R0_G:I I1_lin_default_s_sab_7_R0_S:I 
+*.PININFO I1_lin_default_strapSD_0_R0_D:I I1_lin_default_strapSD_0_R0_G:I 
+*.PININFO I1_lin_default_strapSD_0_R0_S:I I1_lin_default_wf_0_R0_D:I 
+*.PININFO I1_lin_default_wf_0_R0_G:I I1_lin_default_wf_0_R0_S:I 
+*.PININFO I1_lin_default_wf_1_R0_D:I I1_lin_default_wf_1_R0_G:I 
+*.PININFO I1_lin_default_wf_1_R0_S:I I1_lin_default_wf_2_R0_D:I 
+*.PININFO I1_lin_default_wf_2_R0_G:I I1_lin_default_wf_2_R0_S:I 
+*.PININFO I1_lin_default_wf_3_R0_D:I I1_lin_default_wf_3_R0_G:I 
+*.PININFO I1_lin_default_wf_3_R0_S:I I1_lin_default_wf_4_R0_D:I 
+*.PININFO I1_lin_default_wf_4_R0_G:I I1_lin_default_wf_4_R0_S:I 
+*.PININFO I1_lin_default_wf_5_R0_D:I I1_lin_default_wf_5_R0_G:I 
+*.PININFO I1_lin_default_wf_5_R0_S:I I1_lin_default_wf_6_R0_D:I 
+*.PININFO I1_lin_default_wf_6_R0_G:I I1_lin_default_wf_6_R0_S:I 
+*.PININFO I1_lin_default_wf_7_R0_D:I I1_lin_default_wf_7_R0_G:I 
+*.PININFO I1_lin_default_wf_7_R0_S:I vdd!:I
+MI1_lin_default_wf_7_R0 I1_lin_default_wf_7_R0_D I1_lin_default_wf_7_R0_G 
++ I1_lin_default_wf_7_R0_S vdd! nfet_01v8_dn_dss m=1 w=480.000u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_6_R0 I1_lin_default_wf_6_R0_D I1_lin_default_wf_6_R0_G 
++ I1_lin_default_wf_6_R0_S vdd! nfet_01v8_dn_dss m=1 w=477.760u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_5_R0 I1_lin_default_wf_5_R0_D I1_lin_default_wf_5_R0_G 
++ I1_lin_default_wf_5_R0_S vdd! nfet_01v8_dn_dss m=1 w=398.120u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_4_R0 I1_lin_default_wf_4_R0_D I1_lin_default_wf_4_R0_G 
++ I1_lin_default_wf_4_R0_S vdd! nfet_01v8_dn_dss m=1 w=331.760u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_3_R0 I1_lin_default_wf_3_R0_D I1_lin_default_wf_3_R0_G 
++ I1_lin_default_wf_3_R0_S vdd! nfet_01v8_dn_dss m=1 w=276.480u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_2_R0 I1_lin_default_wf_2_R0_D I1_lin_default_wf_2_R0_G 
++ I1_lin_default_wf_2_R0_S vdd! nfet_01v8_dn_dss m=1 w=230.400u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_1_R0 I1_lin_default_wf_1_R0_D I1_lin_default_wf_1_R0_G 
++ I1_lin_default_wf_1_R0_S vdd! nfet_01v8_dn_dss m=1 w=192.000u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_0_R0 I1_lin_default_wf_0_R0_D I1_lin_default_wf_0_R0_G 
++ I1_lin_default_wf_0_R0_S vdd! nfet_01v8_dn_dss m=1 w=160.000u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_l_3_R0 I1_lin_default_l_3_R0_D I1_lin_default_l_3_R0_G 
++ I1_lin_default_l_3_R0_S vdd! nfet_01v8_dn_dss m=1 w=200u l=0.500u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_l_2_R0 I1_lin_default_l_2_R0_D I1_lin_default_l_2_R0_G 
++ I1_lin_default_l_2_R0_S vdd! nfet_01v8_dn_dss m=1 w=200u l=0.430u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_l_1_R0 I1_lin_default_l_1_R0_D I1_lin_default_l_1_R0_G 
++ I1_lin_default_l_1_R0_S vdd! nfet_01v8_dn_dss m=1 w=200u l=0.360u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_l_0_R0 I1_lin_default_l_0_R0_D I1_lin_default_l_0_R0_G 
++ I1_lin_default_l_0_R0_S vdd! nfet_01v8_dn_dss m=1 w=200u l=0.300u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_d_sab_9_R0 I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=3.780u par=1 dtemp=0
+MI1_lin_default_d_sab_8_R0 I1_lin_default_d_sab_8_R0_D 
++ I1_lin_default_d_sab_8_R0_G I1_lin_default_d_sab_8_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=3.355u par=1 dtemp=0
+MI1_lin_default_d_sab_7_R0 I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=2.795u par=1 dtemp=0
+MI1_lin_default_d_sab_6_R0 I1_lin_default_d_sab_6_R0_D 
++ I1_lin_default_d_sab_6_R0_G I1_lin_default_d_sab_6_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=2.330u par=1 dtemp=0
+MI1_lin_default_d_sab_5_R0 I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.940u par=1 dtemp=0
+MI1_lin_default_d_sab_4_R0 I1_lin_default_d_sab_4_R0_D 
++ I1_lin_default_d_sab_4_R0_G I1_lin_default_d_sab_4_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.615u par=1 dtemp=0
+MI1_lin_default_d_sab_3_R0 I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.350u par=1 dtemp=0
+MI1_lin_default_d_sab_2_R0 I1_lin_default_d_sab_2_R0_D 
++ I1_lin_default_d_sab_2_R0_G I1_lin_default_d_sab_2_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.125u par=1 dtemp=0
+MI1_lin_default_d_sab_1_R0 I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=0.935u par=1 dtemp=0
+MI1_lin_default_d_sab_0_R0 I1_lin_default_d_sab_0_R0_D 
++ I1_lin_default_d_sab_0_R0_G I1_lin_default_d_sab_0_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=0.780u par=1 dtemp=0
+MI1_lin_default_s_sab_7_R0 I1_lin_default_s_sab_7_R0_D 
++ I1_lin_default_s_sab_7_R0_G I1_lin_default_s_sab_7_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.780u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_6_R0 I1_lin_default_s_sab_6_R0_D 
++ I1_lin_default_s_sab_6_R0_G I1_lin_default_s_sab_6_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.655u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_5_R0 I1_lin_default_s_sab_5_R0_D 
++ I1_lin_default_s_sab_5_R0_G I1_lin_default_s_sab_5_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.545u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_4_R0 I1_lin_default_s_sab_4_R0_D 
++ I1_lin_default_s_sab_4_R0_G I1_lin_default_s_sab_4_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.455u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_3_R0 I1_lin_default_s_sab_3_R0_D 
++ I1_lin_default_s_sab_3_R0_G I1_lin_default_s_sab_3_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.380u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_2_R0 I1_lin_default_s_sab_2_R0_D 
++ I1_lin_default_s_sab_2_R0_G I1_lin_default_s_sab_2_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.315u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_1_R0 I1_lin_default_s_sab_1_R0_D 
++ I1_lin_default_s_sab_1_R0_G I1_lin_default_s_sab_1_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.265u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_0_R0 I1_lin_default_s_sab_0_R0_D 
++ I1_lin_default_s_sab_0_R0_G I1_lin_default_s_sab_0_R0_S vdd! nfet_01v8_dn_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.220u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_13_R0 I1_lin_default_nf_13_R0_D I1_lin_default_nf_13_R0_G 
++ I1_lin_default_nf_13_R0_S vdd! nfet_01v8_dn_dss m=1 w=400.000u l=0.3u nf=16 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_12_R0 I1_lin_default_nf_12_R0_D I1_lin_default_nf_12_R0_G 
++ I1_lin_default_nf_12_R0_S vdd! nfet_01v8_dn_dss m=1 w=400.000u l=0.3u nf=16 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_11_R0 I1_lin_default_nf_11_R0_D I1_lin_default_nf_11_R0_G 
++ I1_lin_default_nf_11_R0_S vdd! nfet_01v8_dn_dss m=1 w=350.000u l=0.3u nf=14 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_10_R0 I1_lin_default_nf_10_R0_D I1_lin_default_nf_10_R0_G 
++ I1_lin_default_nf_10_R0_S vdd! nfet_01v8_dn_dss m=1 w=350.000u l=0.3u nf=14 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_9_R0 I1_lin_default_nf_9_R0_D I1_lin_default_nf_9_R0_G 
++ I1_lin_default_nf_9_R0_S vdd! nfet_01v8_dn_dss m=1 w=300.000u l=0.3u nf=12 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_8_R0 I1_lin_default_nf_8_R0_D I1_lin_default_nf_8_R0_G 
++ I1_lin_default_nf_8_R0_S vdd! nfet_01v8_dn_dss m=1 w=300.000u l=0.3u nf=12 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_7_R0 I1_lin_default_nf_7_R0_D I1_lin_default_nf_7_R0_G 
++ I1_lin_default_nf_7_R0_S vdd! nfet_01v8_dn_dss m=1 w=250.000u l=0.3u nf=10 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_6_R0 I1_lin_default_nf_6_R0_D I1_lin_default_nf_6_R0_G 
++ I1_lin_default_nf_6_R0_S vdd! nfet_01v8_dn_dss m=1 w=250.000u l=0.3u nf=10 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_5_R0 I1_lin_default_nf_5_R0_D I1_lin_default_nf_5_R0_G 
++ I1_lin_default_nf_5_R0_S vdd! nfet_01v8_dn_dss m=1 w=200.000u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_4_R0 I1_lin_default_nf_4_R0_D I1_lin_default_nf_4_R0_G 
++ I1_lin_default_nf_4_R0_S vdd! nfet_01v8_dn_dss m=1 w=200.000u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_3_R0 I1_lin_default_nf_3_R0_D I1_lin_default_nf_3_R0_G 
++ I1_lin_default_nf_3_R0_S vdd! nfet_01v8_dn_dss m=1 w=150.000u l=0.3u nf=6 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_2_R0 I1_lin_default_nf_2_R0_D I1_lin_default_nf_2_R0_G 
++ I1_lin_default_nf_2_R0_S vdd! nfet_01v8_dn_dss m=1 w=150.000u l=0.3u nf=6 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_1_R0 I1_lin_default_nf_1_R0_D I1_lin_default_nf_1_R0_G 
++ I1_lin_default_nf_1_R0_S vdd! nfet_01v8_dn_dss m=1 w=100.000u l=0.3u nf=4 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_0_R0 I1_lin_default_nf_0_R0_D I1_lin_default_nf_0_R0_G 
++ I1_lin_default_nf_0_R0_S vdd! nfet_01v8_dn_dss m=1 w=100.000u l=0.3u nf=4 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_m_2_R0 I1_lin_default_m_2_R0_D I1_lin_default_m_2_R0_G 
++ I1_lin_default_m_2_R0_S vdd! nfet_01v8_dn_dss m=3 w=200u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=3 dtemp=0
+MI1_lin_default_m_1_R0 I1_lin_default_m_1_R0_D I1_lin_default_m_1_R0_G 
++ I1_lin_default_m_1_R0_S vdd! nfet_01v8_dn_dss m=2 w=200u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=2 dtemp=0
+MI1_lin_default_m_0_R0 I1_lin_default_m_0_R0_D I1_lin_default_m_0_R0_G 
++ I1_lin_default_m_0_R0_S vdd! nfet_01v8_dn_dss m=1 w=200u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_gns_1_R0 I1_lin_default_gns_1_R0_D I1_lin_default_gns_1_R0_G 
++ I1_lin_default_gns_1_R0_S vdd! nfet_01v8_dn_dss m=1 w=200u l=0.3u nf=8 
++ s_sab=0 d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_gns_0_R0 I1_lin_default_gns_0_R0_D I1_lin_default_gns_0_R0_G 
++ I1_lin_default_gns_0_R0_S vdd! nfet_01v8_dn_dss m=1 w=200u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_guardRing_1_R0 I1_lin_default_guardRing_1_R0_D 
++ I1_lin_default_guardRing_1_R0_G I1_lin_default_guardRing_1_R0_S vdd! 
++ nfet_01v8_dn_dss m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_guardRing_0_R0 I1_lin_default_guardRing_0_R0_D 
++ I1_lin_default_guardRing_0_R0_G I1_lin_default_guardRing_0_R0_S vdd! 
++ nfet_01v8_dn_dss m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_strapSD_0_R0 I1_lin_default_strapSD_0_R0_D 
++ I1_lin_default_strapSD_0_R0_G I1_lin_default_strapSD_0_R0_S vdd! 
++ nfet_01v8_dn_dss m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_psub_tap_0_R0 I1_lin_default_psub_tap_0_R0_D 
++ I1_lin_default_psub_tap_0_R0_G I1_lin_default_psub_tap_0_R0_S vdd! 
++ nfet_01v8_dn_dss m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_default I1_default_D I1_default_G I1_default_S vdd! nfet_01v8_dn_dss m=1 
++ w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+.ENDS
+
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_01v8_dss.cdl b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_01v8_dss.cdl
new file mode 100644
index 0000000..aa0e78e
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_01v8_dss.cdl
@@ -0,0 +1,306 @@
+************************************************************************
+* auCdl Netlist:
+* 
+* Library Name:  TCG_library_2
+* Top Cell Name: nfet_01v8_dss
+* View Name:     schematic
+* Netlisted on:  Sep 10 16:34:07 2021
+************************************************************************
+
+*.EQUATION
+*.SCALE METER
+*.MEGA
+.PARAM
+
+*.GLOBAL vdd!
+
+*.PIN vdd!
+
+************************************************************************
+* Library Name: TCG_library_2
+* Cell Name:    nfet_01v8_dss
+* View Name:    schematic
+************************************************************************
+
+.SUBCKT nfet_01v8_dss I1_default_D I1_default_G I1_default_S 
++ I1_lin_default_d_sab_0_R0_D I1_lin_default_d_sab_0_R0_G 
++ I1_lin_default_d_sab_0_R0_S I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S 
++ I1_lin_default_d_sab_2_R0_D I1_lin_default_d_sab_2_R0_G 
++ I1_lin_default_d_sab_2_R0_S I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S 
++ I1_lin_default_d_sab_4_R0_D I1_lin_default_d_sab_4_R0_G 
++ I1_lin_default_d_sab_4_R0_S I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S 
++ I1_lin_default_d_sab_6_R0_D I1_lin_default_d_sab_6_R0_G 
++ I1_lin_default_d_sab_6_R0_S I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S 
++ I1_lin_default_d_sab_8_R0_D I1_lin_default_d_sab_8_R0_G 
++ I1_lin_default_d_sab_8_R0_S I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S 
++ I1_lin_default_guardRing_0_R0_D I1_lin_default_guardRing_0_R0_G 
++ I1_lin_default_guardRing_0_R0_S I1_lin_default_l_0_R0_D 
++ I1_lin_default_l_0_R0_G I1_lin_default_l_0_R0_S I1_lin_default_l_1_R0_D 
++ I1_lin_default_l_1_R0_G I1_lin_default_l_1_R0_S I1_lin_default_l_2_R0_D 
++ I1_lin_default_l_2_R0_G I1_lin_default_l_2_R0_S I1_lin_default_l_3_R0_D 
++ I1_lin_default_l_3_R0_G I1_lin_default_l_3_R0_S I1_lin_default_m_0_R0_D 
++ I1_lin_default_m_0_R0_G I1_lin_default_m_0_R0_S I1_lin_default_m_1_R0_D 
++ I1_lin_default_m_1_R0_G I1_lin_default_m_1_R0_S I1_lin_default_m_2_R0_D 
++ I1_lin_default_m_2_R0_G I1_lin_default_m_2_R0_S I1_lin_default_nf_0_R0_D 
++ I1_lin_default_nf_0_R0_G I1_lin_default_nf_0_R0_S I1_lin_default_nf_1_R0_D 
++ I1_lin_default_nf_1_R0_G I1_lin_default_nf_1_R0_S I1_lin_default_nf_2_R0_D 
++ I1_lin_default_nf_2_R0_G I1_lin_default_nf_2_R0_S I1_lin_default_nf_3_R0_D 
++ I1_lin_default_nf_3_R0_G I1_lin_default_nf_3_R0_S I1_lin_default_nf_4_R0_D 
++ I1_lin_default_nf_4_R0_G I1_lin_default_nf_4_R0_S I1_lin_default_nf_5_R0_D 
++ I1_lin_default_nf_5_R0_G I1_lin_default_nf_5_R0_S I1_lin_default_nf_6_R0_D 
++ I1_lin_default_nf_6_R0_G I1_lin_default_nf_6_R0_S I1_lin_default_nf_7_R0_D 
++ I1_lin_default_nf_7_R0_G I1_lin_default_nf_7_R0_S I1_lin_default_nf_8_R0_D 
++ I1_lin_default_nf_8_R0_G I1_lin_default_nf_8_R0_S I1_lin_default_nf_9_R0_D 
++ I1_lin_default_nf_9_R0_G I1_lin_default_nf_9_R0_S I1_lin_default_nf_10_R0_D 
++ I1_lin_default_nf_10_R0_G I1_lin_default_nf_10_R0_S 
++ I1_lin_default_nf_11_R0_D I1_lin_default_nf_11_R0_G 
++ I1_lin_default_nf_11_R0_S I1_lin_default_nf_12_R0_D 
++ I1_lin_default_nf_12_R0_G I1_lin_default_nf_12_R0_S 
++ I1_lin_default_s_sab_0_R0_D I1_lin_default_s_sab_0_R0_G 
++ I1_lin_default_s_sab_0_R0_S I1_lin_default_s_sab_1_R0_D 
++ I1_lin_default_s_sab_1_R0_G I1_lin_default_s_sab_1_R0_S 
++ I1_lin_default_s_sab_2_R0_D I1_lin_default_s_sab_2_R0_G 
++ I1_lin_default_s_sab_2_R0_S I1_lin_default_s_sab_3_R0_D 
++ I1_lin_default_s_sab_3_R0_G I1_lin_default_s_sab_3_R0_S 
++ I1_lin_default_s_sab_4_R0_D I1_lin_default_s_sab_4_R0_G 
++ I1_lin_default_s_sab_4_R0_S I1_lin_default_s_sab_5_R0_D 
++ I1_lin_default_s_sab_5_R0_G I1_lin_default_s_sab_5_R0_S 
++ I1_lin_default_s_sab_6_R0_D I1_lin_default_s_sab_6_R0_G 
++ I1_lin_default_s_sab_6_R0_S I1_lin_default_s_sab_7_R0_D 
++ I1_lin_default_s_sab_7_R0_G I1_lin_default_s_sab_7_R0_S 
++ I1_lin_default_strapSD_0_R0_D I1_lin_default_strapSD_0_R0_G 
++ I1_lin_default_strapSD_0_R0_S I1_lin_default_wf_0_R0_D 
++ I1_lin_default_wf_0_R0_G I1_lin_default_wf_0_R0_S I1_lin_default_wf_1_R0_D 
++ I1_lin_default_wf_1_R0_G I1_lin_default_wf_1_R0_S I1_lin_default_wf_2_R0_D 
++ I1_lin_default_wf_2_R0_G I1_lin_default_wf_2_R0_S I1_lin_default_wf_3_R0_D 
++ I1_lin_default_wf_3_R0_G I1_lin_default_wf_3_R0_S I1_lin_default_wf_4_R0_D 
++ I1_lin_default_wf_4_R0_G I1_lin_default_wf_4_R0_S I1_lin_default_wf_5_R0_D 
++ I1_lin_default_wf_5_R0_G I1_lin_default_wf_5_R0_S I1_lin_default_wf_6_R0_D 
++ I1_lin_default_wf_6_R0_G I1_lin_default_wf_6_R0_S I1_lin_default_wf_7_R0_D 
++ I1_lin_default_wf_7_R0_G I1_lin_default_wf_7_R0_S vdd!
+*.PININFO I1_default_D:I I1_default_G:I I1_default_S:I 
+*.PININFO I1_lin_default_d_sab_0_R0_D:I I1_lin_default_d_sab_0_R0_G:I 
+*.PININFO I1_lin_default_d_sab_0_R0_S:I I1_lin_default_d_sab_1_R0_D:I 
+*.PININFO I1_lin_default_d_sab_1_R0_G:I I1_lin_default_d_sab_1_R0_S:I 
+*.PININFO I1_lin_default_d_sab_2_R0_D:I I1_lin_default_d_sab_2_R0_G:I 
+*.PININFO I1_lin_default_d_sab_2_R0_S:I I1_lin_default_d_sab_3_R0_D:I 
+*.PININFO I1_lin_default_d_sab_3_R0_G:I I1_lin_default_d_sab_3_R0_S:I 
+*.PININFO I1_lin_default_d_sab_4_R0_D:I I1_lin_default_d_sab_4_R0_G:I 
+*.PININFO I1_lin_default_d_sab_4_R0_S:I I1_lin_default_d_sab_5_R0_D:I 
+*.PININFO I1_lin_default_d_sab_5_R0_G:I I1_lin_default_d_sab_5_R0_S:I 
+*.PININFO I1_lin_default_d_sab_6_R0_D:I I1_lin_default_d_sab_6_R0_G:I 
+*.PININFO I1_lin_default_d_sab_6_R0_S:I I1_lin_default_d_sab_7_R0_D:I 
+*.PININFO I1_lin_default_d_sab_7_R0_G:I I1_lin_default_d_sab_7_R0_S:I 
+*.PININFO I1_lin_default_d_sab_8_R0_D:I I1_lin_default_d_sab_8_R0_G:I 
+*.PININFO I1_lin_default_d_sab_8_R0_S:I I1_lin_default_d_sab_9_R0_D:I 
+*.PININFO I1_lin_default_d_sab_9_R0_G:I I1_lin_default_d_sab_9_R0_S:I 
+*.PININFO I1_lin_default_guardRing_0_R0_D:I I1_lin_default_guardRing_0_R0_G:I 
+*.PININFO I1_lin_default_guardRing_0_R0_S:I I1_lin_default_l_0_R0_D:I 
+*.PININFO I1_lin_default_l_0_R0_G:I I1_lin_default_l_0_R0_S:I 
+*.PININFO I1_lin_default_l_1_R0_D:I I1_lin_default_l_1_R0_G:I 
+*.PININFO I1_lin_default_l_1_R0_S:I I1_lin_default_l_2_R0_D:I 
+*.PININFO I1_lin_default_l_2_R0_G:I I1_lin_default_l_2_R0_S:I 
+*.PININFO I1_lin_default_l_3_R0_D:I I1_lin_default_l_3_R0_G:I 
+*.PININFO I1_lin_default_l_3_R0_S:I I1_lin_default_m_0_R0_D:I 
+*.PININFO I1_lin_default_m_0_R0_G:I I1_lin_default_m_0_R0_S:I 
+*.PININFO I1_lin_default_m_1_R0_D:I I1_lin_default_m_1_R0_G:I 
+*.PININFO I1_lin_default_m_1_R0_S:I I1_lin_default_m_2_R0_D:I 
+*.PININFO I1_lin_default_m_2_R0_G:I I1_lin_default_m_2_R0_S:I 
+*.PININFO I1_lin_default_nf_0_R0_D:I I1_lin_default_nf_0_R0_G:I 
+*.PININFO I1_lin_default_nf_0_R0_S:I I1_lin_default_nf_1_R0_D:I 
+*.PININFO I1_lin_default_nf_1_R0_G:I I1_lin_default_nf_1_R0_S:I 
+*.PININFO I1_lin_default_nf_2_R0_D:I I1_lin_default_nf_2_R0_G:I 
+*.PININFO I1_lin_default_nf_2_R0_S:I I1_lin_default_nf_3_R0_D:I 
+*.PININFO I1_lin_default_nf_3_R0_G:I I1_lin_default_nf_3_R0_S:I 
+*.PININFO I1_lin_default_nf_4_R0_D:I I1_lin_default_nf_4_R0_G:I 
+*.PININFO I1_lin_default_nf_4_R0_S:I I1_lin_default_nf_5_R0_D:I 
+*.PININFO I1_lin_default_nf_5_R0_G:I I1_lin_default_nf_5_R0_S:I 
+*.PININFO I1_lin_default_nf_6_R0_D:I I1_lin_default_nf_6_R0_G:I 
+*.PININFO I1_lin_default_nf_6_R0_S:I I1_lin_default_nf_7_R0_D:I 
+*.PININFO I1_lin_default_nf_7_R0_G:I I1_lin_default_nf_7_R0_S:I 
+*.PININFO I1_lin_default_nf_8_R0_D:I I1_lin_default_nf_8_R0_G:I 
+*.PININFO I1_lin_default_nf_8_R0_S:I I1_lin_default_nf_9_R0_D:I 
+*.PININFO I1_lin_default_nf_9_R0_G:I I1_lin_default_nf_9_R0_S:I 
+*.PININFO I1_lin_default_nf_10_R0_D:I I1_lin_default_nf_10_R0_G:I 
+*.PININFO I1_lin_default_nf_10_R0_S:I I1_lin_default_nf_11_R0_D:I 
+*.PININFO I1_lin_default_nf_11_R0_G:I I1_lin_default_nf_11_R0_S:I 
+*.PININFO I1_lin_default_nf_12_R0_D:I I1_lin_default_nf_12_R0_G:I 
+*.PININFO I1_lin_default_nf_12_R0_S:I I1_lin_default_s_sab_0_R0_D:I 
+*.PININFO I1_lin_default_s_sab_0_R0_G:I I1_lin_default_s_sab_0_R0_S:I 
+*.PININFO I1_lin_default_s_sab_1_R0_D:I I1_lin_default_s_sab_1_R0_G:I 
+*.PININFO I1_lin_default_s_sab_1_R0_S:I I1_lin_default_s_sab_2_R0_D:I 
+*.PININFO I1_lin_default_s_sab_2_R0_G:I I1_lin_default_s_sab_2_R0_S:I 
+*.PININFO I1_lin_default_s_sab_3_R0_D:I I1_lin_default_s_sab_3_R0_G:I 
+*.PININFO I1_lin_default_s_sab_3_R0_S:I I1_lin_default_s_sab_4_R0_D:I 
+*.PININFO I1_lin_default_s_sab_4_R0_G:I I1_lin_default_s_sab_4_R0_S:I 
+*.PININFO I1_lin_default_s_sab_5_R0_D:I I1_lin_default_s_sab_5_R0_G:I 
+*.PININFO I1_lin_default_s_sab_5_R0_S:I I1_lin_default_s_sab_6_R0_D:I 
+*.PININFO I1_lin_default_s_sab_6_R0_G:I I1_lin_default_s_sab_6_R0_S:I 
+*.PININFO I1_lin_default_s_sab_7_R0_D:I I1_lin_default_s_sab_7_R0_G:I 
+*.PININFO I1_lin_default_s_sab_7_R0_S:I I1_lin_default_strapSD_0_R0_D:I 
+*.PININFO I1_lin_default_strapSD_0_R0_G:I I1_lin_default_strapSD_0_R0_S:I 
+*.PININFO I1_lin_default_wf_0_R0_D:I I1_lin_default_wf_0_R0_G:I 
+*.PININFO I1_lin_default_wf_0_R0_S:I I1_lin_default_wf_1_R0_D:I 
+*.PININFO I1_lin_default_wf_1_R0_G:I I1_lin_default_wf_1_R0_S:I 
+*.PININFO I1_lin_default_wf_2_R0_D:I I1_lin_default_wf_2_R0_G:I 
+*.PININFO I1_lin_default_wf_2_R0_S:I I1_lin_default_wf_3_R0_D:I 
+*.PININFO I1_lin_default_wf_3_R0_G:I I1_lin_default_wf_3_R0_S:I 
+*.PININFO I1_lin_default_wf_4_R0_D:I I1_lin_default_wf_4_R0_G:I 
+*.PININFO I1_lin_default_wf_4_R0_S:I I1_lin_default_wf_5_R0_D:I 
+*.PININFO I1_lin_default_wf_5_R0_G:I I1_lin_default_wf_5_R0_S:I 
+*.PININFO I1_lin_default_wf_6_R0_D:I I1_lin_default_wf_6_R0_G:I 
+*.PININFO I1_lin_default_wf_6_R0_S:I I1_lin_default_wf_7_R0_D:I 
+*.PININFO I1_lin_default_wf_7_R0_G:I I1_lin_default_wf_7_R0_S:I vdd!:I
+MI1_lin_default_wf_7_R0 I1_lin_default_wf_7_R0_D I1_lin_default_wf_7_R0_G 
++ I1_lin_default_wf_7_R0_S vdd! nfet_01v8_dss m=1 w=480.000u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_6_R0 I1_lin_default_wf_6_R0_D I1_lin_default_wf_6_R0_G 
++ I1_lin_default_wf_6_R0_S vdd! nfet_01v8_dss m=1 w=477.760u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_5_R0 I1_lin_default_wf_5_R0_D I1_lin_default_wf_5_R0_G 
++ I1_lin_default_wf_5_R0_S vdd! nfet_01v8_dss m=1 w=398.120u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_4_R0 I1_lin_default_wf_4_R0_D I1_lin_default_wf_4_R0_G 
++ I1_lin_default_wf_4_R0_S vdd! nfet_01v8_dss m=1 w=331.760u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_3_R0 I1_lin_default_wf_3_R0_D I1_lin_default_wf_3_R0_G 
++ I1_lin_default_wf_3_R0_S vdd! nfet_01v8_dss m=1 w=276.480u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_2_R0 I1_lin_default_wf_2_R0_D I1_lin_default_wf_2_R0_G 
++ I1_lin_default_wf_2_R0_S vdd! nfet_01v8_dss m=1 w=230.400u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_1_R0 I1_lin_default_wf_1_R0_D I1_lin_default_wf_1_R0_G 
++ I1_lin_default_wf_1_R0_S vdd! nfet_01v8_dss m=1 w=192.000u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_wf_0_R0 I1_lin_default_wf_0_R0_D I1_lin_default_wf_0_R0_G 
++ I1_lin_default_wf_0_R0_S vdd! nfet_01v8_dss m=1 w=160.000u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_l_3_R0 I1_lin_default_l_3_R0_D I1_lin_default_l_3_R0_G 
++ I1_lin_default_l_3_R0_S vdd! nfet_01v8_dss m=1 w=200u l=0.500u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_l_2_R0 I1_lin_default_l_2_R0_D I1_lin_default_l_2_R0_G 
++ I1_lin_default_l_2_R0_S vdd! nfet_01v8_dss m=1 w=200u l=0.430u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_l_1_R0 I1_lin_default_l_1_R0_D I1_lin_default_l_1_R0_G 
++ I1_lin_default_l_1_R0_S vdd! nfet_01v8_dss m=1 w=200u l=0.360u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_l_0_R0 I1_lin_default_l_0_R0_D I1_lin_default_l_0_R0_G 
++ I1_lin_default_l_0_R0_S vdd! nfet_01v8_dss m=1 w=200u l=0.300u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_d_sab_9_R0 I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=3.780u par=1 dtemp=0
+MI1_lin_default_d_sab_8_R0 I1_lin_default_d_sab_8_R0_D 
++ I1_lin_default_d_sab_8_R0_G I1_lin_default_d_sab_8_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=3.355u par=1 dtemp=0
+MI1_lin_default_d_sab_7_R0 I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=2.795u par=1 dtemp=0
+MI1_lin_default_d_sab_6_R0 I1_lin_default_d_sab_6_R0_D 
++ I1_lin_default_d_sab_6_R0_G I1_lin_default_d_sab_6_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=2.330u par=1 dtemp=0
+MI1_lin_default_d_sab_5_R0 I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.940u par=1 dtemp=0
+MI1_lin_default_d_sab_4_R0 I1_lin_default_d_sab_4_R0_D 
++ I1_lin_default_d_sab_4_R0_G I1_lin_default_d_sab_4_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.615u par=1 dtemp=0
+MI1_lin_default_d_sab_3_R0 I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.350u par=1 dtemp=0
+MI1_lin_default_d_sab_2_R0 I1_lin_default_d_sab_2_R0_D 
++ I1_lin_default_d_sab_2_R0_G I1_lin_default_d_sab_2_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.125u par=1 dtemp=0
+MI1_lin_default_d_sab_1_R0 I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=0.935u par=1 dtemp=0
+MI1_lin_default_d_sab_0_R0 I1_lin_default_d_sab_0_R0_D 
++ I1_lin_default_d_sab_0_R0_G I1_lin_default_d_sab_0_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=0.780u par=1 dtemp=0
+MI1_lin_default_s_sab_7_R0 I1_lin_default_s_sab_7_R0_D 
++ I1_lin_default_s_sab_7_R0_G I1_lin_default_s_sab_7_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.780u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_6_R0 I1_lin_default_s_sab_6_R0_D 
++ I1_lin_default_s_sab_6_R0_G I1_lin_default_s_sab_6_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.655u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_5_R0 I1_lin_default_s_sab_5_R0_D 
++ I1_lin_default_s_sab_5_R0_G I1_lin_default_s_sab_5_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.545u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_4_R0 I1_lin_default_s_sab_4_R0_D 
++ I1_lin_default_s_sab_4_R0_G I1_lin_default_s_sab_4_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.455u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_3_R0 I1_lin_default_s_sab_3_R0_D 
++ I1_lin_default_s_sab_3_R0_G I1_lin_default_s_sab_3_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.380u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_2_R0 I1_lin_default_s_sab_2_R0_D 
++ I1_lin_default_s_sab_2_R0_G I1_lin_default_s_sab_2_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.315u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_1_R0 I1_lin_default_s_sab_1_R0_D 
++ I1_lin_default_s_sab_1_R0_G I1_lin_default_s_sab_1_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.265u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_s_sab_0_R0 I1_lin_default_s_sab_0_R0_D 
++ I1_lin_default_s_sab_0_R0_G I1_lin_default_s_sab_0_R0_S vdd! nfet_01v8_dss 
++ m=1 w=200u l=0.3u nf=8 s_sab=0.220u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_12_R0 I1_lin_default_nf_12_R0_D I1_lin_default_nf_12_R0_G 
++ I1_lin_default_nf_12_R0_S vdd! nfet_01v8_dss m=1 w=400.000u l=0.3u nf=16 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_11_R0 I1_lin_default_nf_11_R0_D I1_lin_default_nf_11_R0_G 
++ I1_lin_default_nf_11_R0_S vdd! nfet_01v8_dss m=1 w=400.000u l=0.3u nf=16 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_10_R0 I1_lin_default_nf_10_R0_D I1_lin_default_nf_10_R0_G 
++ I1_lin_default_nf_10_R0_S vdd! nfet_01v8_dss m=1 w=350.000u l=0.3u nf=14 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_9_R0 I1_lin_default_nf_9_R0_D I1_lin_default_nf_9_R0_G 
++ I1_lin_default_nf_9_R0_S vdd! nfet_01v8_dss m=1 w=350.000u l=0.3u nf=14 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_8_R0 I1_lin_default_nf_8_R0_D I1_lin_default_nf_8_R0_G 
++ I1_lin_default_nf_8_R0_S vdd! nfet_01v8_dss m=1 w=300.000u l=0.3u nf=12 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_7_R0 I1_lin_default_nf_7_R0_D I1_lin_default_nf_7_R0_G 
++ I1_lin_default_nf_7_R0_S vdd! nfet_01v8_dss m=1 w=300.000u l=0.3u nf=12 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_6_R0 I1_lin_default_nf_6_R0_D I1_lin_default_nf_6_R0_G 
++ I1_lin_default_nf_6_R0_S vdd! nfet_01v8_dss m=1 w=250.000u l=0.3u nf=10 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_5_R0 I1_lin_default_nf_5_R0_D I1_lin_default_nf_5_R0_G 
++ I1_lin_default_nf_5_R0_S vdd! nfet_01v8_dss m=1 w=250.000u l=0.3u nf=10 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_4_R0 I1_lin_default_nf_4_R0_D I1_lin_default_nf_4_R0_G 
++ I1_lin_default_nf_4_R0_S vdd! nfet_01v8_dss m=1 w=200.000u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_3_R0 I1_lin_default_nf_3_R0_D I1_lin_default_nf_3_R0_G 
++ I1_lin_default_nf_3_R0_S vdd! nfet_01v8_dss m=1 w=200.000u l=0.3u nf=8 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_2_R0 I1_lin_default_nf_2_R0_D I1_lin_default_nf_2_R0_G 
++ I1_lin_default_nf_2_R0_S vdd! nfet_01v8_dss m=1 w=150.000u l=0.3u nf=6 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_1_R0 I1_lin_default_nf_1_R0_D I1_lin_default_nf_1_R0_G 
++ I1_lin_default_nf_1_R0_S vdd! nfet_01v8_dss m=1 w=150.000u l=0.3u nf=6 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_nf_0_R0 I1_lin_default_nf_0_R0_D I1_lin_default_nf_0_R0_G 
++ I1_lin_default_nf_0_R0_S vdd! nfet_01v8_dss m=1 w=100.000u l=0.3u nf=4 
++ s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_m_2_R0 I1_lin_default_m_2_R0_D I1_lin_default_m_2_R0_G 
++ I1_lin_default_m_2_R0_S vdd! nfet_01v8_dss m=3 w=200u l=0.3u nf=8 s_sab=0.48u 
++ d_sab=1.78u par=3 dtemp=0
+MI1_lin_default_m_1_R0 I1_lin_default_m_1_R0_D I1_lin_default_m_1_R0_G 
++ I1_lin_default_m_1_R0_S vdd! nfet_01v8_dss m=2 w=200u l=0.3u nf=8 s_sab=0.48u 
++ d_sab=1.78u par=2 dtemp=0
+MI1_lin_default_m_0_R0 I1_lin_default_m_0_R0_D I1_lin_default_m_0_R0_G 
++ I1_lin_default_m_0_R0_S vdd! nfet_01v8_dss m=1 w=200u l=0.3u nf=8 s_sab=0.48u 
++ d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_guardRing_0_R0 I1_lin_default_guardRing_0_R0_D 
++ I1_lin_default_guardRing_0_R0_G I1_lin_default_guardRing_0_R0_S vdd! 
++ nfet_01v8_dss m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_lin_default_strapSD_0_R0 I1_lin_default_strapSD_0_R0_D 
++ I1_lin_default_strapSD_0_R0_G I1_lin_default_strapSD_0_R0_S vdd! 
++ nfet_01v8_dss m=1 w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+MI1_default I1_default_D I1_default_G I1_default_S vdd! nfet_01v8_dss m=1 
++ w=200u l=0.3u nf=8 s_sab=0.48u d_sab=1.78u par=1 dtemp=0
+.ENDS
+
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_05v0_dn_dss.cdl b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_05v0_dn_dss.cdl
new file mode 100644
index 0000000..43caf91
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_05v0_dn_dss.cdl
@@ -0,0 +1,362 @@
+************************************************************************
+* auCdl Netlist:
+* 
+* Library Name:  TCG_library_2
+* Top Cell Name: nfet_05v0_dn_dss
+* View Name:     schematic
+* Netlisted on:  Sep 10 16:40:15 2021
+************************************************************************
+
+*.EQUATION
+*.SCALE METER
+*.MEGA
+.PARAM
+
+*.GLOBAL vdd!
+
+*.PIN vdd!
+
+************************************************************************
+* Library Name: TCG_library_2
+* Cell Name:    nfet_05v0_dn_dss
+* View Name:    schematic
+************************************************************************
+
+.SUBCKT nfet_05v0_dn_dss I1_default_D I1_default_G I1_default_S 
++ I1_lin_default_d_sab_0_R0_D I1_lin_default_d_sab_0_R0_G 
++ I1_lin_default_d_sab_0_R0_S I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S 
++ I1_lin_default_d_sab_2_R0_D I1_lin_default_d_sab_2_R0_G 
++ I1_lin_default_d_sab_2_R0_S I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S 
++ I1_lin_default_d_sab_4_R0_D I1_lin_default_d_sab_4_R0_G 
++ I1_lin_default_d_sab_4_R0_S I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S 
++ I1_lin_default_d_sab_6_R0_D I1_lin_default_d_sab_6_R0_G 
++ I1_lin_default_d_sab_6_R0_S I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S 
++ I1_lin_default_d_sab_8_R0_D I1_lin_default_d_sab_8_R0_G 
++ I1_lin_default_d_sab_8_R0_S I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S 
++ I1_lin_default_gns_0_R0_D I1_lin_default_gns_0_R0_G 
++ I1_lin_default_gns_0_R0_S I1_lin_default_gns_1_R0_D 
++ I1_lin_default_gns_1_R0_G I1_lin_default_gns_1_R0_S 
++ I1_lin_default_guardRing_0_R0_D I1_lin_default_guardRing_0_R0_G 
++ I1_lin_default_guardRing_0_R0_S I1_lin_default_guardRing_1_R0_D 
++ I1_lin_default_guardRing_1_R0_G I1_lin_default_guardRing_1_R0_S 
++ I1_lin_default_l_0_R0_D I1_lin_default_l_0_R0_G I1_lin_default_l_0_R0_S 
++ I1_lin_default_l_1_R0_D I1_lin_default_l_1_R0_G I1_lin_default_l_1_R0_S 
++ I1_lin_default_l_2_R0_D I1_lin_default_l_2_R0_G I1_lin_default_l_2_R0_S 
++ I1_lin_default_l_3_R0_D I1_lin_default_l_3_R0_G I1_lin_default_l_3_R0_S 
++ I1_lin_default_l_4_R0_D I1_lin_default_l_4_R0_G I1_lin_default_l_4_R0_S 
++ I1_lin_default_l_5_R0_D I1_lin_default_l_5_R0_G I1_lin_default_l_5_R0_S 
++ I1_lin_default_l_6_R0_D I1_lin_default_l_6_R0_G I1_lin_default_l_6_R0_S 
++ I1_lin_default_l_7_R0_D I1_lin_default_l_7_R0_G I1_lin_default_l_7_R0_S 
++ I1_lin_default_l_8_R0_D I1_lin_default_l_8_R0_G I1_lin_default_l_8_R0_S 
++ I1_lin_default_l_9_R0_D I1_lin_default_l_9_R0_G I1_lin_default_l_9_R0_S 
++ I1_lin_default_l_10_R0_D I1_lin_default_l_10_R0_G I1_lin_default_l_10_R0_S 
++ I1_lin_default_l_11_R0_D I1_lin_default_l_11_R0_G I1_lin_default_l_11_R0_S 
++ I1_lin_default_l_12_R0_D I1_lin_default_l_12_R0_G I1_lin_default_l_12_R0_S 
++ I1_lin_default_l_13_R0_D I1_lin_default_l_13_R0_G I1_lin_default_l_13_R0_S 
++ I1_lin_default_l_14_R0_D I1_lin_default_l_14_R0_G I1_lin_default_l_14_R0_S 
++ I1_lin_default_m_0_R0_D I1_lin_default_m_0_R0_G I1_lin_default_m_0_R0_S 
++ I1_lin_default_m_1_R0_D I1_lin_default_m_1_R0_G I1_lin_default_m_1_R0_S 
++ I1_lin_default_m_2_R0_D I1_lin_default_m_2_R0_G I1_lin_default_m_2_R0_S 
++ I1_lin_default_nf_1_R0_D I1_lin_default_nf_1_R0_G I1_lin_default_nf_1_R0_S 
++ I1_lin_default_nf_2_R0_D I1_lin_default_nf_2_R0_G I1_lin_default_nf_2_R0_S 
++ I1_lin_default_nf_3_R0_D I1_lin_default_nf_3_R0_G I1_lin_default_nf_3_R0_S 
++ I1_lin_default_nf_4_R0_D I1_lin_default_nf_4_R0_G I1_lin_default_nf_4_R0_S 
++ I1_lin_default_nf_5_R0_D I1_lin_default_nf_5_R0_G I1_lin_default_nf_5_R0_S 
++ I1_lin_default_nf_6_R0_D I1_lin_default_nf_6_R0_G I1_lin_default_nf_6_R0_S 
++ I1_lin_default_nf_7_R0_D I1_lin_default_nf_7_R0_G I1_lin_default_nf_7_R0_S 
++ I1_lin_default_nf_8_R0_D I1_lin_default_nf_8_R0_G I1_lin_default_nf_8_R0_S 
++ I1_lin_default_psub_tap_0_R0_D I1_lin_default_psub_tap_0_R0_G 
++ I1_lin_default_psub_tap_0_R0_S I1_lin_default_s_sab_0_R0_D 
++ I1_lin_default_s_sab_0_R0_G I1_lin_default_s_sab_0_R0_S 
++ I1_lin_default_s_sab_1_R0_D I1_lin_default_s_sab_1_R0_G 
++ I1_lin_default_s_sab_1_R0_S I1_lin_default_s_sab_2_R0_D 
++ I1_lin_default_s_sab_2_R0_G I1_lin_default_s_sab_2_R0_S 
++ I1_lin_default_s_sab_3_R0_D I1_lin_default_s_sab_3_R0_G 
++ I1_lin_default_s_sab_3_R0_S I1_lin_default_s_sab_4_R0_D 
++ I1_lin_default_s_sab_4_R0_G I1_lin_default_s_sab_4_R0_S 
++ I1_lin_default_s_sab_5_R0_D I1_lin_default_s_sab_5_R0_G 
++ I1_lin_default_s_sab_5_R0_S I1_lin_default_s_sab_6_R0_D 
++ I1_lin_default_s_sab_6_R0_G I1_lin_default_s_sab_6_R0_S 
++ I1_lin_default_s_sab_7_R0_D I1_lin_default_s_sab_7_R0_G 
++ I1_lin_default_s_sab_7_R0_S I1_lin_default_strapSD_0_R0_D 
++ I1_lin_default_strapSD_0_R0_G I1_lin_default_strapSD_0_R0_S 
++ I1_lin_default_wf_0_R0_D I1_lin_default_wf_0_R0_G I1_lin_default_wf_0_R0_S 
++ I1_lin_default_wf_1_R0_D I1_lin_default_wf_1_R0_G I1_lin_default_wf_1_R0_S 
++ I1_lin_default_wf_2_R0_D I1_lin_default_wf_2_R0_G I1_lin_default_wf_2_R0_S 
++ I1_lin_default_wf_3_R0_D I1_lin_default_wf_3_R0_G I1_lin_default_wf_3_R0_S 
++ I1_lin_default_wf_4_R0_D I1_lin_default_wf_4_R0_G I1_lin_default_wf_4_R0_S 
++ I1_lin_default_wf_5_R0_D I1_lin_default_wf_5_R0_G I1_lin_default_wf_5_R0_S 
++ I1_lin_default_wf_6_R0_D I1_lin_default_wf_6_R0_G I1_lin_default_wf_6_R0_S 
++ I1_lin_default_wf_7_R0_D I1_lin_default_wf_7_R0_G I1_lin_default_wf_7_R0_S 
++ vdd!
+*.PININFO I1_default_D:I I1_default_G:I I1_default_S:I 
+*.PININFO I1_lin_default_d_sab_0_R0_D:I I1_lin_default_d_sab_0_R0_G:I 
+*.PININFO I1_lin_default_d_sab_0_R0_S:I I1_lin_default_d_sab_1_R0_D:I 
+*.PININFO I1_lin_default_d_sab_1_R0_G:I I1_lin_default_d_sab_1_R0_S:I 
+*.PININFO I1_lin_default_d_sab_2_R0_D:I I1_lin_default_d_sab_2_R0_G:I 
+*.PININFO I1_lin_default_d_sab_2_R0_S:I I1_lin_default_d_sab_3_R0_D:I 
+*.PININFO I1_lin_default_d_sab_3_R0_G:I I1_lin_default_d_sab_3_R0_S:I 
+*.PININFO I1_lin_default_d_sab_4_R0_D:I I1_lin_default_d_sab_4_R0_G:I 
+*.PININFO I1_lin_default_d_sab_4_R0_S:I I1_lin_default_d_sab_5_R0_D:I 
+*.PININFO I1_lin_default_d_sab_5_R0_G:I I1_lin_default_d_sab_5_R0_S:I 
+*.PININFO I1_lin_default_d_sab_6_R0_D:I I1_lin_default_d_sab_6_R0_G:I 
+*.PININFO I1_lin_default_d_sab_6_R0_S:I I1_lin_default_d_sab_7_R0_D:I 
+*.PININFO I1_lin_default_d_sab_7_R0_G:I I1_lin_default_d_sab_7_R0_S:I 
+*.PININFO I1_lin_default_d_sab_8_R0_D:I I1_lin_default_d_sab_8_R0_G:I 
+*.PININFO I1_lin_default_d_sab_8_R0_S:I I1_lin_default_d_sab_9_R0_D:I 
+*.PININFO I1_lin_default_d_sab_9_R0_G:I I1_lin_default_d_sab_9_R0_S:I 
+*.PININFO I1_lin_default_gns_0_R0_D:I I1_lin_default_gns_0_R0_G:I 
+*.PININFO I1_lin_default_gns_0_R0_S:I I1_lin_default_gns_1_R0_D:I 
+*.PININFO I1_lin_default_gns_1_R0_G:I I1_lin_default_gns_1_R0_S:I 
+*.PININFO I1_lin_default_guardRing_0_R0_D:I I1_lin_default_guardRing_0_R0_G:I 
+*.PININFO I1_lin_default_guardRing_0_R0_S:I I1_lin_default_guardRing_1_R0_D:I 
+*.PININFO I1_lin_default_guardRing_1_R0_G:I I1_lin_default_guardRing_1_R0_S:I 
+*.PININFO I1_lin_default_l_0_R0_D:I I1_lin_default_l_0_R0_G:I 
+*.PININFO I1_lin_default_l_0_R0_S:I I1_lin_default_l_1_R0_D:I 
+*.PININFO I1_lin_default_l_1_R0_G:I I1_lin_default_l_1_R0_S:I 
+*.PININFO I1_lin_default_l_2_R0_D:I I1_lin_default_l_2_R0_G:I 
+*.PININFO I1_lin_default_l_2_R0_S:I I1_lin_default_l_3_R0_D:I 
+*.PININFO I1_lin_default_l_3_R0_G:I I1_lin_default_l_3_R0_S:I 
+*.PININFO I1_lin_default_l_4_R0_D:I I1_lin_default_l_4_R0_G:I 
+*.PININFO I1_lin_default_l_4_R0_S:I I1_lin_default_l_5_R0_D:I 
+*.PININFO I1_lin_default_l_5_R0_G:I I1_lin_default_l_5_R0_S:I 
+*.PININFO I1_lin_default_l_6_R0_D:I I1_lin_default_l_6_R0_G:I 
+*.PININFO I1_lin_default_l_6_R0_S:I I1_lin_default_l_7_R0_D:I 
+*.PININFO I1_lin_default_l_7_R0_G:I I1_lin_default_l_7_R0_S:I 
+*.PININFO I1_lin_default_l_8_R0_D:I I1_lin_default_l_8_R0_G:I 
+*.PININFO I1_lin_default_l_8_R0_S:I I1_lin_default_l_9_R0_D:I 
+*.PININFO I1_lin_default_l_9_R0_G:I I1_lin_default_l_9_R0_S:I 
+*.PININFO I1_lin_default_l_10_R0_D:I I1_lin_default_l_10_R0_G:I 
+*.PININFO I1_lin_default_l_10_R0_S:I I1_lin_default_l_11_R0_D:I 
+*.PININFO I1_lin_default_l_11_R0_G:I I1_lin_default_l_11_R0_S:I 
+*.PININFO I1_lin_default_l_12_R0_D:I I1_lin_default_l_12_R0_G:I 
+*.PININFO I1_lin_default_l_12_R0_S:I I1_lin_default_l_13_R0_D:I 
+*.PININFO I1_lin_default_l_13_R0_G:I I1_lin_default_l_13_R0_S:I 
+*.PININFO I1_lin_default_l_14_R0_D:I I1_lin_default_l_14_R0_G:I 
+*.PININFO I1_lin_default_l_14_R0_S:I I1_lin_default_m_0_R0_D:I 
+*.PININFO I1_lin_default_m_0_R0_G:I I1_lin_default_m_0_R0_S:I 
+*.PININFO I1_lin_default_m_1_R0_D:I I1_lin_default_m_1_R0_G:I 
+*.PININFO I1_lin_default_m_1_R0_S:I I1_lin_default_m_2_R0_D:I 
+*.PININFO I1_lin_default_m_2_R0_G:I I1_lin_default_m_2_R0_S:I 
+*.PININFO I1_lin_default_nf_1_R0_D:I I1_lin_default_nf_1_R0_G:I 
+*.PININFO I1_lin_default_nf_1_R0_S:I I1_lin_default_nf_2_R0_D:I 
+*.PININFO I1_lin_default_nf_2_R0_G:I I1_lin_default_nf_2_R0_S:I 
+*.PININFO I1_lin_default_nf_3_R0_D:I I1_lin_default_nf_3_R0_G:I 
+*.PININFO I1_lin_default_nf_3_R0_S:I I1_lin_default_nf_4_R0_D:I 
+*.PININFO I1_lin_default_nf_4_R0_G:I I1_lin_default_nf_4_R0_S:I 
+*.PININFO I1_lin_default_nf_5_R0_D:I I1_lin_default_nf_5_R0_G:I 
+*.PININFO I1_lin_default_nf_5_R0_S:I I1_lin_default_nf_6_R0_D:I 
+*.PININFO I1_lin_default_nf_6_R0_G:I I1_lin_default_nf_6_R0_S:I 
+*.PININFO I1_lin_default_nf_7_R0_D:I I1_lin_default_nf_7_R0_G:I 
+*.PININFO I1_lin_default_nf_7_R0_S:I I1_lin_default_nf_8_R0_D:I 
+*.PININFO I1_lin_default_nf_8_R0_G:I I1_lin_default_nf_8_R0_S:I 
+*.PININFO I1_lin_default_psub_tap_0_R0_D:I I1_lin_default_psub_tap_0_R0_G:I 
+*.PININFO I1_lin_default_psub_tap_0_R0_S:I I1_lin_default_s_sab_0_R0_D:I 
+*.PININFO I1_lin_default_s_sab_0_R0_G:I I1_lin_default_s_sab_0_R0_S:I 
+*.PININFO I1_lin_default_s_sab_1_R0_D:I I1_lin_default_s_sab_1_R0_G:I 
+*.PININFO I1_lin_default_s_sab_1_R0_S:I I1_lin_default_s_sab_2_R0_D:I 
+*.PININFO I1_lin_default_s_sab_2_R0_G:I I1_lin_default_s_sab_2_R0_S:I 
+*.PININFO I1_lin_default_s_sab_3_R0_D:I I1_lin_default_s_sab_3_R0_G:I 
+*.PININFO I1_lin_default_s_sab_3_R0_S:I I1_lin_default_s_sab_4_R0_D:I 
+*.PININFO I1_lin_default_s_sab_4_R0_G:I I1_lin_default_s_sab_4_R0_S:I 
+*.PININFO I1_lin_default_s_sab_5_R0_D:I I1_lin_default_s_sab_5_R0_G:I 
+*.PININFO I1_lin_default_s_sab_5_R0_S:I I1_lin_default_s_sab_6_R0_D:I 
+*.PININFO I1_lin_default_s_sab_6_R0_G:I I1_lin_default_s_sab_6_R0_S:I 
+*.PININFO I1_lin_default_s_sab_7_R0_D:I I1_lin_default_s_sab_7_R0_G:I 
+*.PININFO I1_lin_default_s_sab_7_R0_S:I I1_lin_default_strapSD_0_R0_D:I 
+*.PININFO I1_lin_default_strapSD_0_R0_G:I I1_lin_default_strapSD_0_R0_S:I 
+*.PININFO I1_lin_default_wf_0_R0_D:I I1_lin_default_wf_0_R0_G:I 
+*.PININFO I1_lin_default_wf_0_R0_S:I I1_lin_default_wf_1_R0_D:I 
+*.PININFO I1_lin_default_wf_1_R0_G:I I1_lin_default_wf_1_R0_S:I 
+*.PININFO I1_lin_default_wf_2_R0_D:I I1_lin_default_wf_2_R0_G:I 
+*.PININFO I1_lin_default_wf_2_R0_S:I I1_lin_default_wf_3_R0_D:I 
+*.PININFO I1_lin_default_wf_3_R0_G:I I1_lin_default_wf_3_R0_S:I 
+*.PININFO I1_lin_default_wf_4_R0_D:I I1_lin_default_wf_4_R0_G:I 
+*.PININFO I1_lin_default_wf_4_R0_S:I I1_lin_default_wf_5_R0_D:I 
+*.PININFO I1_lin_default_wf_5_R0_G:I I1_lin_default_wf_5_R0_S:I 
+*.PININFO I1_lin_default_wf_6_R0_D:I I1_lin_default_wf_6_R0_G:I 
+*.PININFO I1_lin_default_wf_6_R0_S:I I1_lin_default_wf_7_R0_D:I 
+*.PININFO I1_lin_default_wf_7_R0_G:I I1_lin_default_wf_7_R0_S:I vdd!:I
+MI1_lin_default_wf_7_R0 I1_lin_default_wf_7_R0_D I1_lin_default_wf_7_R0_G 
++ I1_lin_default_wf_7_R0_S vdd! nfet_05v0_dn_dss m=1 w=720.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_6_R0 I1_lin_default_wf_6_R0_D I1_lin_default_wf_6_R0_G 
++ I1_lin_default_wf_6_R0_S vdd! nfet_05v0_dn_dss m=1 w=716.640u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_5_R0 I1_lin_default_wf_5_R0_D I1_lin_default_wf_5_R0_G 
++ I1_lin_default_wf_5_R0_S vdd! nfet_05v0_dn_dss m=1 w=597.180u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_4_R0 I1_lin_default_wf_4_R0_D I1_lin_default_wf_4_R0_G 
++ I1_lin_default_wf_4_R0_S vdd! nfet_05v0_dn_dss m=1 w=497.640u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_3_R0 I1_lin_default_wf_3_R0_D I1_lin_default_wf_3_R0_G 
++ I1_lin_default_wf_3_R0_S vdd! nfet_05v0_dn_dss m=1 w=414.720u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_2_R0 I1_lin_default_wf_2_R0_D I1_lin_default_wf_2_R0_G 
++ I1_lin_default_wf_2_R0_S vdd! nfet_05v0_dn_dss m=1 w=345.600u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_1_R0 I1_lin_default_wf_1_R0_D I1_lin_default_wf_1_R0_G 
++ I1_lin_default_wf_1_R0_S vdd! nfet_05v0_dn_dss m=1 w=288.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_0_R0 I1_lin_default_wf_0_R0_D I1_lin_default_wf_0_R0_G 
++ I1_lin_default_wf_0_R0_S vdd! nfet_05v0_dn_dss m=1 w=240.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_14_R0 I1_lin_default_l_14_R0_D I1_lin_default_l_14_R0_G 
++ I1_lin_default_l_14_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=10.000u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_13_R0 I1_lin_default_l_13_R0_D I1_lin_default_l_13_R0_G 
++ I1_lin_default_l_13_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=8.560u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_12_R0 I1_lin_default_l_12_R0_D I1_lin_default_l_12_R0_G 
++ I1_lin_default_l_12_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=7.135u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_11_R0 I1_lin_default_l_11_R0_D I1_lin_default_l_11_R0_G 
++ I1_lin_default_l_11_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=5.945u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_10_R0 I1_lin_default_l_10_R0_D I1_lin_default_l_10_R0_G 
++ I1_lin_default_l_10_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=4.955u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_9_R0 I1_lin_default_l_9_R0_D I1_lin_default_l_9_R0_G 
++ I1_lin_default_l_9_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=4.130u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_8_R0 I1_lin_default_l_8_R0_D I1_lin_default_l_8_R0_G 
++ I1_lin_default_l_8_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=3.440u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_7_R0 I1_lin_default_l_7_R0_D I1_lin_default_l_7_R0_G 
++ I1_lin_default_l_7_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=2.865u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_6_R0 I1_lin_default_l_6_R0_D I1_lin_default_l_6_R0_G 
++ I1_lin_default_l_6_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=2.390u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_5_R0 I1_lin_default_l_5_R0_D I1_lin_default_l_5_R0_G 
++ I1_lin_default_l_5_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=1.990u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_4_R0 I1_lin_default_l_4_R0_D I1_lin_default_l_4_R0_G 
++ I1_lin_default_l_4_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=1.660u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_3_R0 I1_lin_default_l_3_R0_D I1_lin_default_l_3_R0_G 
++ I1_lin_default_l_3_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=1.380u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_2_R0 I1_lin_default_l_2_R0_D I1_lin_default_l_2_R0_G 
++ I1_lin_default_l_2_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=1.150u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_1_R0 I1_lin_default_l_1_R0_D I1_lin_default_l_1_R0_G 
++ I1_lin_default_l_1_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=0.960u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_0_R0 I1_lin_default_l_0_R0_D I1_lin_default_l_0_R0_G 
++ I1_lin_default_l_0_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=0.800u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_d_sab_9_R0 I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.780u par=1 dtemp=0
+MI1_lin_default_d_sab_8_R0 I1_lin_default_d_sab_8_R0_D 
++ I1_lin_default_d_sab_8_R0_G I1_lin_default_d_sab_8_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.355u par=1 dtemp=0
+MI1_lin_default_d_sab_7_R0 I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=2.795u par=1 dtemp=0
+MI1_lin_default_d_sab_6_R0 I1_lin_default_d_sab_6_R0_D 
++ I1_lin_default_d_sab_6_R0_G I1_lin_default_d_sab_6_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=2.330u par=1 dtemp=0
+MI1_lin_default_d_sab_5_R0 I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.940u par=1 dtemp=0
+MI1_lin_default_d_sab_4_R0 I1_lin_default_d_sab_4_R0_D 
++ I1_lin_default_d_sab_4_R0_G I1_lin_default_d_sab_4_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.615u par=1 dtemp=0
+MI1_lin_default_d_sab_3_R0 I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.350u par=1 dtemp=0
+MI1_lin_default_d_sab_2_R0 I1_lin_default_d_sab_2_R0_D 
++ I1_lin_default_d_sab_2_R0_G I1_lin_default_d_sab_2_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.125u par=1 dtemp=0
+MI1_lin_default_d_sab_1_R0 I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=0.935u par=1 dtemp=0
+MI1_lin_default_d_sab_0_R0 I1_lin_default_d_sab_0_R0_D 
++ I1_lin_default_d_sab_0_R0_G I1_lin_default_d_sab_0_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=0.780u par=1 dtemp=0
+MI1_lin_default_s_sab_7_R0 I1_lin_default_s_sab_7_R0_D 
++ I1_lin_default_s_sab_7_R0_G I1_lin_default_s_sab_7_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.780u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_6_R0 I1_lin_default_s_sab_6_R0_D 
++ I1_lin_default_s_sab_6_R0_G I1_lin_default_s_sab_6_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.655u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_5_R0 I1_lin_default_s_sab_5_R0_D 
++ I1_lin_default_s_sab_5_R0_G I1_lin_default_s_sab_5_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.545u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_4_R0 I1_lin_default_s_sab_4_R0_D 
++ I1_lin_default_s_sab_4_R0_G I1_lin_default_s_sab_4_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.455u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_3_R0 I1_lin_default_s_sab_3_R0_D 
++ I1_lin_default_s_sab_3_R0_G I1_lin_default_s_sab_3_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.380u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_2_R0 I1_lin_default_s_sab_2_R0_D 
++ I1_lin_default_s_sab_2_R0_G I1_lin_default_s_sab_2_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.315u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_1_R0 I1_lin_default_s_sab_1_R0_D 
++ I1_lin_default_s_sab_1_R0_G I1_lin_default_s_sab_1_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.265u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_0_R0 I1_lin_default_s_sab_0_R0_D 
++ I1_lin_default_s_sab_0_R0_G I1_lin_default_s_sab_0_R0_S vdd! nfet_05v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.220u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_8_R0 I1_lin_default_nf_8_R0_D I1_lin_default_nf_8_R0_G 
++ I1_lin_default_nf_8_R0_S vdd! nfet_05v0_dn_dss m=1 w=450.000u l=0.8u nf=18 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_7_R0 I1_lin_default_nf_7_R0_D I1_lin_default_nf_7_R0_G 
++ I1_lin_default_nf_7_R0_S vdd! nfet_05v0_dn_dss m=1 w=400.000u l=0.8u nf=16 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_6_R0 I1_lin_default_nf_6_R0_D I1_lin_default_nf_6_R0_G 
++ I1_lin_default_nf_6_R0_S vdd! nfet_05v0_dn_dss m=1 w=350.000u l=0.8u nf=14 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_5_R0 I1_lin_default_nf_5_R0_D I1_lin_default_nf_5_R0_G 
++ I1_lin_default_nf_5_R0_S vdd! nfet_05v0_dn_dss m=1 w=300.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_4_R0 I1_lin_default_nf_4_R0_D I1_lin_default_nf_4_R0_G 
++ I1_lin_default_nf_4_R0_S vdd! nfet_05v0_dn_dss m=1 w=250.000u l=0.8u nf=10 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_3_R0 I1_lin_default_nf_3_R0_D I1_lin_default_nf_3_R0_G 
++ I1_lin_default_nf_3_R0_S vdd! nfet_05v0_dn_dss m=1 w=200.000u l=0.8u nf=8 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_2_R0 I1_lin_default_nf_2_R0_D I1_lin_default_nf_2_R0_G 
++ I1_lin_default_nf_2_R0_S vdd! nfet_05v0_dn_dss m=1 w=150.000u l=0.8u nf=6 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_1_R0 I1_lin_default_nf_1_R0_D I1_lin_default_nf_1_R0_G 
++ I1_lin_default_nf_1_R0_S vdd! nfet_05v0_dn_dss m=1 w=100.000u l=0.8u nf=4 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_m_2_R0 I1_lin_default_m_2_R0_D I1_lin_default_m_2_R0_G 
++ I1_lin_default_m_2_R0_S vdd! nfet_05v0_dn_dss m=3 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=3 dtemp=0
+MI1_lin_default_m_1_R0 I1_lin_default_m_1_R0_D I1_lin_default_m_1_R0_G 
++ I1_lin_default_m_1_R0_S vdd! nfet_05v0_dn_dss m=2 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=2 dtemp=0
+MI1_lin_default_m_0_R0 I1_lin_default_m_0_R0_D I1_lin_default_m_0_R0_G 
++ I1_lin_default_m_0_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_gns_1_R0 I1_lin_default_gns_1_R0_D I1_lin_default_gns_1_R0_G 
++ I1_lin_default_gns_1_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=0.8u nf=12 
++ s_sab=0 d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_gns_0_R0 I1_lin_default_gns_0_R0_D I1_lin_default_gns_0_R0_G 
++ I1_lin_default_gns_0_R0_S vdd! nfet_05v0_dn_dss m=1 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_guardRing_1_R0 I1_lin_default_guardRing_1_R0_D 
++ I1_lin_default_guardRing_1_R0_G I1_lin_default_guardRing_1_R0_S vdd! 
++ nfet_05v0_dn_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_guardRing_0_R0 I1_lin_default_guardRing_0_R0_D 
++ I1_lin_default_guardRing_0_R0_G I1_lin_default_guardRing_0_R0_S vdd! 
++ nfet_05v0_dn_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_strapSD_0_R0 I1_lin_default_strapSD_0_R0_D 
++ I1_lin_default_strapSD_0_R0_G I1_lin_default_strapSD_0_R0_S vdd! 
++ nfet_05v0_dn_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_psub_tap_0_R0 I1_lin_default_psub_tap_0_R0_D 
++ I1_lin_default_psub_tap_0_R0_G I1_lin_default_psub_tap_0_R0_S vdd! 
++ nfet_05v0_dn_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_default I1_default_D I1_default_G I1_default_S vdd! nfet_05v0_dn_dss m=1 
++ w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+.ENDS
+
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_05v0_dss.cdl b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_05v0_dss.cdl
new file mode 100644
index 0000000..dae0939
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_05v0_dss.cdl
@@ -0,0 +1,350 @@
+************************************************************************
+* auCdl Netlist:
+* 
+* Library Name:  TCG_library_2
+* Top Cell Name: nfet_05v0_dss
+* View Name:     schematic
+* Netlisted on:  Sep 10 16:41:40 2021
+************************************************************************
+
+*.EQUATION
+*.SCALE METER
+*.MEGA
+.PARAM
+
+*.GLOBAL vdd!
+
+*.PIN vdd!
+
+************************************************************************
+* Library Name: TCG_library_2
+* Cell Name:    nfet_05v0_dss
+* View Name:    schematic
+************************************************************************
+
+.SUBCKT nfet_05v0_dss I1_default_D I1_default_G I1_default_S 
++ I1_lin_default_d_sab_0_R0_D I1_lin_default_d_sab_0_R0_G 
++ I1_lin_default_d_sab_0_R0_S I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S 
++ I1_lin_default_d_sab_2_R0_D I1_lin_default_d_sab_2_R0_G 
++ I1_lin_default_d_sab_2_R0_S I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S 
++ I1_lin_default_d_sab_4_R0_D I1_lin_default_d_sab_4_R0_G 
++ I1_lin_default_d_sab_4_R0_S I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S 
++ I1_lin_default_d_sab_6_R0_D I1_lin_default_d_sab_6_R0_G 
++ I1_lin_default_d_sab_6_R0_S I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S 
++ I1_lin_default_d_sab_8_R0_D I1_lin_default_d_sab_8_R0_G 
++ I1_lin_default_d_sab_8_R0_S I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S 
++ I1_lin_default_gns_0_R0_D I1_lin_default_gns_0_R0_G 
++ I1_lin_default_gns_0_R0_S I1_lin_default_gns_1_R0_D 
++ I1_lin_default_gns_1_R0_G I1_lin_default_gns_1_R0_S 
++ I1_lin_default_guardRing_0_R0_D I1_lin_default_guardRing_0_R0_G 
++ I1_lin_default_guardRing_0_R0_S I1_lin_default_l_0_R0_D 
++ I1_lin_default_l_0_R0_G I1_lin_default_l_0_R0_S I1_lin_default_l_1_R0_D 
++ I1_lin_default_l_1_R0_G I1_lin_default_l_1_R0_S I1_lin_default_l_2_R0_D 
++ I1_lin_default_l_2_R0_G I1_lin_default_l_2_R0_S I1_lin_default_l_3_R0_D 
++ I1_lin_default_l_3_R0_G I1_lin_default_l_3_R0_S I1_lin_default_l_4_R0_D 
++ I1_lin_default_l_4_R0_G I1_lin_default_l_4_R0_S I1_lin_default_l_5_R0_D 
++ I1_lin_default_l_5_R0_G I1_lin_default_l_5_R0_S I1_lin_default_l_6_R0_D 
++ I1_lin_default_l_6_R0_G I1_lin_default_l_6_R0_S I1_lin_default_l_7_R0_D 
++ I1_lin_default_l_7_R0_G I1_lin_default_l_7_R0_S I1_lin_default_l_8_R0_D 
++ I1_lin_default_l_8_R0_G I1_lin_default_l_8_R0_S I1_lin_default_l_9_R0_D 
++ I1_lin_default_l_9_R0_G I1_lin_default_l_9_R0_S I1_lin_default_l_10_R0_D 
++ I1_lin_default_l_10_R0_G I1_lin_default_l_10_R0_S I1_lin_default_l_11_R0_D 
++ I1_lin_default_l_11_R0_G I1_lin_default_l_11_R0_S I1_lin_default_l_12_R0_D 
++ I1_lin_default_l_12_R0_G I1_lin_default_l_12_R0_S I1_lin_default_l_13_R0_D 
++ I1_lin_default_l_13_R0_G I1_lin_default_l_13_R0_S I1_lin_default_l_14_R0_D 
++ I1_lin_default_l_14_R0_G I1_lin_default_l_14_R0_S I1_lin_default_m_0_R0_D 
++ I1_lin_default_m_0_R0_G I1_lin_default_m_0_R0_S I1_lin_default_m_1_R0_D 
++ I1_lin_default_m_1_R0_G I1_lin_default_m_1_R0_S I1_lin_default_m_2_R0_D 
++ I1_lin_default_m_2_R0_G I1_lin_default_m_2_R0_S I1_lin_default_nf_1_R0_D 
++ I1_lin_default_nf_1_R0_G I1_lin_default_nf_1_R0_S I1_lin_default_nf_2_R0_D 
++ I1_lin_default_nf_2_R0_G I1_lin_default_nf_2_R0_S I1_lin_default_nf_3_R0_D 
++ I1_lin_default_nf_3_R0_G I1_lin_default_nf_3_R0_S I1_lin_default_nf_4_R0_D 
++ I1_lin_default_nf_4_R0_G I1_lin_default_nf_4_R0_S I1_lin_default_nf_5_R0_D 
++ I1_lin_default_nf_5_R0_G I1_lin_default_nf_5_R0_S I1_lin_default_nf_6_R0_D 
++ I1_lin_default_nf_6_R0_G I1_lin_default_nf_6_R0_S I1_lin_default_nf_7_R0_D 
++ I1_lin_default_nf_7_R0_G I1_lin_default_nf_7_R0_S I1_lin_default_nf_8_R0_D 
++ I1_lin_default_nf_8_R0_G I1_lin_default_nf_8_R0_S 
++ I1_lin_default_s_sab_0_R0_D I1_lin_default_s_sab_0_R0_G 
++ I1_lin_default_s_sab_0_R0_S I1_lin_default_s_sab_1_R0_D 
++ I1_lin_default_s_sab_1_R0_G I1_lin_default_s_sab_1_R0_S 
++ I1_lin_default_s_sab_2_R0_D I1_lin_default_s_sab_2_R0_G 
++ I1_lin_default_s_sab_2_R0_S I1_lin_default_s_sab_3_R0_D 
++ I1_lin_default_s_sab_3_R0_G I1_lin_default_s_sab_3_R0_S 
++ I1_lin_default_s_sab_4_R0_D I1_lin_default_s_sab_4_R0_G 
++ I1_lin_default_s_sab_4_R0_S I1_lin_default_s_sab_5_R0_D 
++ I1_lin_default_s_sab_5_R0_G I1_lin_default_s_sab_5_R0_S 
++ I1_lin_default_s_sab_6_R0_D I1_lin_default_s_sab_6_R0_G 
++ I1_lin_default_s_sab_6_R0_S I1_lin_default_s_sab_7_R0_D 
++ I1_lin_default_s_sab_7_R0_G I1_lin_default_s_sab_7_R0_S 
++ I1_lin_default_strapSD_0_R0_D I1_lin_default_strapSD_0_R0_G 
++ I1_lin_default_strapSD_0_R0_S I1_lin_default_wf_0_R0_D 
++ I1_lin_default_wf_0_R0_G I1_lin_default_wf_0_R0_S I1_lin_default_wf_1_R0_D 
++ I1_lin_default_wf_1_R0_G I1_lin_default_wf_1_R0_S I1_lin_default_wf_2_R0_D 
++ I1_lin_default_wf_2_R0_G I1_lin_default_wf_2_R0_S I1_lin_default_wf_3_R0_D 
++ I1_lin_default_wf_3_R0_G I1_lin_default_wf_3_R0_S I1_lin_default_wf_4_R0_D 
++ I1_lin_default_wf_4_R0_G I1_lin_default_wf_4_R0_S I1_lin_default_wf_5_R0_D 
++ I1_lin_default_wf_5_R0_G I1_lin_default_wf_5_R0_S I1_lin_default_wf_6_R0_D 
++ I1_lin_default_wf_6_R0_G I1_lin_default_wf_6_R0_S I1_lin_default_wf_7_R0_D 
++ I1_lin_default_wf_7_R0_G I1_lin_default_wf_7_R0_S vdd!
+*.PININFO I1_default_D:I I1_default_G:I I1_default_S:I 
+*.PININFO I1_lin_default_d_sab_0_R0_D:I I1_lin_default_d_sab_0_R0_G:I 
+*.PININFO I1_lin_default_d_sab_0_R0_S:I I1_lin_default_d_sab_1_R0_D:I 
+*.PININFO I1_lin_default_d_sab_1_R0_G:I I1_lin_default_d_sab_1_R0_S:I 
+*.PININFO I1_lin_default_d_sab_2_R0_D:I I1_lin_default_d_sab_2_R0_G:I 
+*.PININFO I1_lin_default_d_sab_2_R0_S:I I1_lin_default_d_sab_3_R0_D:I 
+*.PININFO I1_lin_default_d_sab_3_R0_G:I I1_lin_default_d_sab_3_R0_S:I 
+*.PININFO I1_lin_default_d_sab_4_R0_D:I I1_lin_default_d_sab_4_R0_G:I 
+*.PININFO I1_lin_default_d_sab_4_R0_S:I I1_lin_default_d_sab_5_R0_D:I 
+*.PININFO I1_lin_default_d_sab_5_R0_G:I I1_lin_default_d_sab_5_R0_S:I 
+*.PININFO I1_lin_default_d_sab_6_R0_D:I I1_lin_default_d_sab_6_R0_G:I 
+*.PININFO I1_lin_default_d_sab_6_R0_S:I I1_lin_default_d_sab_7_R0_D:I 
+*.PININFO I1_lin_default_d_sab_7_R0_G:I I1_lin_default_d_sab_7_R0_S:I 
+*.PININFO I1_lin_default_d_sab_8_R0_D:I I1_lin_default_d_sab_8_R0_G:I 
+*.PININFO I1_lin_default_d_sab_8_R0_S:I I1_lin_default_d_sab_9_R0_D:I 
+*.PININFO I1_lin_default_d_sab_9_R0_G:I I1_lin_default_d_sab_9_R0_S:I 
+*.PININFO I1_lin_default_gns_0_R0_D:I I1_lin_default_gns_0_R0_G:I 
+*.PININFO I1_lin_default_gns_0_R0_S:I I1_lin_default_gns_1_R0_D:I 
+*.PININFO I1_lin_default_gns_1_R0_G:I I1_lin_default_gns_1_R0_S:I 
+*.PININFO I1_lin_default_guardRing_0_R0_D:I I1_lin_default_guardRing_0_R0_G:I 
+*.PININFO I1_lin_default_guardRing_0_R0_S:I I1_lin_default_l_0_R0_D:I 
+*.PININFO I1_lin_default_l_0_R0_G:I I1_lin_default_l_0_R0_S:I 
+*.PININFO I1_lin_default_l_1_R0_D:I I1_lin_default_l_1_R0_G:I 
+*.PININFO I1_lin_default_l_1_R0_S:I I1_lin_default_l_2_R0_D:I 
+*.PININFO I1_lin_default_l_2_R0_G:I I1_lin_default_l_2_R0_S:I 
+*.PININFO I1_lin_default_l_3_R0_D:I I1_lin_default_l_3_R0_G:I 
+*.PININFO I1_lin_default_l_3_R0_S:I I1_lin_default_l_4_R0_D:I 
+*.PININFO I1_lin_default_l_4_R0_G:I I1_lin_default_l_4_R0_S:I 
+*.PININFO I1_lin_default_l_5_R0_D:I I1_lin_default_l_5_R0_G:I 
+*.PININFO I1_lin_default_l_5_R0_S:I I1_lin_default_l_6_R0_D:I 
+*.PININFO I1_lin_default_l_6_R0_G:I I1_lin_default_l_6_R0_S:I 
+*.PININFO I1_lin_default_l_7_R0_D:I I1_lin_default_l_7_R0_G:I 
+*.PININFO I1_lin_default_l_7_R0_S:I I1_lin_default_l_8_R0_D:I 
+*.PININFO I1_lin_default_l_8_R0_G:I I1_lin_default_l_8_R0_S:I 
+*.PININFO I1_lin_default_l_9_R0_D:I I1_lin_default_l_9_R0_G:I 
+*.PININFO I1_lin_default_l_9_R0_S:I I1_lin_default_l_10_R0_D:I 
+*.PININFO I1_lin_default_l_10_R0_G:I I1_lin_default_l_10_R0_S:I 
+*.PININFO I1_lin_default_l_11_R0_D:I I1_lin_default_l_11_R0_G:I 
+*.PININFO I1_lin_default_l_11_R0_S:I I1_lin_default_l_12_R0_D:I 
+*.PININFO I1_lin_default_l_12_R0_G:I I1_lin_default_l_12_R0_S:I 
+*.PININFO I1_lin_default_l_13_R0_D:I I1_lin_default_l_13_R0_G:I 
+*.PININFO I1_lin_default_l_13_R0_S:I I1_lin_default_l_14_R0_D:I 
+*.PININFO I1_lin_default_l_14_R0_G:I I1_lin_default_l_14_R0_S:I 
+*.PININFO I1_lin_default_m_0_R0_D:I I1_lin_default_m_0_R0_G:I 
+*.PININFO I1_lin_default_m_0_R0_S:I I1_lin_default_m_1_R0_D:I 
+*.PININFO I1_lin_default_m_1_R0_G:I I1_lin_default_m_1_R0_S:I 
+*.PININFO I1_lin_default_m_2_R0_D:I I1_lin_default_m_2_R0_G:I 
+*.PININFO I1_lin_default_m_2_R0_S:I I1_lin_default_nf_1_R0_D:I 
+*.PININFO I1_lin_default_nf_1_R0_G:I I1_lin_default_nf_1_R0_S:I 
+*.PININFO I1_lin_default_nf_2_R0_D:I I1_lin_default_nf_2_R0_G:I 
+*.PININFO I1_lin_default_nf_2_R0_S:I I1_lin_default_nf_3_R0_D:I 
+*.PININFO I1_lin_default_nf_3_R0_G:I I1_lin_default_nf_3_R0_S:I 
+*.PININFO I1_lin_default_nf_4_R0_D:I I1_lin_default_nf_4_R0_G:I 
+*.PININFO I1_lin_default_nf_4_R0_S:I I1_lin_default_nf_5_R0_D:I 
+*.PININFO I1_lin_default_nf_5_R0_G:I I1_lin_default_nf_5_R0_S:I 
+*.PININFO I1_lin_default_nf_6_R0_D:I I1_lin_default_nf_6_R0_G:I 
+*.PININFO I1_lin_default_nf_6_R0_S:I I1_lin_default_nf_7_R0_D:I 
+*.PININFO I1_lin_default_nf_7_R0_G:I I1_lin_default_nf_7_R0_S:I 
+*.PININFO I1_lin_default_nf_8_R0_D:I I1_lin_default_nf_8_R0_G:I 
+*.PININFO I1_lin_default_nf_8_R0_S:I I1_lin_default_s_sab_0_R0_D:I 
+*.PININFO I1_lin_default_s_sab_0_R0_G:I I1_lin_default_s_sab_0_R0_S:I 
+*.PININFO I1_lin_default_s_sab_1_R0_D:I I1_lin_default_s_sab_1_R0_G:I 
+*.PININFO I1_lin_default_s_sab_1_R0_S:I I1_lin_default_s_sab_2_R0_D:I 
+*.PININFO I1_lin_default_s_sab_2_R0_G:I I1_lin_default_s_sab_2_R0_S:I 
+*.PININFO I1_lin_default_s_sab_3_R0_D:I I1_lin_default_s_sab_3_R0_G:I 
+*.PININFO I1_lin_default_s_sab_3_R0_S:I I1_lin_default_s_sab_4_R0_D:I 
+*.PININFO I1_lin_default_s_sab_4_R0_G:I I1_lin_default_s_sab_4_R0_S:I 
+*.PININFO I1_lin_default_s_sab_5_R0_D:I I1_lin_default_s_sab_5_R0_G:I 
+*.PININFO I1_lin_default_s_sab_5_R0_S:I I1_lin_default_s_sab_6_R0_D:I 
+*.PININFO I1_lin_default_s_sab_6_R0_G:I I1_lin_default_s_sab_6_R0_S:I 
+*.PININFO I1_lin_default_s_sab_7_R0_D:I I1_lin_default_s_sab_7_R0_G:I 
+*.PININFO I1_lin_default_s_sab_7_R0_S:I I1_lin_default_strapSD_0_R0_D:I 
+*.PININFO I1_lin_default_strapSD_0_R0_G:I I1_lin_default_strapSD_0_R0_S:I 
+*.PININFO I1_lin_default_wf_0_R0_D:I I1_lin_default_wf_0_R0_G:I 
+*.PININFO I1_lin_default_wf_0_R0_S:I I1_lin_default_wf_1_R0_D:I 
+*.PININFO I1_lin_default_wf_1_R0_G:I I1_lin_default_wf_1_R0_S:I 
+*.PININFO I1_lin_default_wf_2_R0_D:I I1_lin_default_wf_2_R0_G:I 
+*.PININFO I1_lin_default_wf_2_R0_S:I I1_lin_default_wf_3_R0_D:I 
+*.PININFO I1_lin_default_wf_3_R0_G:I I1_lin_default_wf_3_R0_S:I 
+*.PININFO I1_lin_default_wf_4_R0_D:I I1_lin_default_wf_4_R0_G:I 
+*.PININFO I1_lin_default_wf_4_R0_S:I I1_lin_default_wf_5_R0_D:I 
+*.PININFO I1_lin_default_wf_5_R0_G:I I1_lin_default_wf_5_R0_S:I 
+*.PININFO I1_lin_default_wf_6_R0_D:I I1_lin_default_wf_6_R0_G:I 
+*.PININFO I1_lin_default_wf_6_R0_S:I I1_lin_default_wf_7_R0_D:I 
+*.PININFO I1_lin_default_wf_7_R0_G:I I1_lin_default_wf_7_R0_S:I vdd!:I
+MI1_lin_default_wf_7_R0 I1_lin_default_wf_7_R0_D I1_lin_default_wf_7_R0_G 
++ I1_lin_default_wf_7_R0_S vdd! nfet_05v0_dss m=1 w=720.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_6_R0 I1_lin_default_wf_6_R0_D I1_lin_default_wf_6_R0_G 
++ I1_lin_default_wf_6_R0_S vdd! nfet_05v0_dss m=1 w=716.640u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_5_R0 I1_lin_default_wf_5_R0_D I1_lin_default_wf_5_R0_G 
++ I1_lin_default_wf_5_R0_S vdd! nfet_05v0_dss m=1 w=597.180u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_4_R0 I1_lin_default_wf_4_R0_D I1_lin_default_wf_4_R0_G 
++ I1_lin_default_wf_4_R0_S vdd! nfet_05v0_dss m=1 w=497.640u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_3_R0 I1_lin_default_wf_3_R0_D I1_lin_default_wf_3_R0_G 
++ I1_lin_default_wf_3_R0_S vdd! nfet_05v0_dss m=1 w=414.720u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_2_R0 I1_lin_default_wf_2_R0_D I1_lin_default_wf_2_R0_G 
++ I1_lin_default_wf_2_R0_S vdd! nfet_05v0_dss m=1 w=345.600u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_1_R0 I1_lin_default_wf_1_R0_D I1_lin_default_wf_1_R0_G 
++ I1_lin_default_wf_1_R0_S vdd! nfet_05v0_dss m=1 w=288.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_0_R0 I1_lin_default_wf_0_R0_D I1_lin_default_wf_0_R0_G 
++ I1_lin_default_wf_0_R0_S vdd! nfet_05v0_dss m=1 w=240.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_14_R0 I1_lin_default_l_14_R0_D I1_lin_default_l_14_R0_G 
++ I1_lin_default_l_14_R0_S vdd! nfet_05v0_dss m=1 w=300u l=10.000u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_13_R0 I1_lin_default_l_13_R0_D I1_lin_default_l_13_R0_G 
++ I1_lin_default_l_13_R0_S vdd! nfet_05v0_dss m=1 w=300u l=8.560u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_12_R0 I1_lin_default_l_12_R0_D I1_lin_default_l_12_R0_G 
++ I1_lin_default_l_12_R0_S vdd! nfet_05v0_dss m=1 w=300u l=7.135u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_11_R0 I1_lin_default_l_11_R0_D I1_lin_default_l_11_R0_G 
++ I1_lin_default_l_11_R0_S vdd! nfet_05v0_dss m=1 w=300u l=5.945u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_10_R0 I1_lin_default_l_10_R0_D I1_lin_default_l_10_R0_G 
++ I1_lin_default_l_10_R0_S vdd! nfet_05v0_dss m=1 w=300u l=4.955u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_9_R0 I1_lin_default_l_9_R0_D I1_lin_default_l_9_R0_G 
++ I1_lin_default_l_9_R0_S vdd! nfet_05v0_dss m=1 w=300u l=4.130u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_8_R0 I1_lin_default_l_8_R0_D I1_lin_default_l_8_R0_G 
++ I1_lin_default_l_8_R0_S vdd! nfet_05v0_dss m=1 w=300u l=3.440u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_7_R0 I1_lin_default_l_7_R0_D I1_lin_default_l_7_R0_G 
++ I1_lin_default_l_7_R0_S vdd! nfet_05v0_dss m=1 w=300u l=2.865u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_6_R0 I1_lin_default_l_6_R0_D I1_lin_default_l_6_R0_G 
++ I1_lin_default_l_6_R0_S vdd! nfet_05v0_dss m=1 w=300u l=2.390u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_5_R0 I1_lin_default_l_5_R0_D I1_lin_default_l_5_R0_G 
++ I1_lin_default_l_5_R0_S vdd! nfet_05v0_dss m=1 w=300u l=1.990u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_4_R0 I1_lin_default_l_4_R0_D I1_lin_default_l_4_R0_G 
++ I1_lin_default_l_4_R0_S vdd! nfet_05v0_dss m=1 w=300u l=1.660u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_3_R0 I1_lin_default_l_3_R0_D I1_lin_default_l_3_R0_G 
++ I1_lin_default_l_3_R0_S vdd! nfet_05v0_dss m=1 w=300u l=1.380u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_2_R0 I1_lin_default_l_2_R0_D I1_lin_default_l_2_R0_G 
++ I1_lin_default_l_2_R0_S vdd! nfet_05v0_dss m=1 w=300u l=1.150u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_1_R0 I1_lin_default_l_1_R0_D I1_lin_default_l_1_R0_G 
++ I1_lin_default_l_1_R0_S vdd! nfet_05v0_dss m=1 w=300u l=0.960u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_0_R0 I1_lin_default_l_0_R0_D I1_lin_default_l_0_R0_G 
++ I1_lin_default_l_0_R0_S vdd! nfet_05v0_dss m=1 w=300u l=0.800u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_d_sab_9_R0 I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.780u par=1 dtemp=0
+MI1_lin_default_d_sab_8_R0 I1_lin_default_d_sab_8_R0_D 
++ I1_lin_default_d_sab_8_R0_G I1_lin_default_d_sab_8_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.355u par=1 dtemp=0
+MI1_lin_default_d_sab_7_R0 I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=2.795u par=1 dtemp=0
+MI1_lin_default_d_sab_6_R0 I1_lin_default_d_sab_6_R0_D 
++ I1_lin_default_d_sab_6_R0_G I1_lin_default_d_sab_6_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=2.330u par=1 dtemp=0
+MI1_lin_default_d_sab_5_R0 I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.940u par=1 dtemp=0
+MI1_lin_default_d_sab_4_R0 I1_lin_default_d_sab_4_R0_D 
++ I1_lin_default_d_sab_4_R0_G I1_lin_default_d_sab_4_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.615u par=1 dtemp=0
+MI1_lin_default_d_sab_3_R0 I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.350u par=1 dtemp=0
+MI1_lin_default_d_sab_2_R0 I1_lin_default_d_sab_2_R0_D 
++ I1_lin_default_d_sab_2_R0_G I1_lin_default_d_sab_2_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.125u par=1 dtemp=0
+MI1_lin_default_d_sab_1_R0 I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=0.935u par=1 dtemp=0
+MI1_lin_default_d_sab_0_R0 I1_lin_default_d_sab_0_R0_D 
++ I1_lin_default_d_sab_0_R0_G I1_lin_default_d_sab_0_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=0.780u par=1 dtemp=0
+MI1_lin_default_s_sab_7_R0 I1_lin_default_s_sab_7_R0_D 
++ I1_lin_default_s_sab_7_R0_G I1_lin_default_s_sab_7_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.780u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_6_R0 I1_lin_default_s_sab_6_R0_D 
++ I1_lin_default_s_sab_6_R0_G I1_lin_default_s_sab_6_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.655u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_5_R0 I1_lin_default_s_sab_5_R0_D 
++ I1_lin_default_s_sab_5_R0_G I1_lin_default_s_sab_5_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.545u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_4_R0 I1_lin_default_s_sab_4_R0_D 
++ I1_lin_default_s_sab_4_R0_G I1_lin_default_s_sab_4_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.455u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_3_R0 I1_lin_default_s_sab_3_R0_D 
++ I1_lin_default_s_sab_3_R0_G I1_lin_default_s_sab_3_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.380u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_2_R0 I1_lin_default_s_sab_2_R0_D 
++ I1_lin_default_s_sab_2_R0_G I1_lin_default_s_sab_2_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.315u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_1_R0 I1_lin_default_s_sab_1_R0_D 
++ I1_lin_default_s_sab_1_R0_G I1_lin_default_s_sab_1_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.265u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_0_R0 I1_lin_default_s_sab_0_R0_D 
++ I1_lin_default_s_sab_0_R0_G I1_lin_default_s_sab_0_R0_S vdd! nfet_05v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.220u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_8_R0 I1_lin_default_nf_8_R0_D I1_lin_default_nf_8_R0_G 
++ I1_lin_default_nf_8_R0_S vdd! nfet_05v0_dss m=1 w=450.000u l=0.8u nf=18 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_7_R0 I1_lin_default_nf_7_R0_D I1_lin_default_nf_7_R0_G 
++ I1_lin_default_nf_7_R0_S vdd! nfet_05v0_dss m=1 w=400.000u l=0.8u nf=16 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_6_R0 I1_lin_default_nf_6_R0_D I1_lin_default_nf_6_R0_G 
++ I1_lin_default_nf_6_R0_S vdd! nfet_05v0_dss m=1 w=350.000u l=0.8u nf=14 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_5_R0 I1_lin_default_nf_5_R0_D I1_lin_default_nf_5_R0_G 
++ I1_lin_default_nf_5_R0_S vdd! nfet_05v0_dss m=1 w=300.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_4_R0 I1_lin_default_nf_4_R0_D I1_lin_default_nf_4_R0_G 
++ I1_lin_default_nf_4_R0_S vdd! nfet_05v0_dss m=1 w=250.000u l=0.8u nf=10 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_3_R0 I1_lin_default_nf_3_R0_D I1_lin_default_nf_3_R0_G 
++ I1_lin_default_nf_3_R0_S vdd! nfet_05v0_dss m=1 w=200.000u l=0.8u nf=8 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_2_R0 I1_lin_default_nf_2_R0_D I1_lin_default_nf_2_R0_G 
++ I1_lin_default_nf_2_R0_S vdd! nfet_05v0_dss m=1 w=150.000u l=0.8u nf=6 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_1_R0 I1_lin_default_nf_1_R0_D I1_lin_default_nf_1_R0_G 
++ I1_lin_default_nf_1_R0_S vdd! nfet_05v0_dss m=1 w=100.000u l=0.8u nf=4 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_m_2_R0 I1_lin_default_m_2_R0_D I1_lin_default_m_2_R0_G 
++ I1_lin_default_m_2_R0_S vdd! nfet_05v0_dss m=3 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=3 dtemp=0
+MI1_lin_default_m_1_R0 I1_lin_default_m_1_R0_D I1_lin_default_m_1_R0_G 
++ I1_lin_default_m_1_R0_S vdd! nfet_05v0_dss m=2 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=2 dtemp=0
+MI1_lin_default_m_0_R0 I1_lin_default_m_0_R0_D I1_lin_default_m_0_R0_G 
++ I1_lin_default_m_0_R0_S vdd! nfet_05v0_dss m=1 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_gns_1_R0 I1_lin_default_gns_1_R0_D I1_lin_default_gns_1_R0_G 
++ I1_lin_default_gns_1_R0_S vdd! nfet_05v0_dss m=1 w=300u l=0.8u nf=12 s_sab=0 
++ d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_gns_0_R0 I1_lin_default_gns_0_R0_D I1_lin_default_gns_0_R0_G 
++ I1_lin_default_gns_0_R0_S vdd! nfet_05v0_dss m=1 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_guardRing_0_R0 I1_lin_default_guardRing_0_R0_D 
++ I1_lin_default_guardRing_0_R0_G I1_lin_default_guardRing_0_R0_S vdd! 
++ nfet_05v0_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_strapSD_0_R0 I1_lin_default_strapSD_0_R0_D 
++ I1_lin_default_strapSD_0_R0_G I1_lin_default_strapSD_0_R0_S vdd! 
++ nfet_05v0_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_default I1_default_D I1_default_G I1_default_S vdd! nfet_05v0_dss m=1 
++ w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+.ENDS
+
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_06v0_dn_dss.cdl b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_06v0_dn_dss.cdl
new file mode 100644
index 0000000..b391bf3
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_06v0_dn_dss.cdl
@@ -0,0 +1,362 @@
+************************************************************************
+* auCdl Netlist:
+* 
+* Library Name:  TCG_library_2
+* Top Cell Name: nfet_06v0_dn_dss
+* View Name:     schematic
+* Netlisted on:  Sep 10 16:46:35 2021
+************************************************************************
+
+*.EQUATION
+*.SCALE METER
+*.MEGA
+.PARAM
+
+*.GLOBAL vdd!
+
+*.PIN vdd!
+
+************************************************************************
+* Library Name: TCG_library_2
+* Cell Name:    nfet_06v0_dn_dss
+* View Name:    schematic
+************************************************************************
+
+.SUBCKT nfet_06v0_dn_dss I1_default_D I1_default_G I1_default_S 
++ I1_lin_default_d_sab_0_R0_D I1_lin_default_d_sab_0_R0_G 
++ I1_lin_default_d_sab_0_R0_S I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S 
++ I1_lin_default_d_sab_2_R0_D I1_lin_default_d_sab_2_R0_G 
++ I1_lin_default_d_sab_2_R0_S I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S 
++ I1_lin_default_d_sab_4_R0_D I1_lin_default_d_sab_4_R0_G 
++ I1_lin_default_d_sab_4_R0_S I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S 
++ I1_lin_default_d_sab_6_R0_D I1_lin_default_d_sab_6_R0_G 
++ I1_lin_default_d_sab_6_R0_S I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S 
++ I1_lin_default_d_sab_8_R0_D I1_lin_default_d_sab_8_R0_G 
++ I1_lin_default_d_sab_8_R0_S I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S 
++ I1_lin_default_gns_0_R0_D I1_lin_default_gns_0_R0_G 
++ I1_lin_default_gns_0_R0_S I1_lin_default_gns_1_R0_D 
++ I1_lin_default_gns_1_R0_G I1_lin_default_gns_1_R0_S 
++ I1_lin_default_guardRing_0_R0_D I1_lin_default_guardRing_0_R0_G 
++ I1_lin_default_guardRing_0_R0_S I1_lin_default_guardRing_1_R0_D 
++ I1_lin_default_guardRing_1_R0_G I1_lin_default_guardRing_1_R0_S 
++ I1_lin_default_l_0_R0_D I1_lin_default_l_0_R0_G I1_lin_default_l_0_R0_S 
++ I1_lin_default_l_1_R0_D I1_lin_default_l_1_R0_G I1_lin_default_l_1_R0_S 
++ I1_lin_default_l_2_R0_D I1_lin_default_l_2_R0_G I1_lin_default_l_2_R0_S 
++ I1_lin_default_l_3_R0_D I1_lin_default_l_3_R0_G I1_lin_default_l_3_R0_S 
++ I1_lin_default_l_4_R0_D I1_lin_default_l_4_R0_G I1_lin_default_l_4_R0_S 
++ I1_lin_default_l_5_R0_D I1_lin_default_l_5_R0_G I1_lin_default_l_5_R0_S 
++ I1_lin_default_l_6_R0_D I1_lin_default_l_6_R0_G I1_lin_default_l_6_R0_S 
++ I1_lin_default_l_7_R0_D I1_lin_default_l_7_R0_G I1_lin_default_l_7_R0_S 
++ I1_lin_default_l_8_R0_D I1_lin_default_l_8_R0_G I1_lin_default_l_8_R0_S 
++ I1_lin_default_l_9_R0_D I1_lin_default_l_9_R0_G I1_lin_default_l_9_R0_S 
++ I1_lin_default_l_10_R0_D I1_lin_default_l_10_R0_G I1_lin_default_l_10_R0_S 
++ I1_lin_default_l_11_R0_D I1_lin_default_l_11_R0_G I1_lin_default_l_11_R0_S 
++ I1_lin_default_l_12_R0_D I1_lin_default_l_12_R0_G I1_lin_default_l_12_R0_S 
++ I1_lin_default_l_13_R0_D I1_lin_default_l_13_R0_G I1_lin_default_l_13_R0_S 
++ I1_lin_default_l_14_R0_D I1_lin_default_l_14_R0_G I1_lin_default_l_14_R0_S 
++ I1_lin_default_m_0_R0_D I1_lin_default_m_0_R0_G I1_lin_default_m_0_R0_S 
++ I1_lin_default_m_1_R0_D I1_lin_default_m_1_R0_G I1_lin_default_m_1_R0_S 
++ I1_lin_default_m_2_R0_D I1_lin_default_m_2_R0_G I1_lin_default_m_2_R0_S 
++ I1_lin_default_nf_0_R0_D I1_lin_default_nf_0_R0_G I1_lin_default_nf_0_R0_S 
++ I1_lin_default_nf_1_R0_D I1_lin_default_nf_1_R0_G I1_lin_default_nf_1_R0_S 
++ I1_lin_default_nf_2_R0_D I1_lin_default_nf_2_R0_G I1_lin_default_nf_2_R0_S 
++ I1_lin_default_nf_3_R0_D I1_lin_default_nf_3_R0_G I1_lin_default_nf_3_R0_S 
++ I1_lin_default_nf_4_R0_D I1_lin_default_nf_4_R0_G I1_lin_default_nf_4_R0_S 
++ I1_lin_default_nf_5_R0_D I1_lin_default_nf_5_R0_G I1_lin_default_nf_5_R0_S 
++ I1_lin_default_nf_6_R0_D I1_lin_default_nf_6_R0_G I1_lin_default_nf_6_R0_S 
++ I1_lin_default_nf_7_R0_D I1_lin_default_nf_7_R0_G I1_lin_default_nf_7_R0_S 
++ I1_lin_default_psub_tap_0_R0_D I1_lin_default_psub_tap_0_R0_G 
++ I1_lin_default_psub_tap_0_R0_S I1_lin_default_s_sab_0_R0_D 
++ I1_lin_default_s_sab_0_R0_G I1_lin_default_s_sab_0_R0_S 
++ I1_lin_default_s_sab_1_R0_D I1_lin_default_s_sab_1_R0_G 
++ I1_lin_default_s_sab_1_R0_S I1_lin_default_s_sab_2_R0_D 
++ I1_lin_default_s_sab_2_R0_G I1_lin_default_s_sab_2_R0_S 
++ I1_lin_default_s_sab_3_R0_D I1_lin_default_s_sab_3_R0_G 
++ I1_lin_default_s_sab_3_R0_S I1_lin_default_s_sab_4_R0_D 
++ I1_lin_default_s_sab_4_R0_G I1_lin_default_s_sab_4_R0_S 
++ I1_lin_default_s_sab_5_R0_D I1_lin_default_s_sab_5_R0_G 
++ I1_lin_default_s_sab_5_R0_S I1_lin_default_s_sab_6_R0_D 
++ I1_lin_default_s_sab_6_R0_G I1_lin_default_s_sab_6_R0_S 
++ I1_lin_default_s_sab_7_R0_D I1_lin_default_s_sab_7_R0_G 
++ I1_lin_default_s_sab_7_R0_S I1_lin_default_strapSD_0_R0_D 
++ I1_lin_default_strapSD_0_R0_G I1_lin_default_strapSD_0_R0_S 
++ I1_lin_default_wf_0_R0_D I1_lin_default_wf_0_R0_G I1_lin_default_wf_0_R0_S 
++ I1_lin_default_wf_1_R0_D I1_lin_default_wf_1_R0_G I1_lin_default_wf_1_R0_S 
++ I1_lin_default_wf_2_R0_D I1_lin_default_wf_2_R0_G I1_lin_default_wf_2_R0_S 
++ I1_lin_default_wf_3_R0_D I1_lin_default_wf_3_R0_G I1_lin_default_wf_3_R0_S 
++ I1_lin_default_wf_4_R0_D I1_lin_default_wf_4_R0_G I1_lin_default_wf_4_R0_S 
++ I1_lin_default_wf_5_R0_D I1_lin_default_wf_5_R0_G I1_lin_default_wf_5_R0_S 
++ I1_lin_default_wf_6_R0_D I1_lin_default_wf_6_R0_G I1_lin_default_wf_6_R0_S 
++ I1_lin_default_wf_7_R0_D I1_lin_default_wf_7_R0_G I1_lin_default_wf_7_R0_S 
++ vdd!
+*.PININFO I1_default_D:I I1_default_G:I I1_default_S:I 
+*.PININFO I1_lin_default_d_sab_0_R0_D:I I1_lin_default_d_sab_0_R0_G:I 
+*.PININFO I1_lin_default_d_sab_0_R0_S:I I1_lin_default_d_sab_1_R0_D:I 
+*.PININFO I1_lin_default_d_sab_1_R0_G:I I1_lin_default_d_sab_1_R0_S:I 
+*.PININFO I1_lin_default_d_sab_2_R0_D:I I1_lin_default_d_sab_2_R0_G:I 
+*.PININFO I1_lin_default_d_sab_2_R0_S:I I1_lin_default_d_sab_3_R0_D:I 
+*.PININFO I1_lin_default_d_sab_3_R0_G:I I1_lin_default_d_sab_3_R0_S:I 
+*.PININFO I1_lin_default_d_sab_4_R0_D:I I1_lin_default_d_sab_4_R0_G:I 
+*.PININFO I1_lin_default_d_sab_4_R0_S:I I1_lin_default_d_sab_5_R0_D:I 
+*.PININFO I1_lin_default_d_sab_5_R0_G:I I1_lin_default_d_sab_5_R0_S:I 
+*.PININFO I1_lin_default_d_sab_6_R0_D:I I1_lin_default_d_sab_6_R0_G:I 
+*.PININFO I1_lin_default_d_sab_6_R0_S:I I1_lin_default_d_sab_7_R0_D:I 
+*.PININFO I1_lin_default_d_sab_7_R0_G:I I1_lin_default_d_sab_7_R0_S:I 
+*.PININFO I1_lin_default_d_sab_8_R0_D:I I1_lin_default_d_sab_8_R0_G:I 
+*.PININFO I1_lin_default_d_sab_8_R0_S:I I1_lin_default_d_sab_9_R0_D:I 
+*.PININFO I1_lin_default_d_sab_9_R0_G:I I1_lin_default_d_sab_9_R0_S:I 
+*.PININFO I1_lin_default_gns_0_R0_D:I I1_lin_default_gns_0_R0_G:I 
+*.PININFO I1_lin_default_gns_0_R0_S:I I1_lin_default_gns_1_R0_D:I 
+*.PININFO I1_lin_default_gns_1_R0_G:I I1_lin_default_gns_1_R0_S:I 
+*.PININFO I1_lin_default_guardRing_0_R0_D:I I1_lin_default_guardRing_0_R0_G:I 
+*.PININFO I1_lin_default_guardRing_0_R0_S:I I1_lin_default_guardRing_1_R0_D:I 
+*.PININFO I1_lin_default_guardRing_1_R0_G:I I1_lin_default_guardRing_1_R0_S:I 
+*.PININFO I1_lin_default_l_0_R0_D:I I1_lin_default_l_0_R0_G:I 
+*.PININFO I1_lin_default_l_0_R0_S:I I1_lin_default_l_1_R0_D:I 
+*.PININFO I1_lin_default_l_1_R0_G:I I1_lin_default_l_1_R0_S:I 
+*.PININFO I1_lin_default_l_2_R0_D:I I1_lin_default_l_2_R0_G:I 
+*.PININFO I1_lin_default_l_2_R0_S:I I1_lin_default_l_3_R0_D:I 
+*.PININFO I1_lin_default_l_3_R0_G:I I1_lin_default_l_3_R0_S:I 
+*.PININFO I1_lin_default_l_4_R0_D:I I1_lin_default_l_4_R0_G:I 
+*.PININFO I1_lin_default_l_4_R0_S:I I1_lin_default_l_5_R0_D:I 
+*.PININFO I1_lin_default_l_5_R0_G:I I1_lin_default_l_5_R0_S:I 
+*.PININFO I1_lin_default_l_6_R0_D:I I1_lin_default_l_6_R0_G:I 
+*.PININFO I1_lin_default_l_6_R0_S:I I1_lin_default_l_7_R0_D:I 
+*.PININFO I1_lin_default_l_7_R0_G:I I1_lin_default_l_7_R0_S:I 
+*.PININFO I1_lin_default_l_8_R0_D:I I1_lin_default_l_8_R0_G:I 
+*.PININFO I1_lin_default_l_8_R0_S:I I1_lin_default_l_9_R0_D:I 
+*.PININFO I1_lin_default_l_9_R0_G:I I1_lin_default_l_9_R0_S:I 
+*.PININFO I1_lin_default_l_10_R0_D:I I1_lin_default_l_10_R0_G:I 
+*.PININFO I1_lin_default_l_10_R0_S:I I1_lin_default_l_11_R0_D:I 
+*.PININFO I1_lin_default_l_11_R0_G:I I1_lin_default_l_11_R0_S:I 
+*.PININFO I1_lin_default_l_12_R0_D:I I1_lin_default_l_12_R0_G:I 
+*.PININFO I1_lin_default_l_12_R0_S:I I1_lin_default_l_13_R0_D:I 
+*.PININFO I1_lin_default_l_13_R0_G:I I1_lin_default_l_13_R0_S:I 
+*.PININFO I1_lin_default_l_14_R0_D:I I1_lin_default_l_14_R0_G:I 
+*.PININFO I1_lin_default_l_14_R0_S:I I1_lin_default_m_0_R0_D:I 
+*.PININFO I1_lin_default_m_0_R0_G:I I1_lin_default_m_0_R0_S:I 
+*.PININFO I1_lin_default_m_1_R0_D:I I1_lin_default_m_1_R0_G:I 
+*.PININFO I1_lin_default_m_1_R0_S:I I1_lin_default_m_2_R0_D:I 
+*.PININFO I1_lin_default_m_2_R0_G:I I1_lin_default_m_2_R0_S:I 
+*.PININFO I1_lin_default_nf_0_R0_D:I I1_lin_default_nf_0_R0_G:I 
+*.PININFO I1_lin_default_nf_0_R0_S:I I1_lin_default_nf_1_R0_D:I 
+*.PININFO I1_lin_default_nf_1_R0_G:I I1_lin_default_nf_1_R0_S:I 
+*.PININFO I1_lin_default_nf_2_R0_D:I I1_lin_default_nf_2_R0_G:I 
+*.PININFO I1_lin_default_nf_2_R0_S:I I1_lin_default_nf_3_R0_D:I 
+*.PININFO I1_lin_default_nf_3_R0_G:I I1_lin_default_nf_3_R0_S:I 
+*.PININFO I1_lin_default_nf_4_R0_D:I I1_lin_default_nf_4_R0_G:I 
+*.PININFO I1_lin_default_nf_4_R0_S:I I1_lin_default_nf_5_R0_D:I 
+*.PININFO I1_lin_default_nf_5_R0_G:I I1_lin_default_nf_5_R0_S:I 
+*.PININFO I1_lin_default_nf_6_R0_D:I I1_lin_default_nf_6_R0_G:I 
+*.PININFO I1_lin_default_nf_6_R0_S:I I1_lin_default_nf_7_R0_D:I 
+*.PININFO I1_lin_default_nf_7_R0_G:I I1_lin_default_nf_7_R0_S:I 
+*.PININFO I1_lin_default_psub_tap_0_R0_D:I I1_lin_default_psub_tap_0_R0_G:I 
+*.PININFO I1_lin_default_psub_tap_0_R0_S:I I1_lin_default_s_sab_0_R0_D:I 
+*.PININFO I1_lin_default_s_sab_0_R0_G:I I1_lin_default_s_sab_0_R0_S:I 
+*.PININFO I1_lin_default_s_sab_1_R0_D:I I1_lin_default_s_sab_1_R0_G:I 
+*.PININFO I1_lin_default_s_sab_1_R0_S:I I1_lin_default_s_sab_2_R0_D:I 
+*.PININFO I1_lin_default_s_sab_2_R0_G:I I1_lin_default_s_sab_2_R0_S:I 
+*.PININFO I1_lin_default_s_sab_3_R0_D:I I1_lin_default_s_sab_3_R0_G:I 
+*.PININFO I1_lin_default_s_sab_3_R0_S:I I1_lin_default_s_sab_4_R0_D:I 
+*.PININFO I1_lin_default_s_sab_4_R0_G:I I1_lin_default_s_sab_4_R0_S:I 
+*.PININFO I1_lin_default_s_sab_5_R0_D:I I1_lin_default_s_sab_5_R0_G:I 
+*.PININFO I1_lin_default_s_sab_5_R0_S:I I1_lin_default_s_sab_6_R0_D:I 
+*.PININFO I1_lin_default_s_sab_6_R0_G:I I1_lin_default_s_sab_6_R0_S:I 
+*.PININFO I1_lin_default_s_sab_7_R0_D:I I1_lin_default_s_sab_7_R0_G:I 
+*.PININFO I1_lin_default_s_sab_7_R0_S:I I1_lin_default_strapSD_0_R0_D:I 
+*.PININFO I1_lin_default_strapSD_0_R0_G:I I1_lin_default_strapSD_0_R0_S:I 
+*.PININFO I1_lin_default_wf_0_R0_D:I I1_lin_default_wf_0_R0_G:I 
+*.PININFO I1_lin_default_wf_0_R0_S:I I1_lin_default_wf_1_R0_D:I 
+*.PININFO I1_lin_default_wf_1_R0_G:I I1_lin_default_wf_1_R0_S:I 
+*.PININFO I1_lin_default_wf_2_R0_D:I I1_lin_default_wf_2_R0_G:I 
+*.PININFO I1_lin_default_wf_2_R0_S:I I1_lin_default_wf_3_R0_D:I 
+*.PININFO I1_lin_default_wf_3_R0_G:I I1_lin_default_wf_3_R0_S:I 
+*.PININFO I1_lin_default_wf_4_R0_D:I I1_lin_default_wf_4_R0_G:I 
+*.PININFO I1_lin_default_wf_4_R0_S:I I1_lin_default_wf_5_R0_D:I 
+*.PININFO I1_lin_default_wf_5_R0_G:I I1_lin_default_wf_5_R0_S:I 
+*.PININFO I1_lin_default_wf_6_R0_D:I I1_lin_default_wf_6_R0_G:I 
+*.PININFO I1_lin_default_wf_6_R0_S:I I1_lin_default_wf_7_R0_D:I 
+*.PININFO I1_lin_default_wf_7_R0_G:I I1_lin_default_wf_7_R0_S:I vdd!:I
+MI1_lin_default_wf_7_R0 I1_lin_default_wf_7_R0_D I1_lin_default_wf_7_R0_G 
++ I1_lin_default_wf_7_R0_S vdd! nfet_06v0_dn_dss m=1 w=720.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_6_R0 I1_lin_default_wf_6_R0_D I1_lin_default_wf_6_R0_G 
++ I1_lin_default_wf_6_R0_S vdd! nfet_06v0_dn_dss m=1 w=716.640u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_5_R0 I1_lin_default_wf_5_R0_D I1_lin_default_wf_5_R0_G 
++ I1_lin_default_wf_5_R0_S vdd! nfet_06v0_dn_dss m=1 w=597.180u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_4_R0 I1_lin_default_wf_4_R0_D I1_lin_default_wf_4_R0_G 
++ I1_lin_default_wf_4_R0_S vdd! nfet_06v0_dn_dss m=1 w=497.640u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_3_R0 I1_lin_default_wf_3_R0_D I1_lin_default_wf_3_R0_G 
++ I1_lin_default_wf_3_R0_S vdd! nfet_06v0_dn_dss m=1 w=414.720u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_2_R0 I1_lin_default_wf_2_R0_D I1_lin_default_wf_2_R0_G 
++ I1_lin_default_wf_2_R0_S vdd! nfet_06v0_dn_dss m=1 w=345.600u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_1_R0 I1_lin_default_wf_1_R0_D I1_lin_default_wf_1_R0_G 
++ I1_lin_default_wf_1_R0_S vdd! nfet_06v0_dn_dss m=1 w=288.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_0_R0 I1_lin_default_wf_0_R0_D I1_lin_default_wf_0_R0_G 
++ I1_lin_default_wf_0_R0_S vdd! nfet_06v0_dn_dss m=1 w=240.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_14_R0 I1_lin_default_l_14_R0_D I1_lin_default_l_14_R0_G 
++ I1_lin_default_l_14_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=10.000u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_13_R0 I1_lin_default_l_13_R0_D I1_lin_default_l_13_R0_G 
++ I1_lin_default_l_13_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=8.560u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_12_R0 I1_lin_default_l_12_R0_D I1_lin_default_l_12_R0_G 
++ I1_lin_default_l_12_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=7.135u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_11_R0 I1_lin_default_l_11_R0_D I1_lin_default_l_11_R0_G 
++ I1_lin_default_l_11_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=5.945u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_10_R0 I1_lin_default_l_10_R0_D I1_lin_default_l_10_R0_G 
++ I1_lin_default_l_10_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=4.955u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_9_R0 I1_lin_default_l_9_R0_D I1_lin_default_l_9_R0_G 
++ I1_lin_default_l_9_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=4.130u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_8_R0 I1_lin_default_l_8_R0_D I1_lin_default_l_8_R0_G 
++ I1_lin_default_l_8_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=3.440u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_7_R0 I1_lin_default_l_7_R0_D I1_lin_default_l_7_R0_G 
++ I1_lin_default_l_7_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=2.865u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_6_R0 I1_lin_default_l_6_R0_D I1_lin_default_l_6_R0_G 
++ I1_lin_default_l_6_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=2.390u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_5_R0 I1_lin_default_l_5_R0_D I1_lin_default_l_5_R0_G 
++ I1_lin_default_l_5_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=1.990u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_4_R0 I1_lin_default_l_4_R0_D I1_lin_default_l_4_R0_G 
++ I1_lin_default_l_4_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=1.660u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_3_R0 I1_lin_default_l_3_R0_D I1_lin_default_l_3_R0_G 
++ I1_lin_default_l_3_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=1.380u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_2_R0 I1_lin_default_l_2_R0_D I1_lin_default_l_2_R0_G 
++ I1_lin_default_l_2_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=1.150u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_1_R0 I1_lin_default_l_1_R0_D I1_lin_default_l_1_R0_G 
++ I1_lin_default_l_1_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=0.960u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_0_R0 I1_lin_default_l_0_R0_D I1_lin_default_l_0_R0_G 
++ I1_lin_default_l_0_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=0.800u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_d_sab_9_R0 I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.780u par=1 dtemp=0
+MI1_lin_default_d_sab_8_R0 I1_lin_default_d_sab_8_R0_D 
++ I1_lin_default_d_sab_8_R0_G I1_lin_default_d_sab_8_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.355u par=1 dtemp=0
+MI1_lin_default_d_sab_7_R0 I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=2.795u par=1 dtemp=0
+MI1_lin_default_d_sab_6_R0 I1_lin_default_d_sab_6_R0_D 
++ I1_lin_default_d_sab_6_R0_G I1_lin_default_d_sab_6_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=2.330u par=1 dtemp=0
+MI1_lin_default_d_sab_5_R0 I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.940u par=1 dtemp=0
+MI1_lin_default_d_sab_4_R0 I1_lin_default_d_sab_4_R0_D 
++ I1_lin_default_d_sab_4_R0_G I1_lin_default_d_sab_4_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.615u par=1 dtemp=0
+MI1_lin_default_d_sab_3_R0 I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.350u par=1 dtemp=0
+MI1_lin_default_d_sab_2_R0 I1_lin_default_d_sab_2_R0_D 
++ I1_lin_default_d_sab_2_R0_G I1_lin_default_d_sab_2_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.125u par=1 dtemp=0
+MI1_lin_default_d_sab_1_R0 I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=0.935u par=1 dtemp=0
+MI1_lin_default_d_sab_0_R0 I1_lin_default_d_sab_0_R0_D 
++ I1_lin_default_d_sab_0_R0_G I1_lin_default_d_sab_0_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=0.780u par=1 dtemp=0
+MI1_lin_default_s_sab_7_R0 I1_lin_default_s_sab_7_R0_D 
++ I1_lin_default_s_sab_7_R0_G I1_lin_default_s_sab_7_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.780u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_6_R0 I1_lin_default_s_sab_6_R0_D 
++ I1_lin_default_s_sab_6_R0_G I1_lin_default_s_sab_6_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.655u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_5_R0 I1_lin_default_s_sab_5_R0_D 
++ I1_lin_default_s_sab_5_R0_G I1_lin_default_s_sab_5_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.545u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_4_R0 I1_lin_default_s_sab_4_R0_D 
++ I1_lin_default_s_sab_4_R0_G I1_lin_default_s_sab_4_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.455u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_3_R0 I1_lin_default_s_sab_3_R0_D 
++ I1_lin_default_s_sab_3_R0_G I1_lin_default_s_sab_3_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.380u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_2_R0 I1_lin_default_s_sab_2_R0_D 
++ I1_lin_default_s_sab_2_R0_G I1_lin_default_s_sab_2_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.315u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_1_R0 I1_lin_default_s_sab_1_R0_D 
++ I1_lin_default_s_sab_1_R0_G I1_lin_default_s_sab_1_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.265u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_0_R0 I1_lin_default_s_sab_0_R0_D 
++ I1_lin_default_s_sab_0_R0_G I1_lin_default_s_sab_0_R0_S vdd! nfet_06v0_dn_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.220u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_7_R0 I1_lin_default_nf_7_R0_D I1_lin_default_nf_7_R0_G 
++ I1_lin_default_nf_7_R0_S vdd! nfet_06v0_dn_dss m=1 w=450.000u l=0.8u nf=18 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_6_R0 I1_lin_default_nf_6_R0_D I1_lin_default_nf_6_R0_G 
++ I1_lin_default_nf_6_R0_S vdd! nfet_06v0_dn_dss m=1 w=400.000u l=0.8u nf=16 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_5_R0 I1_lin_default_nf_5_R0_D I1_lin_default_nf_5_R0_G 
++ I1_lin_default_nf_5_R0_S vdd! nfet_06v0_dn_dss m=1 w=350.000u l=0.8u nf=14 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_4_R0 I1_lin_default_nf_4_R0_D I1_lin_default_nf_4_R0_G 
++ I1_lin_default_nf_4_R0_S vdd! nfet_06v0_dn_dss m=1 w=300.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_3_R0 I1_lin_default_nf_3_R0_D I1_lin_default_nf_3_R0_G 
++ I1_lin_default_nf_3_R0_S vdd! nfet_06v0_dn_dss m=1 w=250.000u l=0.8u nf=10 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_2_R0 I1_lin_default_nf_2_R0_D I1_lin_default_nf_2_R0_G 
++ I1_lin_default_nf_2_R0_S vdd! nfet_06v0_dn_dss m=1 w=200.000u l=0.8u nf=8 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_1_R0 I1_lin_default_nf_1_R0_D I1_lin_default_nf_1_R0_G 
++ I1_lin_default_nf_1_R0_S vdd! nfet_06v0_dn_dss m=1 w=150.000u l=0.8u nf=6 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_0_R0 I1_lin_default_nf_0_R0_D I1_lin_default_nf_0_R0_G 
++ I1_lin_default_nf_0_R0_S vdd! nfet_06v0_dn_dss m=1 w=100.000u l=0.8u nf=4 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_m_2_R0 I1_lin_default_m_2_R0_D I1_lin_default_m_2_R0_G 
++ I1_lin_default_m_2_R0_S vdd! nfet_06v0_dn_dss m=3 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=3 dtemp=0
+MI1_lin_default_m_1_R0 I1_lin_default_m_1_R0_D I1_lin_default_m_1_R0_G 
++ I1_lin_default_m_1_R0_S vdd! nfet_06v0_dn_dss m=2 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=2 dtemp=0
+MI1_lin_default_m_0_R0 I1_lin_default_m_0_R0_D I1_lin_default_m_0_R0_G 
++ I1_lin_default_m_0_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_gns_1_R0 I1_lin_default_gns_1_R0_D I1_lin_default_gns_1_R0_G 
++ I1_lin_default_gns_1_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=0.8u nf=12 
++ s_sab=0 d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_gns_0_R0 I1_lin_default_gns_0_R0_D I1_lin_default_gns_0_R0_G 
++ I1_lin_default_gns_0_R0_S vdd! nfet_06v0_dn_dss m=1 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_guardRing_1_R0 I1_lin_default_guardRing_1_R0_D 
++ I1_lin_default_guardRing_1_R0_G I1_lin_default_guardRing_1_R0_S vdd! 
++ nfet_06v0_dn_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_guardRing_0_R0 I1_lin_default_guardRing_0_R0_D 
++ I1_lin_default_guardRing_0_R0_G I1_lin_default_guardRing_0_R0_S vdd! 
++ nfet_06v0_dn_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_strapSD_0_R0 I1_lin_default_strapSD_0_R0_D 
++ I1_lin_default_strapSD_0_R0_G I1_lin_default_strapSD_0_R0_S vdd! 
++ nfet_06v0_dn_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_psub_tap_0_R0 I1_lin_default_psub_tap_0_R0_D 
++ I1_lin_default_psub_tap_0_R0_G I1_lin_default_psub_tap_0_R0_S vdd! 
++ nfet_06v0_dn_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_default I1_default_D I1_default_G I1_default_S vdd! nfet_06v0_dn_dss m=1 
++ w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+.ENDS
+
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_06v0_dss.cdl b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_06v0_dss.cdl
new file mode 100644
index 0000000..a086905
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/mos_sab_devices/netlist/nfet_06v0_dss.cdl
@@ -0,0 +1,350 @@
+************************************************************************
+* auCdl Netlist:
+* 
+* Library Name:  TCG_library_2
+* Top Cell Name: nfet_06v0_dss
+* View Name:     schematic
+* Netlisted on:  Sep 10 16:49:48 2021
+************************************************************************
+
+*.EQUATION
+*.SCALE METER
+*.MEGA
+.PARAM
+
+*.GLOBAL vdd!
+
+*.PIN vdd!
+
+************************************************************************
+* Library Name: TCG_library_2
+* Cell Name:    nfet_06v0_dss
+* View Name:    schematic
+************************************************************************
+
+.SUBCKT nfet_06v0_dss I1_default_D I1_default_G I1_default_S 
++ I1_lin_default_d_sab_0_R0_D I1_lin_default_d_sab_0_R0_G 
++ I1_lin_default_d_sab_0_R0_S I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S 
++ I1_lin_default_d_sab_2_R0_D I1_lin_default_d_sab_2_R0_G 
++ I1_lin_default_d_sab_2_R0_S I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S 
++ I1_lin_default_d_sab_4_R0_D I1_lin_default_d_sab_4_R0_G 
++ I1_lin_default_d_sab_4_R0_S I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S 
++ I1_lin_default_d_sab_6_R0_D I1_lin_default_d_sab_6_R0_G 
++ I1_lin_default_d_sab_6_R0_S I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S 
++ I1_lin_default_d_sab_8_R0_D I1_lin_default_d_sab_8_R0_G 
++ I1_lin_default_d_sab_8_R0_S I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S 
++ I1_lin_default_gns_0_R0_D I1_lin_default_gns_0_R0_G 
++ I1_lin_default_gns_0_R0_S I1_lin_default_gns_1_R0_D 
++ I1_lin_default_gns_1_R0_G I1_lin_default_gns_1_R0_S 
++ I1_lin_default_guardRing_0_R0_D I1_lin_default_guardRing_0_R0_G 
++ I1_lin_default_guardRing_0_R0_S I1_lin_default_l_0_R0_D 
++ I1_lin_default_l_0_R0_G I1_lin_default_l_0_R0_S I1_lin_default_l_1_R0_D 
++ I1_lin_default_l_1_R0_G I1_lin_default_l_1_R0_S I1_lin_default_l_2_R0_D 
++ I1_lin_default_l_2_R0_G I1_lin_default_l_2_R0_S I1_lin_default_l_3_R0_D 
++ I1_lin_default_l_3_R0_G I1_lin_default_l_3_R0_S I1_lin_default_l_4_R0_D 
++ I1_lin_default_l_4_R0_G I1_lin_default_l_4_R0_S I1_lin_default_l_5_R0_D 
++ I1_lin_default_l_5_R0_G I1_lin_default_l_5_R0_S I1_lin_default_l_6_R0_D 
++ I1_lin_default_l_6_R0_G I1_lin_default_l_6_R0_S I1_lin_default_l_7_R0_D 
++ I1_lin_default_l_7_R0_G I1_lin_default_l_7_R0_S I1_lin_default_l_8_R0_D 
++ I1_lin_default_l_8_R0_G I1_lin_default_l_8_R0_S I1_lin_default_l_9_R0_D 
++ I1_lin_default_l_9_R0_G I1_lin_default_l_9_R0_S I1_lin_default_l_10_R0_D 
++ I1_lin_default_l_10_R0_G I1_lin_default_l_10_R0_S I1_lin_default_l_11_R0_D 
++ I1_lin_default_l_11_R0_G I1_lin_default_l_11_R0_S I1_lin_default_l_12_R0_D 
++ I1_lin_default_l_12_R0_G I1_lin_default_l_12_R0_S I1_lin_default_l_13_R0_D 
++ I1_lin_default_l_13_R0_G I1_lin_default_l_13_R0_S I1_lin_default_l_14_R0_D 
++ I1_lin_default_l_14_R0_G I1_lin_default_l_14_R0_S I1_lin_default_m_0_R0_D 
++ I1_lin_default_m_0_R0_G I1_lin_default_m_0_R0_S I1_lin_default_m_1_R0_D 
++ I1_lin_default_m_1_R0_G I1_lin_default_m_1_R0_S I1_lin_default_m_2_R0_D 
++ I1_lin_default_m_2_R0_G I1_lin_default_m_2_R0_S I1_lin_default_nf_1_R0_D 
++ I1_lin_default_nf_1_R0_G I1_lin_default_nf_1_R0_S I1_lin_default_nf_2_R0_D 
++ I1_lin_default_nf_2_R0_G I1_lin_default_nf_2_R0_S I1_lin_default_nf_3_R0_D 
++ I1_lin_default_nf_3_R0_G I1_lin_default_nf_3_R0_S I1_lin_default_nf_4_R0_D 
++ I1_lin_default_nf_4_R0_G I1_lin_default_nf_4_R0_S I1_lin_default_nf_5_R0_D 
++ I1_lin_default_nf_5_R0_G I1_lin_default_nf_5_R0_S I1_lin_default_nf_6_R0_D 
++ I1_lin_default_nf_6_R0_G I1_lin_default_nf_6_R0_S I1_lin_default_nf_7_R0_D 
++ I1_lin_default_nf_7_R0_G I1_lin_default_nf_7_R0_S I1_lin_default_nf_8_R0_D 
++ I1_lin_default_nf_8_R0_G I1_lin_default_nf_8_R0_S 
++ I1_lin_default_s_sab_0_R0_D I1_lin_default_s_sab_0_R0_G 
++ I1_lin_default_s_sab_0_R0_S I1_lin_default_s_sab_1_R0_D 
++ I1_lin_default_s_sab_1_R0_G I1_lin_default_s_sab_1_R0_S 
++ I1_lin_default_s_sab_2_R0_D I1_lin_default_s_sab_2_R0_G 
++ I1_lin_default_s_sab_2_R0_S I1_lin_default_s_sab_3_R0_D 
++ I1_lin_default_s_sab_3_R0_G I1_lin_default_s_sab_3_R0_S 
++ I1_lin_default_s_sab_4_R0_D I1_lin_default_s_sab_4_R0_G 
++ I1_lin_default_s_sab_4_R0_S I1_lin_default_s_sab_5_R0_D 
++ I1_lin_default_s_sab_5_R0_G I1_lin_default_s_sab_5_R0_S 
++ I1_lin_default_s_sab_6_R0_D I1_lin_default_s_sab_6_R0_G 
++ I1_lin_default_s_sab_6_R0_S I1_lin_default_s_sab_7_R0_D 
++ I1_lin_default_s_sab_7_R0_G I1_lin_default_s_sab_7_R0_S 
++ I1_lin_default_strapSD_0_R0_D I1_lin_default_strapSD_0_R0_G 
++ I1_lin_default_strapSD_0_R0_S I1_lin_default_wf_0_R0_D 
++ I1_lin_default_wf_0_R0_G I1_lin_default_wf_0_R0_S I1_lin_default_wf_1_R0_D 
++ I1_lin_default_wf_1_R0_G I1_lin_default_wf_1_R0_S I1_lin_default_wf_2_R0_D 
++ I1_lin_default_wf_2_R0_G I1_lin_default_wf_2_R0_S I1_lin_default_wf_3_R0_D 
++ I1_lin_default_wf_3_R0_G I1_lin_default_wf_3_R0_S I1_lin_default_wf_4_R0_D 
++ I1_lin_default_wf_4_R0_G I1_lin_default_wf_4_R0_S I1_lin_default_wf_5_R0_D 
++ I1_lin_default_wf_5_R0_G I1_lin_default_wf_5_R0_S I1_lin_default_wf_6_R0_D 
++ I1_lin_default_wf_6_R0_G I1_lin_default_wf_6_R0_S I1_lin_default_wf_7_R0_D 
++ I1_lin_default_wf_7_R0_G I1_lin_default_wf_7_R0_S vdd!
+*.PININFO I1_default_D:I I1_default_G:I I1_default_S:I 
+*.PININFO I1_lin_default_d_sab_0_R0_D:I I1_lin_default_d_sab_0_R0_G:I 
+*.PININFO I1_lin_default_d_sab_0_R0_S:I I1_lin_default_d_sab_1_R0_D:I 
+*.PININFO I1_lin_default_d_sab_1_R0_G:I I1_lin_default_d_sab_1_R0_S:I 
+*.PININFO I1_lin_default_d_sab_2_R0_D:I I1_lin_default_d_sab_2_R0_G:I 
+*.PININFO I1_lin_default_d_sab_2_R0_S:I I1_lin_default_d_sab_3_R0_D:I 
+*.PININFO I1_lin_default_d_sab_3_R0_G:I I1_lin_default_d_sab_3_R0_S:I 
+*.PININFO I1_lin_default_d_sab_4_R0_D:I I1_lin_default_d_sab_4_R0_G:I 
+*.PININFO I1_lin_default_d_sab_4_R0_S:I I1_lin_default_d_sab_5_R0_D:I 
+*.PININFO I1_lin_default_d_sab_5_R0_G:I I1_lin_default_d_sab_5_R0_S:I 
+*.PININFO I1_lin_default_d_sab_6_R0_D:I I1_lin_default_d_sab_6_R0_G:I 
+*.PININFO I1_lin_default_d_sab_6_R0_S:I I1_lin_default_d_sab_7_R0_D:I 
+*.PININFO I1_lin_default_d_sab_7_R0_G:I I1_lin_default_d_sab_7_R0_S:I 
+*.PININFO I1_lin_default_d_sab_8_R0_D:I I1_lin_default_d_sab_8_R0_G:I 
+*.PININFO I1_lin_default_d_sab_8_R0_S:I I1_lin_default_d_sab_9_R0_D:I 
+*.PININFO I1_lin_default_d_sab_9_R0_G:I I1_lin_default_d_sab_9_R0_S:I 
+*.PININFO I1_lin_default_gns_0_R0_D:I I1_lin_default_gns_0_R0_G:I 
+*.PININFO I1_lin_default_gns_0_R0_S:I I1_lin_default_gns_1_R0_D:I 
+*.PININFO I1_lin_default_gns_1_R0_G:I I1_lin_default_gns_1_R0_S:I 
+*.PININFO I1_lin_default_guardRing_0_R0_D:I I1_lin_default_guardRing_0_R0_G:I 
+*.PININFO I1_lin_default_guardRing_0_R0_S:I I1_lin_default_l_0_R0_D:I 
+*.PININFO I1_lin_default_l_0_R0_G:I I1_lin_default_l_0_R0_S:I 
+*.PININFO I1_lin_default_l_1_R0_D:I I1_lin_default_l_1_R0_G:I 
+*.PININFO I1_lin_default_l_1_R0_S:I I1_lin_default_l_2_R0_D:I 
+*.PININFO I1_lin_default_l_2_R0_G:I I1_lin_default_l_2_R0_S:I 
+*.PININFO I1_lin_default_l_3_R0_D:I I1_lin_default_l_3_R0_G:I 
+*.PININFO I1_lin_default_l_3_R0_S:I I1_lin_default_l_4_R0_D:I 
+*.PININFO I1_lin_default_l_4_R0_G:I I1_lin_default_l_4_R0_S:I 
+*.PININFO I1_lin_default_l_5_R0_D:I I1_lin_default_l_5_R0_G:I 
+*.PININFO I1_lin_default_l_5_R0_S:I I1_lin_default_l_6_R0_D:I 
+*.PININFO I1_lin_default_l_6_R0_G:I I1_lin_default_l_6_R0_S:I 
+*.PININFO I1_lin_default_l_7_R0_D:I I1_lin_default_l_7_R0_G:I 
+*.PININFO I1_lin_default_l_7_R0_S:I I1_lin_default_l_8_R0_D:I 
+*.PININFO I1_lin_default_l_8_R0_G:I I1_lin_default_l_8_R0_S:I 
+*.PININFO I1_lin_default_l_9_R0_D:I I1_lin_default_l_9_R0_G:I 
+*.PININFO I1_lin_default_l_9_R0_S:I I1_lin_default_l_10_R0_D:I 
+*.PININFO I1_lin_default_l_10_R0_G:I I1_lin_default_l_10_R0_S:I 
+*.PININFO I1_lin_default_l_11_R0_D:I I1_lin_default_l_11_R0_G:I 
+*.PININFO I1_lin_default_l_11_R0_S:I I1_lin_default_l_12_R0_D:I 
+*.PININFO I1_lin_default_l_12_R0_G:I I1_lin_default_l_12_R0_S:I 
+*.PININFO I1_lin_default_l_13_R0_D:I I1_lin_default_l_13_R0_G:I 
+*.PININFO I1_lin_default_l_13_R0_S:I I1_lin_default_l_14_R0_D:I 
+*.PININFO I1_lin_default_l_14_R0_G:I I1_lin_default_l_14_R0_S:I 
+*.PININFO I1_lin_default_m_0_R0_D:I I1_lin_default_m_0_R0_G:I 
+*.PININFO I1_lin_default_m_0_R0_S:I I1_lin_default_m_1_R0_D:I 
+*.PININFO I1_lin_default_m_1_R0_G:I I1_lin_default_m_1_R0_S:I 
+*.PININFO I1_lin_default_m_2_R0_D:I I1_lin_default_m_2_R0_G:I 
+*.PININFO I1_lin_default_m_2_R0_S:I I1_lin_default_nf_1_R0_D:I 
+*.PININFO I1_lin_default_nf_1_R0_G:I I1_lin_default_nf_1_R0_S:I 
+*.PININFO I1_lin_default_nf_2_R0_D:I I1_lin_default_nf_2_R0_G:I 
+*.PININFO I1_lin_default_nf_2_R0_S:I I1_lin_default_nf_3_R0_D:I 
+*.PININFO I1_lin_default_nf_3_R0_G:I I1_lin_default_nf_3_R0_S:I 
+*.PININFO I1_lin_default_nf_4_R0_D:I I1_lin_default_nf_4_R0_G:I 
+*.PININFO I1_lin_default_nf_4_R0_S:I I1_lin_default_nf_5_R0_D:I 
+*.PININFO I1_lin_default_nf_5_R0_G:I I1_lin_default_nf_5_R0_S:I 
+*.PININFO I1_lin_default_nf_6_R0_D:I I1_lin_default_nf_6_R0_G:I 
+*.PININFO I1_lin_default_nf_6_R0_S:I I1_lin_default_nf_7_R0_D:I 
+*.PININFO I1_lin_default_nf_7_R0_G:I I1_lin_default_nf_7_R0_S:I 
+*.PININFO I1_lin_default_nf_8_R0_D:I I1_lin_default_nf_8_R0_G:I 
+*.PININFO I1_lin_default_nf_8_R0_S:I I1_lin_default_s_sab_0_R0_D:I 
+*.PININFO I1_lin_default_s_sab_0_R0_G:I I1_lin_default_s_sab_0_R0_S:I 
+*.PININFO I1_lin_default_s_sab_1_R0_D:I I1_lin_default_s_sab_1_R0_G:I 
+*.PININFO I1_lin_default_s_sab_1_R0_S:I I1_lin_default_s_sab_2_R0_D:I 
+*.PININFO I1_lin_default_s_sab_2_R0_G:I I1_lin_default_s_sab_2_R0_S:I 
+*.PININFO I1_lin_default_s_sab_3_R0_D:I I1_lin_default_s_sab_3_R0_G:I 
+*.PININFO I1_lin_default_s_sab_3_R0_S:I I1_lin_default_s_sab_4_R0_D:I 
+*.PININFO I1_lin_default_s_sab_4_R0_G:I I1_lin_default_s_sab_4_R0_S:I 
+*.PININFO I1_lin_default_s_sab_5_R0_D:I I1_lin_default_s_sab_5_R0_G:I 
+*.PININFO I1_lin_default_s_sab_5_R0_S:I I1_lin_default_s_sab_6_R0_D:I 
+*.PININFO I1_lin_default_s_sab_6_R0_G:I I1_lin_default_s_sab_6_R0_S:I 
+*.PININFO I1_lin_default_s_sab_7_R0_D:I I1_lin_default_s_sab_7_R0_G:I 
+*.PININFO I1_lin_default_s_sab_7_R0_S:I I1_lin_default_strapSD_0_R0_D:I 
+*.PININFO I1_lin_default_strapSD_0_R0_G:I I1_lin_default_strapSD_0_R0_S:I 
+*.PININFO I1_lin_default_wf_0_R0_D:I I1_lin_default_wf_0_R0_G:I 
+*.PININFO I1_lin_default_wf_0_R0_S:I I1_lin_default_wf_1_R0_D:I 
+*.PININFO I1_lin_default_wf_1_R0_G:I I1_lin_default_wf_1_R0_S:I 
+*.PININFO I1_lin_default_wf_2_R0_D:I I1_lin_default_wf_2_R0_G:I 
+*.PININFO I1_lin_default_wf_2_R0_S:I I1_lin_default_wf_3_R0_D:I 
+*.PININFO I1_lin_default_wf_3_R0_G:I I1_lin_default_wf_3_R0_S:I 
+*.PININFO I1_lin_default_wf_4_R0_D:I I1_lin_default_wf_4_R0_G:I 
+*.PININFO I1_lin_default_wf_4_R0_S:I I1_lin_default_wf_5_R0_D:I 
+*.PININFO I1_lin_default_wf_5_R0_G:I I1_lin_default_wf_5_R0_S:I 
+*.PININFO I1_lin_default_wf_6_R0_D:I I1_lin_default_wf_6_R0_G:I 
+*.PININFO I1_lin_default_wf_6_R0_S:I I1_lin_default_wf_7_R0_D:I 
+*.PININFO I1_lin_default_wf_7_R0_G:I I1_lin_default_wf_7_R0_S:I vdd!:I
+MI1_lin_default_wf_7_R0 I1_lin_default_wf_7_R0_D I1_lin_default_wf_7_R0_G 
++ I1_lin_default_wf_7_R0_S vdd! nfet_06v0_dss m=1 w=720.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_6_R0 I1_lin_default_wf_6_R0_D I1_lin_default_wf_6_R0_G 
++ I1_lin_default_wf_6_R0_S vdd! nfet_06v0_dss m=1 w=716.640u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_5_R0 I1_lin_default_wf_5_R0_D I1_lin_default_wf_5_R0_G 
++ I1_lin_default_wf_5_R0_S vdd! nfet_06v0_dss m=1 w=597.180u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_4_R0 I1_lin_default_wf_4_R0_D I1_lin_default_wf_4_R0_G 
++ I1_lin_default_wf_4_R0_S vdd! nfet_06v0_dss m=1 w=497.640u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_3_R0 I1_lin_default_wf_3_R0_D I1_lin_default_wf_3_R0_G 
++ I1_lin_default_wf_3_R0_S vdd! nfet_06v0_dss m=1 w=414.720u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_2_R0 I1_lin_default_wf_2_R0_D I1_lin_default_wf_2_R0_G 
++ I1_lin_default_wf_2_R0_S vdd! nfet_06v0_dss m=1 w=345.600u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_1_R0 I1_lin_default_wf_1_R0_D I1_lin_default_wf_1_R0_G 
++ I1_lin_default_wf_1_R0_S vdd! nfet_06v0_dss m=1 w=288.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_wf_0_R0 I1_lin_default_wf_0_R0_D I1_lin_default_wf_0_R0_G 
++ I1_lin_default_wf_0_R0_S vdd! nfet_06v0_dss m=1 w=240.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_14_R0 I1_lin_default_l_14_R0_D I1_lin_default_l_14_R0_G 
++ I1_lin_default_l_14_R0_S vdd! nfet_06v0_dss m=1 w=300u l=10.000u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_13_R0 I1_lin_default_l_13_R0_D I1_lin_default_l_13_R0_G 
++ I1_lin_default_l_13_R0_S vdd! nfet_06v0_dss m=1 w=300u l=8.560u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_12_R0 I1_lin_default_l_12_R0_D I1_lin_default_l_12_R0_G 
++ I1_lin_default_l_12_R0_S vdd! nfet_06v0_dss m=1 w=300u l=7.135u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_11_R0 I1_lin_default_l_11_R0_D I1_lin_default_l_11_R0_G 
++ I1_lin_default_l_11_R0_S vdd! nfet_06v0_dss m=1 w=300u l=5.945u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_10_R0 I1_lin_default_l_10_R0_D I1_lin_default_l_10_R0_G 
++ I1_lin_default_l_10_R0_S vdd! nfet_06v0_dss m=1 w=300u l=4.955u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_9_R0 I1_lin_default_l_9_R0_D I1_lin_default_l_9_R0_G 
++ I1_lin_default_l_9_R0_S vdd! nfet_06v0_dss m=1 w=300u l=4.130u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_8_R0 I1_lin_default_l_8_R0_D I1_lin_default_l_8_R0_G 
++ I1_lin_default_l_8_R0_S vdd! nfet_06v0_dss m=1 w=300u l=3.440u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_7_R0 I1_lin_default_l_7_R0_D I1_lin_default_l_7_R0_G 
++ I1_lin_default_l_7_R0_S vdd! nfet_06v0_dss m=1 w=300u l=2.865u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_6_R0 I1_lin_default_l_6_R0_D I1_lin_default_l_6_R0_G 
++ I1_lin_default_l_6_R0_S vdd! nfet_06v0_dss m=1 w=300u l=2.390u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_5_R0 I1_lin_default_l_5_R0_D I1_lin_default_l_5_R0_G 
++ I1_lin_default_l_5_R0_S vdd! nfet_06v0_dss m=1 w=300u l=1.990u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_4_R0 I1_lin_default_l_4_R0_D I1_lin_default_l_4_R0_G 
++ I1_lin_default_l_4_R0_S vdd! nfet_06v0_dss m=1 w=300u l=1.660u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_3_R0 I1_lin_default_l_3_R0_D I1_lin_default_l_3_R0_G 
++ I1_lin_default_l_3_R0_S vdd! nfet_06v0_dss m=1 w=300u l=1.380u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_2_R0 I1_lin_default_l_2_R0_D I1_lin_default_l_2_R0_G 
++ I1_lin_default_l_2_R0_S vdd! nfet_06v0_dss m=1 w=300u l=1.150u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_1_R0 I1_lin_default_l_1_R0_D I1_lin_default_l_1_R0_G 
++ I1_lin_default_l_1_R0_S vdd! nfet_06v0_dss m=1 w=300u l=0.960u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_l_0_R0 I1_lin_default_l_0_R0_D I1_lin_default_l_0_R0_G 
++ I1_lin_default_l_0_R0_S vdd! nfet_06v0_dss m=1 w=300u l=0.800u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_d_sab_9_R0 I1_lin_default_d_sab_9_R0_D 
++ I1_lin_default_d_sab_9_R0_G I1_lin_default_d_sab_9_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.780u par=1 dtemp=0
+MI1_lin_default_d_sab_8_R0 I1_lin_default_d_sab_8_R0_D 
++ I1_lin_default_d_sab_8_R0_G I1_lin_default_d_sab_8_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.355u par=1 dtemp=0
+MI1_lin_default_d_sab_7_R0 I1_lin_default_d_sab_7_R0_D 
++ I1_lin_default_d_sab_7_R0_G I1_lin_default_d_sab_7_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=2.795u par=1 dtemp=0
+MI1_lin_default_d_sab_6_R0 I1_lin_default_d_sab_6_R0_D 
++ I1_lin_default_d_sab_6_R0_G I1_lin_default_d_sab_6_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=2.330u par=1 dtemp=0
+MI1_lin_default_d_sab_5_R0 I1_lin_default_d_sab_5_R0_D 
++ I1_lin_default_d_sab_5_R0_G I1_lin_default_d_sab_5_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.940u par=1 dtemp=0
+MI1_lin_default_d_sab_4_R0 I1_lin_default_d_sab_4_R0_D 
++ I1_lin_default_d_sab_4_R0_G I1_lin_default_d_sab_4_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.615u par=1 dtemp=0
+MI1_lin_default_d_sab_3_R0 I1_lin_default_d_sab_3_R0_D 
++ I1_lin_default_d_sab_3_R0_G I1_lin_default_d_sab_3_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.350u par=1 dtemp=0
+MI1_lin_default_d_sab_2_R0 I1_lin_default_d_sab_2_R0_D 
++ I1_lin_default_d_sab_2_R0_G I1_lin_default_d_sab_2_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=1.125u par=1 dtemp=0
+MI1_lin_default_d_sab_1_R0 I1_lin_default_d_sab_1_R0_D 
++ I1_lin_default_d_sab_1_R0_G I1_lin_default_d_sab_1_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=0.935u par=1 dtemp=0
+MI1_lin_default_d_sab_0_R0 I1_lin_default_d_sab_0_R0_D 
++ I1_lin_default_d_sab_0_R0_G I1_lin_default_d_sab_0_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=0.780u par=1 dtemp=0
+MI1_lin_default_s_sab_7_R0 I1_lin_default_s_sab_7_R0_D 
++ I1_lin_default_s_sab_7_R0_G I1_lin_default_s_sab_7_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.780u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_6_R0 I1_lin_default_s_sab_6_R0_D 
++ I1_lin_default_s_sab_6_R0_G I1_lin_default_s_sab_6_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.655u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_5_R0 I1_lin_default_s_sab_5_R0_D 
++ I1_lin_default_s_sab_5_R0_G I1_lin_default_s_sab_5_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.545u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_4_R0 I1_lin_default_s_sab_4_R0_D 
++ I1_lin_default_s_sab_4_R0_G I1_lin_default_s_sab_4_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.455u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_3_R0 I1_lin_default_s_sab_3_R0_D 
++ I1_lin_default_s_sab_3_R0_G I1_lin_default_s_sab_3_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.380u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_2_R0 I1_lin_default_s_sab_2_R0_D 
++ I1_lin_default_s_sab_2_R0_G I1_lin_default_s_sab_2_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.315u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_1_R0 I1_lin_default_s_sab_1_R0_D 
++ I1_lin_default_s_sab_1_R0_G I1_lin_default_s_sab_1_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.265u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_s_sab_0_R0 I1_lin_default_s_sab_0_R0_D 
++ I1_lin_default_s_sab_0_R0_G I1_lin_default_s_sab_0_R0_S vdd! nfet_06v0_dss 
++ m=1 w=300u l=0.8u nf=12 s_sab=0.220u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_8_R0 I1_lin_default_nf_8_R0_D I1_lin_default_nf_8_R0_G 
++ I1_lin_default_nf_8_R0_S vdd! nfet_06v0_dss m=1 w=450.000u l=0.8u nf=18 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_7_R0 I1_lin_default_nf_7_R0_D I1_lin_default_nf_7_R0_G 
++ I1_lin_default_nf_7_R0_S vdd! nfet_06v0_dss m=1 w=400.000u l=0.8u nf=16 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_6_R0 I1_lin_default_nf_6_R0_D I1_lin_default_nf_6_R0_G 
++ I1_lin_default_nf_6_R0_S vdd! nfet_06v0_dss m=1 w=350.000u l=0.8u nf=14 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_5_R0 I1_lin_default_nf_5_R0_D I1_lin_default_nf_5_R0_G 
++ I1_lin_default_nf_5_R0_S vdd! nfet_06v0_dss m=1 w=300.000u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_4_R0 I1_lin_default_nf_4_R0_D I1_lin_default_nf_4_R0_G 
++ I1_lin_default_nf_4_R0_S vdd! nfet_06v0_dss m=1 w=250.000u l=0.8u nf=10 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_3_R0 I1_lin_default_nf_3_R0_D I1_lin_default_nf_3_R0_G 
++ I1_lin_default_nf_3_R0_S vdd! nfet_06v0_dss m=1 w=200.000u l=0.8u nf=8 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_2_R0 I1_lin_default_nf_2_R0_D I1_lin_default_nf_2_R0_G 
++ I1_lin_default_nf_2_R0_S vdd! nfet_06v0_dss m=1 w=150.000u l=0.8u nf=6 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_nf_1_R0 I1_lin_default_nf_1_R0_D I1_lin_default_nf_1_R0_G 
++ I1_lin_default_nf_1_R0_S vdd! nfet_06v0_dss m=1 w=100.000u l=0.8u nf=4 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_m_2_R0 I1_lin_default_m_2_R0_D I1_lin_default_m_2_R0_G 
++ I1_lin_default_m_2_R0_S vdd! nfet_06v0_dss m=3 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=3 dtemp=0
+MI1_lin_default_m_1_R0 I1_lin_default_m_1_R0_D I1_lin_default_m_1_R0_G 
++ I1_lin_default_m_1_R0_S vdd! nfet_06v0_dss m=2 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=2 dtemp=0
+MI1_lin_default_m_0_R0 I1_lin_default_m_0_R0_D I1_lin_default_m_0_R0_G 
++ I1_lin_default_m_0_R0_S vdd! nfet_06v0_dss m=1 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_gns_1_R0 I1_lin_default_gns_1_R0_D I1_lin_default_gns_1_R0_G 
++ I1_lin_default_gns_1_R0_S vdd! nfet_06v0_dss m=1 w=300u l=0.8u nf=12 s_sab=0 
++ d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_gns_0_R0 I1_lin_default_gns_0_R0_D I1_lin_default_gns_0_R0_G 
++ I1_lin_default_gns_0_R0_S vdd! nfet_06v0_dss m=1 w=300u l=0.8u nf=12 
++ s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_guardRing_0_R0 I1_lin_default_guardRing_0_R0_D 
++ I1_lin_default_guardRing_0_R0_G I1_lin_default_guardRing_0_R0_S vdd! 
++ nfet_06v0_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_lin_default_strapSD_0_R0 I1_lin_default_strapSD_0_R0_D 
++ I1_lin_default_strapSD_0_R0_G I1_lin_default_strapSD_0_R0_S vdd! 
++ nfet_06v0_dss m=1 w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+MI1_default I1_default_D I1_default_G I1_default_S vdd! nfet_06v0_dss m=1 
++ w=300u l=0.8u nf=12 s_sab=0.28u d_sab=3.78u par=1 dtemp=0
+.ENDS
+
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal.gds b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal.gds
new file mode 100644
index 0000000..5b08a50
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal.gds
Binary files differ
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal_dn.gds b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal_dn.gds
new file mode 100644
index 0000000..4af2d4e
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal_dn.gds
Binary files differ
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns.gds b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns.gds
new file mode 100644
index 0000000..b76034d
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns.gds
Binary files differ
diff --git a/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns_dn.gds b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns_dn.gds
new file mode 100644
index 0000000..ce82a1d
--- /dev/null
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns_dn.gds
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s.cdl b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal.cdl
similarity index 75%
rename from IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s.cdl
rename to BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal.cdl
index 94ea8c3..44e3619 100644
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s.cdl
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal.cdl
@@ -2,7 +2,7 @@
 * auCdl Netlist:
 * 
 * Library Name:  TCG_Library
-* Top Cell Name: ppolyf_s
+* Top Cell Name: res_ppo_3t_sal
 * View Name:     schematic
 * Netlisted on:  Nov 24 09:58:06 2021
 ************************************************************************
@@ -24,11 +24,11 @@
 
 ************************************************************************
 * Library Name: TCG_Library
-* Cell Name:    ppolyf_s
+* Cell Name:    res_ppo_3t_sal
 * View Name:    schematic
 ************************************************************************
 
-.SUBCKT ppolyf_s I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
+.SUBCKT res_ppo_3t_sal I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
 + I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
 + I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
 + I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
@@ -121,114 +121,114 @@
 *.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
 *.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
 RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=50u w=50u r=7.50221 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=50u w=50u r=7.50221 par=8.0 s=1
 RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=8
 RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=50u w=50u r=7.50221 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=50u w=50u r=7.50221 par=3.0 s=1
 RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=3
 RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
 RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
 RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=7.6u w=50u r=1.30995 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=7.6u w=50u r=1.30995 par=8.0 s=1
 RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=8
 RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=7.6u w=50u r=1.30995 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=7.6u w=50u r=1.30995 par=3.0 s=1
 RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=3
 RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
 RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
 RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=1.6u w=50u r=433.686m par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=1.6u w=50u r=433.686m par=8.0 s=1
 RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=8
 RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=1.6u w=50u r=433.686m par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=1.6u w=50u r=433.686m par=3.0 s=1
 RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=3
 RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
 RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
 RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=50u w=3.62u r=104.022 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=50u w=3.62u r=104.022 par=8.0 s=1
 RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=8
 RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=50u w=3.62u r=104.022 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=50u w=3.62u r=104.022 par=3.0 s=1
 RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=3
 RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
 RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
 RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=7.6u w=3.62u r=18.1631 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=7.6u w=3.62u r=18.1631 par=8.0 s=1
 RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=8
 RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=7.6u w=3.62u r=18.1631 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=7.6u w=3.62u r=18.1631 par=3.0 s=1
 RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=3
 RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
 RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
 RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=1.6u w=3.62u r=6.01326 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=1.6u w=3.62u r=6.01326 par=8.0 s=1
 RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=8
 RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=1.6u w=3.62u r=6.01326 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=1.6u w=3.62u r=6.01326 par=3.0 s=1
 RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=3
 RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
 RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
 RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=50u w=800n r=477.704 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=50u w=800n r=477.704 par=8.0 s=1
 RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=8
 RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=50u w=800n r=477.704 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=50u w=800n r=477.704 par=3.0 s=1
 RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=3
 RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
 RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
 RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=7.6u w=800n r=83.4112 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=7.6u w=800n r=83.4112 par=8.0 s=1
 RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=8
 RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=7.6u w=800n r=83.4112 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=7.6u w=800n r=83.4112 par=3.0 s=1
 RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=3
 RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
 RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
 RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=1.6u w=800n r=27.615 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=1.6u w=800n r=27.615 par=8.0 s=1
 RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=8
 RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=1.6u w=800n r=27.615 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=1.6u w=800n r=27.615 par=3.0 s=1
 RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=3
 RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
 RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_s m=1.0 
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
+RI1_default I1_default_PLUS I1_default_MINUS gnd! res_ppo_3t_sal m=1.0 
 + l=1.6u w=800.0n r=27.615 par=1.0 s=1
 .ENDS
 
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s.cdl b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal_dn.cdl
similarity index 74%
copy from IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s.cdl
copy to BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal_dn.cdl
index 94ea8c3..c832af6 100644
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s.cdl
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal_dn.cdl
@@ -2,9 +2,9 @@
 * auCdl Netlist:
 * 
 * Library Name:  TCG_Library
-* Top Cell Name: ppolyf_s
+* Top Cell Name: res_ppo_3t_sal_dn
 * View Name:     schematic
-* Netlisted on:  Nov 24 09:58:06 2021
+* Netlisted on:  Nov 24 09:58:45 2021
 ************************************************************************
 
 *.BIPOLAR
@@ -24,11 +24,11 @@
 
 ************************************************************************
 * Library Name: TCG_Library
-* Cell Name:    ppolyf_s
+* Cell Name:    res_ppo_3t_sal_dn
 * View Name:    schematic
 ************************************************************************
 
-.SUBCKT ppolyf_s I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
+.SUBCKT res_ppo_3t_sal_dn I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
 + I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
 + I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
 + I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
@@ -121,114 +121,114 @@
 *.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
 *.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
 RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=50u w=50u r=7.50221 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=50u w=50u r=7.50221 par=8.0 s=1
 RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=50u w=50u r=7.50221 par=1.0 s=8
 RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=50u w=50u r=7.50221 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=50u w=50u r=7.50221 par=3.0 s=1
 RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=50u w=50u r=7.50221 par=1.0 s=3
 RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
 RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
 RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=7.6u w=50u r=1.30995 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=7.6u w=50u r=1.30995 par=8.0 s=1
 RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=8
 RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=7.6u w=50u r=1.30995 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=7.6u w=50u r=1.30995 par=3.0 s=1
 RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=3
 RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
 RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
 RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=1.6u w=50u r=433.686m par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=1.6u w=50u r=433.686m par=8.0 s=1
 RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=8
 RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=1.6u w=50u r=433.686m par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=1.6u w=50u r=433.686m par=3.0 s=1
 RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=3
 RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
 RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
 RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=50u w=3.62u r=104.022 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=50u w=3.62u r=104.022 par=8.0 s=1
 RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=8
 RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=50u w=3.62u r=104.022 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=50u w=3.62u r=104.022 par=3.0 s=1
 RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=3
 RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
 RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
 RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=7.6u w=3.62u r=18.1631 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=7.6u w=3.62u r=18.1631 par=8.0 s=1
 RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=8
 RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=7.6u w=3.62u r=18.1631 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=7.6u w=3.62u r=18.1631 par=3.0 s=1
 RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=3
 RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
 RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
 RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=1.6u w=3.62u r=6.01326 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=1.6u w=3.62u r=6.01326 par=8.0 s=1
 RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=8
 RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=1.6u w=3.62u r=6.01326 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=1.6u w=3.62u r=6.01326 par=3.0 s=1
 RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=3
 RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
 RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
 RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=50u w=800n r=477.704 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=50u w=800n r=477.704 par=8.0 s=1
 RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=50u w=800n r=477.704 par=1.0 s=8
 RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=50u w=800n r=477.704 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=50u w=800n r=477.704 par=3.0 s=1
 RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=50u w=800n r=477.704 par=1.0 s=3
 RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
 RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
 RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=7.6u w=800n r=83.4112 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=7.6u w=800n r=83.4112 par=8.0 s=1
 RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=8
 RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=7.6u w=800n r=83.4112 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=7.6u w=800n r=83.4112 par=3.0 s=1
 RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=3
 RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
 RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
 RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=1.6u w=800n r=27.615 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=1.6u w=800n r=27.615 par=8.0 s=1
 RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=8
 RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=1.6u w=800n r=27.615 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=1.6u w=800n r=27.615 par=3.0 s=1
 RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=3
 RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
 RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_s m=1.0 
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
+RI1_default I1_default_PLUS I1_default_MINUS gnd! res_ppo_3t_sal_dn m=1.0 
 + l=1.6u w=800.0n r=27.615 par=1.0 s=1
 .ENDS
 
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_dw.cdl b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns.cdl
similarity index 75%
rename from ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_dw.cdl
rename to BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns.cdl
index 3b10565..2f3f2b7 100644
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_dw.cdl
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns.cdl
@@ -2,9 +2,9 @@
 * auCdl Netlist:
 * 
 * Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u_dw
+* Top Cell Name: res_ppo_3t_uns
 * View Name:     schematic
-* Netlisted on:  Nov 24 10:15:15 2021
+* Netlisted on:  Nov 24 10:02:18 2021
 ************************************************************************
 
 *.BIPOLAR
@@ -24,11 +24,11 @@
 
 ************************************************************************
 * Library Name: TCG_Library
-* Cell Name:    ppolyf_u_dw
+* Cell Name:    res_ppo_3t_uns
 * View Name:    schematic
 ************************************************************************
 
-.SUBCKT ppolyf_u_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
+.SUBCKT res_ppo_3t_uns I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
 + I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
 + I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
 + I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
@@ -121,114 +121,114 @@
 *.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
 *.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
 RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=50u w=50u r=352.76 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=50u w=50u r=352.76 par=8.0 s=1
 RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=50u r=352.76 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=8
 RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=50u w=50u r=352.76 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=50u w=50u r=352.76 par=3.0 s=1
 RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=50u r=352.76 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=3
 RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
 RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
 RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=7.6u w=50u r=55.6565 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=7.6u w=50u r=55.6565 par=8.0 s=1
 RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=8
 RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=7.6u w=50u r=55.6565 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=7.6u w=50u r=55.6565 par=3.0 s=1
 RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=3
 RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
 RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
 RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=1.6u w=50u r=13.6136 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=1.6u w=50u r=13.6136 par=8.0 s=1
 RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=8
 RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=1.6u w=50u r=13.6136 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=1.6u w=50u r=13.6136 par=3.0 s=1
 RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=3
 RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
 RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
 RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=50u w=3.62u r=4.93695K par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=50u w=3.62u r=4.93695K par=8.0 s=1
 RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=8
 RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=50u w=3.62u r=4.93695K par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=50u w=3.62u r=4.93695K par=3.0 s=1
 RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=3
 RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
 RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
 RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=7.6u w=3.62u r=778.926 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=7.6u w=3.62u r=778.926 par=8.0 s=1
 RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=8
 RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=7.6u w=3.62u r=778.926 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=7.6u w=3.62u r=778.926 par=3.0 s=1
 RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=3
 RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
 RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
 RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=1.6u w=3.62u r=190.526 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=1.6u w=3.62u r=190.526 par=8.0 s=1
 RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=8
 RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=1.6u w=3.62u r=190.526 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=1.6u w=3.62u r=190.526 par=3.0 s=1
 RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=3
 RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
 RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
 RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=50u w=800n r=23.5247K par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=50u w=800n r=23.5247K par=8.0 s=1
 RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=800n r=23.5247K par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=8
 RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=50u w=800n r=23.5247K par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=50u w=800n r=23.5247K par=3.0 s=1
 RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=800n r=23.5247K par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=3
 RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
 RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
 RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=7.6u w=800n r=3.7116K par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=7.6u w=800n r=3.7116K par=8.0 s=1
 RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=8
 RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=7.6u w=800n r=3.7116K par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=7.6u w=800n r=3.7116K par=3.0 s=1
 RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=3
 RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
 RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
 RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=1.6u w=800n r=907.858 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=1.6u w=800n r=907.858 par=8.0 s=1
 RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=8
 RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=1.6u w=800n r=907.858 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=1.6u w=800n r=907.858 par=3.0 s=1
 RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=3
 RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
 RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u_dw m=1.0 
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
+RI1_default I1_default_PLUS I1_default_MINUS gnd! res_ppo_3t_uns m=1.0 
 + l=1.6u w=800.0n r=907.8585 par=1.0 s=1
 .ENDS
 
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_dw.cdl b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns_dn.cdl
similarity index 74%
copy from ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_dw.cdl
copy to BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns_dn.cdl
index 3b10565..4db2364 100644
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_dw.cdl
+++ b/BCDLite/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns_dn.cdl
@@ -2,7 +2,7 @@
 * auCdl Netlist:
 * 
 * Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u_dw
+* Top Cell Name: res_ppo_3t_uns_dn
 * View Name:     schematic
 * Netlisted on:  Nov 24 10:15:15 2021
 ************************************************************************
@@ -24,11 +24,11 @@
 
 ************************************************************************
 * Library Name: TCG_Library
-* Cell Name:    ppolyf_u_dw
+* Cell Name:    res_ppo_3t_uns_dn
 * View Name:    schematic
 ************************************************************************
 
-.SUBCKT ppolyf_u_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
+.SUBCKT res_ppo_3t_uns_dn I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
 + I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
 + I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
 + I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
@@ -121,114 +121,114 @@
 *.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
 *.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
 RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=50u w=50u r=352.76 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=50u w=50u r=352.76 par=8.0 s=1
 RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=50u r=352.76 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=50u w=50u r=352.76 par=1.0 s=8
 RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=50u w=50u r=352.76 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=50u w=50u r=352.76 par=3.0 s=1
 RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=50u r=352.76 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=50u w=50u r=352.76 par=1.0 s=3
 RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
 RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
 RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=7.6u w=50u r=55.6565 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=7.6u w=50u r=55.6565 par=8.0 s=1
 RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=8
 RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=7.6u w=50u r=55.6565 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=7.6u w=50u r=55.6565 par=3.0 s=1
 RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=3
 RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
 RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
 RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=1.6u w=50u r=13.6136 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=1.6u w=50u r=13.6136 par=8.0 s=1
 RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=8
 RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=1.6u w=50u r=13.6136 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=1.6u w=50u r=13.6136 par=3.0 s=1
 RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=3
 RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
 RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
 RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=50u w=3.62u r=4.93695K par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=50u w=3.62u r=4.93695K par=8.0 s=1
 RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=8
 RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=50u w=3.62u r=4.93695K par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=50u w=3.62u r=4.93695K par=3.0 s=1
 RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=3
 RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
 RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
 RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=7.6u w=3.62u r=778.926 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=7.6u w=3.62u r=778.926 par=8.0 s=1
 RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=8
 RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=7.6u w=3.62u r=778.926 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=7.6u w=3.62u r=778.926 par=3.0 s=1
 RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=3
 RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
 RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
 RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=1.6u w=3.62u r=190.526 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=1.6u w=3.62u r=190.526 par=8.0 s=1
 RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=8
 RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=1.6u w=3.62u r=190.526 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=1.6u w=3.62u r=190.526 par=3.0 s=1
 RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=3
 RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
 RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
 RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=50u w=800n r=23.5247K par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=50u w=800n r=23.5247K par=8.0 s=1
 RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=800n r=23.5247K par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=50u w=800n r=23.5247K par=1.0 s=8
 RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=50u w=800n r=23.5247K par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=50u w=800n r=23.5247K par=3.0 s=1
 RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=800n r=23.5247K par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=50u w=800n r=23.5247K par=1.0 s=3
 RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
 RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
 RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=7.6u w=800n r=3.7116K par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=7.6u w=800n r=3.7116K par=8.0 s=1
 RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=8
 RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=7.6u w=800n r=3.7116K par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=7.6u w=800n r=3.7116K par=3.0 s=1
 RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=3
 RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
 RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
 RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=8.0 l=1.6u w=800n r=907.858 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=1.6u w=800n r=907.858 par=8.0 s=1
 RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=8
 RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=3.0 l=1.6u w=800n r=907.858 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=1.6u w=800n r=907.858 par=3.0 s=1
 RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=3
 RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
 RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_dw m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u_dw m=1.0 
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
+RI1_default I1_default_PLUS I1_default_MINUS gnd! res_ppo_3t_uns_dn m=1.0 
 + l=1.6u w=800.0n r=907.8585 par=1.0 s=1
 .ENDS
 
diff --git a/IC/klayout/lvs/rule_decks/devices_connections.lvs b/IC/klayout/lvs/rule_decks/devices_connections.lvs
index 25e7eba..8878206 100644
--- a/IC/klayout/lvs/rule_decks/devices_connections.lvs
+++ b/IC/klayout/lvs/rule_decks/devices_connections.lvs
@@ -43,9 +43,3 @@
 #==================================
 
 # %include mimcap_connections.lvs
-
-#================================
-# ---- RESISTOR DERIVATIONS -----
-#================================
-
-# %include res_connections.lvs
diff --git a/IC/klayout/lvs/rule_decks/res_connections.lvs b/IC/klayout/lvs/rule_decks/res_connections.lvs
deleted file mode 100644
index d5f77d6..0000000
--- a/IC/klayout/lvs/rule_decks/res_connections.lvs
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################################
-# Copyright 2023 GlobalFoundries PDK Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-################################################################################################
-
-#================================
-# ---- RESISTOR DERIVATIONS -----
-#================================
-
-logger.info('Starting LVS RESISTOR CONNECTIONS')
-
-connect(nplus_cont, contact)
-connect(pplus_cont, contact)
\ No newline at end of file
diff --git a/IC/klayout/lvs/rule_decks/res_derivations.lvs b/IC/klayout/lvs/rule_decks/res_derivations.lvs
index 93b8da1..ab4549a 100644
--- a/IC/klayout/lvs/rule_decks/res_derivations.lvs
+++ b/IC/klayout/lvs/rule_decks/res_derivations.lvs
@@ -21,72 +21,16 @@
 logger.info('Starting RESISTOR DERIVATIONS')
 
 #====================
-# ---- Diff RES ----
-#====================
-
-# general contacts derivations
-nplus_cont = ncomp.outside(nwell).interacting(res_mk).not(res_mk).not_interacting(poly2).not(nat)
-                .not(dualgate).not(resistor).not(diode_mk).not(lvs_bjt).not_interacting(res_mk_type1)
-
-pplus_cont = pcomp.inside(nwell).interacting(res_mk).not(res_mk).not_interacting(poly2).not(nat)
-                .not(dualgate).not(resistor).not(diode_mk).not(lvs_bjt).not_interacting(res_mk_type1)
-
-# nplus_s (Model for Salicide N+ diffusion resistor)
-nplus_s_layer = ncomp.and(res_mk).not_interacting(sab).interacting(nplus_cont)
-
-# nplus_u (Model for Unsalicide N+ diffusion resistor)
-nplus_u_layer = ncomp.and(res_mk).and(sab).interacting(nplus_cont)
-
-# pplus_s (Model for Salicide P+ diffusion resistor)
-pplus_s_layer = pcomp.and(res_mk).not_interacting(sab).interacting(pplus_cont)
-
-# pplus_u (Model for Unsalicide P+ diffusion resistor)
-pplus_u_layer = pcomp.and(res_mk).and(sab).interacting(pplus_cont)
-
-
-#====================
 # ---- POLY RES ----
 #====================
 
-# npolyf_s (Model for Salicide N+poly resistor on field)
-npolyf_s_layer = nplus.and(poly2).and(res_mk).not_interacting(sab).not(nat).outside(nwell)
-                    .not(dualgate).not(resistor).not(diode_mk).not(lvs_bjt).not_interacting(res_mk_type1)
+ppoly_exclude =  comp.join(nplus).join(nat)
+                     .join(nwell).join(dualgate).join(resistor)
+                     .join(diode_mk).join(lvs_bjt).join(res_mk_type1)
 
-# npolyf_u (Model for Unsalicide N+poly resistor on field)
-npolyf_u_layer = nplus.and(poly2).and(res_mk).and(sab).not(nat).outside(nwell)
-                    .not(dualgate).not(resistor).not(diode_mk).not(lvs_bjt).not_interacting(res_mk_type1)
-
+ppoly_res = pplus.and(poly2).and(res_mk)
 # ppolyf_s (Model for Salicide P+poly resistor on field)
-ppolyf_s_layer = pplus.and(poly2).and(res_mk).not_interacting(sab).not(nat).not(nwell)
-                    .not(dualgate).not(resistor).not(diode_mk).not(lvs_bjt).not_interacting(res_mk_type1)
+ppolyf_s_layer = ppoly_res.not_interacting(sab)
 
 # ppolyf_u (Model for Unsalicide P+poly resistor on field)
-ppolyf_u_layer = pplus.and(poly2).and(res_mk).and(sab).not(nat).not(nwell)
-                    .not(dualgate).not(resistor).not(diode_mk).not(lvs_bjt).not_interacting(res_mk_type1)
-
-
-#====================
-# ---- POLY HRES ----
-#====================
-
-# npolyf_u_1k (Model for Unsalicide 1k high Rs N+poly resistor on field)
-npolyf_u_1k_layer = poly2.interacting(nplus).and(res_mk).and(sab).not(nat).not(nwell)
-                        .not(dualgate).and(resistor).not(diode_mk).not(lvs_bjt).not_interacting(res_mk_type1)
-
-# ppolyf_u_1k (Model for Unsalicide 1k high Rs P+poly resistor on field)
-ppolyf_u_1k_layer = poly2.interacting(pplus).and(res_mk).and(sab).not(nat).not(nwell)
-                        .not(dualgate).and(resistor).not(diode_mk).not(lvs_bjt).not_interacting(res_mk_type1)
-
-# ppolyf_u_2k (Model for Unsalicide 2k high Rs P+poly resistor on field)
-ppolyf_u_2k_layer = poly2.interacting(pplus).and(res_mk_type1).and(sab).and(resistor).not(nwell)
-                        .not_interacting(res_mk).not(dualgate).not(diode_mk).not(lvs_bjt).not(nat)
-                        
-ppolyf_u_2k_cont = poly2.and(pplus).interacting(res_mk_type1).not(res_mk_type1).interacting(ppolyf_u_2k_layer)
-
-#====================
-# ---- NWELL RES ----
-#====================
-
-# nwell (Model for n-well diffusion resistor)
-nwell_res = nwell.and(res_mk).not_covering(comp).not(dnwell).not(poly2).not_interacting(sab).not(nat)
-                .not(dualgate).not(resistor).not(diode_mk).not(lvs_bjt).not_interacting(res_mk_type1)
\ No newline at end of file
+ppolyf_u_layer = ppoly_res.and(sab)
diff --git a/IC/klayout/lvs/rule_decks/res_extraction.lvs b/IC/klayout/lvs/rule_decks/res_extraction.lvs
index e17eaad..c6073ea 100644
--- a/IC/klayout/lvs/rule_decks/res_extraction.lvs
+++ b/IC/klayout/lvs/rule_decks/res_extraction.lvs
@@ -22,79 +22,15 @@
 logger.info('Starting RESISTOR EXTRACTION')
 
 #====================
-# ---- Diff RES ----
-#====================
-
-# nplus_s (Model for Salicide N+ diffusion resistor)
-logger.info('Extracting nplus_s device')
-extract_devices(resistor_with_bulk('nplus_s', 6.3, BResistor),
-                 { 'R' => nplus_s_layer, 'C' => nplus_cont, 'W' => sub })
-
-# nplus_u (Model for Unsalicide N+ diffusion resistor)
-logger.info('Extracting nplus_u device')
-extract_devices(resistor_with_bulk('nplus_u', 60, BResistor),
-                 { 'R' => nplus_u_layer, 'C' => nplus_cont, 'W' => sub })
-
-# pplus_s (Model for Salicide P+ diffusion resistor)
-logger.info('Extracting pplus_s device')
-extract_devices(resistor_with_bulk('pplus_s', 7, BResistor),
-                 { 'R' => pplus_s_layer, 'C' => pplus_cont, 'W' => nwell_con })
-
-# pplus_u (Model for Unsalicide P+ diffusion resistor)
-logger.info('Extracting pplus_u device')
-extract_devices(resistor_with_bulk('pplus_u', 185, BResistor),
-                 { 'R' => pplus_u_layer, 'C' => pplus_cont, 'W' => nwell_con })
-
-
-#====================
 # ---- POLY RES ----
 #====================
 
-# npolyf_s (Model for Salicide N+poly resistor on field)
-logger.info('Extracting npolyf_s device')
-extract_devices(resistor_with_bulk('npolyf_s', 6.8, BResistor),
-                 { 'R' => npolyf_s_layer, 'C' => poly2_con, 'W' => sub })
-
-# npolyf_u (Model for Unsalicide N+poly resistor on field)
-logger.info('Extracting npolyf_u device')
-extract_devices(resistor_with_bulk('npolyf_u', 310, BResistor),
-                 { 'R' => npolyf_u_layer, 'C' => poly2_con, 'W' => sub })
-
-# ppolyf_s (Model for Salicide P+poly resistor on field)
-logger.info('Extracting ppolyf_s device')
-extract_devices(resistor_with_bulk('ppolyf_s', 7.3, BResistor),
+# res_ppo_3t_sal: Model for Salicide P+poly resistor on field [ppolyf_s]
+logger.info('Extracting res_ppo_3t_sal device')
+extract_devices(resistor_with_bulk('res_ppo_3t_sal', 7.3, BResistor),
                  { 'R' => ppolyf_s_layer, 'C' => poly2_con, 'W' => sub })
 
-# ppolyf_u (Model for Unsalicide P+poly resistor on field)
-logger.info('Extracting ppolyf_u device')
-extract_devices(resistor_with_bulk('ppolyf_u', 350, BResistor),
+# res_ppo_3t_uns: Model for Unsalicide P+poly resistor on field [ppolyf_u]
+logger.info('Extracting res_ppo_3t_uns device')
+extract_devices(resistor_with_bulk('res_ppo_3t_uns', 350, BResistor),
                  { 'R' => ppolyf_u_layer, 'C' => poly2_con, 'W' => sub })
-
-
-#====================
-# ---- POLY HRES ----
-#====================
-
-# npolyf_u_1k (Model for Unsalicide 1k high Rs N+poly resistor on field)
-logger.info('Extracting npolyf_u_1k device')
-extract_devices(resistor_with_bulk('npolyf_u_1k', 1000, BResistor),
-                 { 'R' => npolyf_u_1k_layer, 'C' => poly2_con, 'W' => sub })
-
-# ppolyf_u_1k (Model for Unsalicide 1k high Rs P+poly resistor on field)
-logger.info('Extracting ppolyf_u_1k device')
-extract_devices(resistor_with_bulk('ppolyf_u_1k', 1000, BResistor),
-                 { 'R' => ppolyf_u_1k_layer, 'C' => poly2_con, 'W' => sub })
-
-# ppolyf_u_2k (Model for Unsalicide 2k high Rs P+poly resistor on field)
-logger.info('Extracting ppolyf_u_2k device')
-extract_devices(resistor_with_bulk('ppolyf_u_2k', 2000, BResistor),
-                 { 'R' => ppolyf_u_2k_layer, 'C' => ppolyf_u_2k_cont, 'W' => sub })
-
-#====================
-# ---- NWELL RES ----
-#====================
-
-# nwell (Model for n-well diffusion resistor)
-logger.info('Extracting nwell device')
-extract_devices(resistor_with_bulk('nwell', 1000, BResistor),
-                 { 'R' => nwell_res, 'C' => nwell_con, 'W' => sub })
\ No newline at end of file
diff --git a/IC/klayout/lvs/testing/run_regression.py b/IC/klayout/lvs/testing/run_regression.py
index ec7f3d3..25cee43 100644
--- a/IC/klayout/lvs/testing/run_regression.py
+++ b/IC/klayout/lvs/testing/run_regression.py
@@ -20,7 +20,7 @@
 
 Options:
     --help -h                      Print this help message.
-    --device_name=<device_name>    Name of device that we want to run regression for, Allowed values (MOS, BJT, DIODE, RES, MIMCAP, APMOMCAP, VARACTOR, MOSCAP, PISCAP, ESD, EFUSE).
+    --device_name=<device_name>    Name of device that we want to run regression for, Allowed values (MOS, BJT, DIODE, RES, MIMCAP).
     --mp=<num>                     The number of threads used in run.
     --run_name=<run_name>          Select your run name.
 """
@@ -519,11 +519,11 @@
     )
 
     ## selected device
-    allowed_devices = ["MOS", "BJT", "DIODE", "RES", "MIMCAP", "MOSCAP", "PISCAP", "APMOMCAP", "VARACTOR" , "EFUSE", "ESD"]
+    allowed_devices = ["MOS", "BJT", "DIODE", "RES", "MIMCAP"]
     target_device_group = args["--device_name"]
 
     if target_device_group and target_device_group not in allowed_devices:
-        logging.error("Allowed devices are (MOS, BJT, DIODE, RES, MIMCAP, APMOMCAP, VARACTOR, MOSCAP, PISCAP, ESD, EFUSE) only")
+        logging.error("Allowed devices are (MOS, BJT, DIODE, RES, MIMCAP) only")
         exit(1)
 
     # Calling main function
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_s.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_s.gds
deleted file mode 100644
index e7c50a3..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_s.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_u.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_u.gds
deleted file mode 100644
index e874e90..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_u.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_s.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_s.gds
deleted file mode 100644
index 20f92e7..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_s.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u.gds
deleted file mode 100644
index 08a0062..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u_1k.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u_1k.gds
deleted file mode 100644
index b4e309b..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u_1k.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/nwell.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/nwell.gds
deleted file mode 100644
index 8f7f859..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/nwell.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_s.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_s.gds
deleted file mode 100644
index c0f318b..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_s.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_u.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_u.gds
deleted file mode 100644
index 680502b..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_u.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_s.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_s.gds
deleted file mode 100644
index c4e7908..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_s.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u.gds
deleted file mode 100644
index e5d69de..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k.gds
deleted file mode 100644
index 449cb85..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k.gds
deleted file mode 100644
index 4dddcd8..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k.gds
+++ /dev/null
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal.gds
new file mode 100644
index 0000000..5b08a50
--- /dev/null
+++ b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal.gds
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns.gds b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns.gds
new file mode 100644
index 0000000..b76034d
--- /dev/null
+++ b/IC/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns.gds
Binary files differ
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_s.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_s.cdl
deleted file mode 100644
index 1345128..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_s.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: nplus_s
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:19:41 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    nplus_s
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT nplus_s I1_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_R0_MINUS I1_0_0_0_1_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS I1_0_0_1_1_0_R0_PLUS 
-+ I1_0_0_2_0_0_R0_MINUS I1_0_0_2_0_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS 
-+ I1_0_0_2_1_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS I1_0_1_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_R0_MINUS I1_0_1_0_1_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS I1_0_1_1_1_0_R0_PLUS 
-+ I1_0_1_2_0_0_R0_MINUS I1_0_1_2_0_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS 
-+ I1_0_1_2_1_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS I1_0_2_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_R0_MINUS I1_0_2_0_1_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS I1_0_2_1_1_0_R0_PLUS 
-+ I1_0_2_2_0_0_R0_MINUS I1_0_2_2_0_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS 
-+ I1_0_2_2_1_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS I1_1_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_R0_MINUS I1_1_0_0_1_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS I1_1_0_1_1_0_R0_PLUS 
-+ I1_1_0_2_0_0_R0_MINUS I1_1_0_2_0_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS 
-+ I1_1_0_2_1_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS I1_1_1_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_R0_MINUS I1_1_1_0_1_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS I1_1_1_1_1_0_R0_PLUS 
-+ I1_1_1_2_0_0_R0_MINUS I1_1_1_2_0_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS 
-+ I1_1_1_2_1_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS I1_1_2_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_R0_MINUS I1_1_2_0_1_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS I1_1_2_1_1_0_R0_PLUS 
-+ I1_1_2_2_0_0_R0_MINUS I1_1_2_2_0_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS 
-+ I1_1_2_2_1_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS I1_2_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_R0_MINUS I1_2_0_0_1_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS I1_2_0_1_1_0_R0_PLUS 
-+ I1_2_0_2_0_0_R0_MINUS I1_2_0_2_0_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS 
-+ I1_2_0_2_1_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS I1_2_1_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_R0_MINUS I1_2_1_0_1_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS I1_2_1_1_1_0_R0_PLUS 
-+ I1_2_1_2_0_0_R0_MINUS I1_2_1_2_0_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS 
-+ I1_2_1_2_1_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS I1_2_2_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_R0_MINUS I1_2_2_0_1_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS I1_2_2_1_1_0_R0_PLUS 
-+ I1_2_2_2_0_0_R0_MINUS I1_2_2_2_0_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS 
-+ I1_2_2_2_1_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_R0_MINUS:I I1_0_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_R0_MINUS:I I1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_R0_MINUS:I I1_0_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_R0_MINUS:I I1_0_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_R0_MINUS:I I1_0_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_R0_MINUS:I I1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_R0_MINUS:I I1_0_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_R0_MINUS:I I1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_R0_MINUS:I I1_0_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_R0_MINUS:I I1_0_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_R0_MINUS:I I1_0_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_R0_MINUS:I I1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_R0_MINUS:I I1_0_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_R0_MINUS:I I1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_R0_MINUS:I I1_0_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_R0_MINUS:I I1_0_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_R0_MINUS:I I1_0_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_R0_MINUS:I I1_1_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_R0_MINUS:I I1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_R0_MINUS:I I1_1_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_R0_MINUS:I I1_1_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_R0_MINUS:I I1_1_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_R0_MINUS:I I1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_R0_MINUS:I I1_1_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_R0_MINUS:I I1_1_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_R0_MINUS:I I1_1_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_R0_MINUS:I I1_1_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_R0_MINUS:I I1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_R0_MINUS:I I1_1_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_R0_MINUS:I I1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_R0_MINUS:I I1_1_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_R0_MINUS:I I1_1_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_R0_MINUS:I I1_1_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_R0_MINUS:I I1_2_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_R0_MINUS:I I1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_R0_MINUS:I I1_2_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_R0_MINUS:I I1_2_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_R0_MINUS:I I1_2_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_R0_MINUS:I I1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_R0_MINUS:I I1_2_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_R0_MINUS:I I1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_R0_MINUS:I I1_2_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_R0_MINUS:I I1_2_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_R0_MINUS:I I1_2_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_R0_MINUS:I I1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_R0_MINUS:I I1_2_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_R0_MINUS:I I1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_R0_MINUS:I I1_2_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_R0_MINUS:I I1_2_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_R0_MINUS:I I1_2_2_2_1_0_R0_PLUS:I I1_default_MINUS:I 
-*.PININFO I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_R0 I1_2_2_2_1_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=50u w=50u r=6.53672 par=8.0 s=1
-RI1_2_2_2_0_0_R0 I1_2_2_2_0_0_R0_PLUS I1_2_2_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=50u r=6.53672 par=1.0 s=8
-RI1_2_2_1_1_0_R0 I1_2_2_1_1_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=50u w=50u r=6.53672 par=3.0 s=1
-RI1_2_2_1_0_0_R0 I1_2_2_1_0_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=50u r=6.53672 par=1.0 s=3
-RI1_2_2_0_1_0_R0 I1_2_2_0_1_0_R0_PLUS I1_2_2_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=50u r=6.53672 par=1.0 s=1
-RI1_2_2_0_0_0_R0 I1_2_2_0_0_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=50u r=6.53672 par=1.0 s=1
-RI1_2_1_2_1_0_R0 I1_2_1_2_1_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=2.6u w=50u r=567.308m par=8.0 s=1
-RI1_2_1_2_0_0_R0 I1_2_1_2_0_0_R0_PLUS I1_2_1_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=8
-RI1_2_1_1_1_0_R0 I1_2_1_1_1_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=2.6u w=50u r=567.308m par=3.0 s=1
-RI1_2_1_1_0_0_R0 I1_2_1_1_0_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=3
-RI1_2_1_0_1_0_R0 I1_2_1_0_1_0_R0_PLUS I1_2_1_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=1
-RI1_2_1_0_0_0_R0 I1_2_1_0_0_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=1
-RI1_2_0_2_1_0_R0 I1_2_0_2_1_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=840n w=50u r=345.658m par=8.0 s=1
-RI1_2_0_2_0_0_R0 I1_2_0_2_0_0_R0_PLUS I1_2_0_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=50u r=345.658m par=1.0 s=8
-RI1_2_0_1_1_0_R0 I1_2_0_1_1_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=840n w=50u r=345.658m par=3.0 s=1
-RI1_2_0_1_0_0_R0 I1_2_0_1_0_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=50u r=345.658m par=1.0 s=3
-RI1_2_0_0_1_0_R0 I1_2_0_0_1_0_R0_PLUS I1_2_0_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=50u r=345.658m par=1.0 s=1
-RI1_2_0_0_0_0_R0 I1_2_0_0_0_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=50u r=345.658m par=1.0 s=1
-RI1_1_2_2_1_0_R0 I1_1_2_2_1_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=50u w=1.57u r=205.015 par=8.0 s=1
-RI1_1_2_2_0_0_R0 I1_1_2_2_0_0_R0_PLUS I1_1_2_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=8
-RI1_1_2_1_1_0_R0 I1_1_2_1_1_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=50u w=1.57u r=205.015 par=3.0 s=1
-RI1_1_2_1_0_0_R0 I1_1_2_1_0_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=3
-RI1_1_2_0_1_0_R0 I1_1_2_0_1_0_R0_PLUS I1_1_2_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=1
-RI1_1_2_0_0_0_R0 I1_1_2_0_0_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=1
-RI1_1_1_2_1_0_R0 I1_1_1_2_1_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=2.6u w=1.57u r=17.7928 par=8.0 s=1
-RI1_1_1_2_0_0_R0 I1_1_1_2_0_0_R0_PLUS I1_1_1_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=8
-RI1_1_1_1_1_0_R0 I1_1_1_1_1_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=2.6u w=1.57u r=17.7928 par=3.0 s=1
-RI1_1_1_1_0_0_R0 I1_1_1_1_0_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=3
-RI1_1_1_0_1_0_R0 I1_1_1_0_1_0_R0_PLUS I1_1_1_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=1
-RI1_1_1_0_0_0_R0 I1_1_1_0_0_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=1
-RI1_1_0_2_1_0_R0 I1_1_0_2_1_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=840n w=1.57u r=10.8411 par=8.0 s=1
-RI1_1_0_2_0_0_R0 I1_1_0_2_0_0_R0_PLUS I1_1_0_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=8
-RI1_1_0_1_1_0_R0 I1_1_0_1_1_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=840n w=1.57u r=10.8411 par=3.0 s=1
-RI1_1_0_1_0_0_R0 I1_1_0_1_0_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=3
-RI1_1_0_0_1_0_R0 I1_1_0_0_1_0_R0_PLUS I1_1_0_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=1
-RI1_1_0_0_0_0_R0 I1_1_0_0_0_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=1
-RI1_0_2_2_1_0_R0 I1_0_2_2_1_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=50u w=420n r=734.83 par=8.0 s=1
-RI1_0_2_2_0_0_R0 I1_0_2_2_0_0_R0_PLUS I1_0_2_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=420n r=734.83 par=1.0 s=8
-RI1_0_2_1_1_0_R0 I1_0_2_1_1_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=50u w=420n r=734.83 par=3.0 s=1
-RI1_0_2_1_0_0_R0 I1_0_2_1_0_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=420n r=734.83 par=1.0 s=3
-RI1_0_2_0_1_0_R0 I1_0_2_0_1_0_R0_PLUS I1_0_2_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=420n r=734.83 par=1.0 s=1
-RI1_0_2_0_0_0_R0 I1_0_2_0_0_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=420n r=734.83 par=1.0 s=1
-RI1_0_1_2_1_0_R0 I1_0_1_2_1_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=2.6u w=420n r=63.7743 par=8.0 s=1
-RI1_0_1_2_0_0_R0 I1_0_1_2_0_0_R0_PLUS I1_0_1_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=8
-RI1_0_1_1_1_0_R0 I1_0_1_1_1_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=2.6u w=420n r=63.7743 par=3.0 s=1
-RI1_0_1_1_0_0_R0 I1_0_1_1_0_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=3
-RI1_0_1_0_1_0_R0 I1_0_1_0_1_0_R0_PLUS I1_0_1_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=1
-RI1_0_1_0_0_0_R0 I1_0_1_0_0_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=1
-RI1_0_0_2_1_0_R0 I1_0_0_2_1_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=840n w=420n r=38.8574 par=8.0 s=1
-RI1_0_0_2_0_0_R0 I1_0_0_2_0_0_R0_PLUS I1_0_0_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=420n r=38.8574 par=1.0 s=8
-RI1_0_0_1_1_0_R0 I1_0_0_1_1_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=840n w=420n r=38.8574 par=3.0 s=1
-RI1_0_0_1_0_0_R0 I1_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=420n r=38.8574 par=1.0 s=3
-RI1_0_0_0_1_0_R0 I1_0_0_0_1_0_R0_PLUS I1_0_0_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=420n r=38.8574 par=1.0 s=1
-RI1_0_0_0_0_0_R0 I1_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=420n r=38.8574 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! nplus_s m=1.0 
-+ l=840.00n w=420.00n r=38.8574 par=1.0 s=1
-.ENDS
-
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_u.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_u.cdl
deleted file mode 100644
index f1c6c45..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_u.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: nplus_u
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:29:33 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    nplus_u
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT nplus_u I1_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_R0_MINUS I1_0_0_0_1_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS I1_0_0_1_1_0_R0_PLUS 
-+ I1_0_0_2_0_0_R0_MINUS I1_0_0_2_0_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS 
-+ I1_0_0_2_1_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS I1_0_1_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_R0_MINUS I1_0_1_0_1_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS I1_0_1_1_1_0_R0_PLUS 
-+ I1_0_1_2_0_0_R0_MINUS I1_0_1_2_0_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS 
-+ I1_0_1_2_1_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS I1_0_2_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_R0_MINUS I1_0_2_0_1_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS I1_0_2_1_1_0_R0_PLUS 
-+ I1_0_2_2_0_0_R0_MINUS I1_0_2_2_0_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS 
-+ I1_0_2_2_1_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS I1_1_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_R0_MINUS I1_1_0_0_1_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS I1_1_0_1_1_0_R0_PLUS 
-+ I1_1_0_2_0_0_R0_MINUS I1_1_0_2_0_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS 
-+ I1_1_0_2_1_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS I1_1_1_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_R0_MINUS I1_1_1_0_1_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS I1_1_1_1_1_0_R0_PLUS 
-+ I1_1_1_2_0_0_R0_MINUS I1_1_1_2_0_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS 
-+ I1_1_1_2_1_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS I1_1_2_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_R0_MINUS I1_1_2_0_1_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS I1_1_2_1_1_0_R0_PLUS 
-+ I1_1_2_2_0_0_R0_MINUS I1_1_2_2_0_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS 
-+ I1_1_2_2_1_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS I1_2_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_R0_MINUS I1_2_0_0_1_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS I1_2_0_1_1_0_R0_PLUS 
-+ I1_2_0_2_0_0_R0_MINUS I1_2_0_2_0_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS 
-+ I1_2_0_2_1_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS I1_2_1_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_R0_MINUS I1_2_1_0_1_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS I1_2_1_1_1_0_R0_PLUS 
-+ I1_2_1_2_0_0_R0_MINUS I1_2_1_2_0_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS 
-+ I1_2_1_2_1_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS I1_2_2_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_R0_MINUS I1_2_2_0_1_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS I1_2_2_1_1_0_R0_PLUS 
-+ I1_2_2_2_0_0_R0_MINUS I1_2_2_2_0_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS 
-+ I1_2_2_2_1_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_R0_MINUS:I I1_0_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_R0_MINUS:I I1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_R0_MINUS:I I1_0_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_R0_MINUS:I I1_0_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_R0_MINUS:I I1_0_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_R0_MINUS:I I1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_R0_MINUS:I I1_0_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_R0_MINUS:I I1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_R0_MINUS:I I1_0_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_R0_MINUS:I I1_0_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_R0_MINUS:I I1_0_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_R0_MINUS:I I1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_R0_MINUS:I I1_0_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_R0_MINUS:I I1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_R0_MINUS:I I1_0_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_R0_MINUS:I I1_0_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_R0_MINUS:I I1_0_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_R0_MINUS:I I1_1_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_R0_MINUS:I I1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_R0_MINUS:I I1_1_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_R0_MINUS:I I1_1_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_R0_MINUS:I I1_1_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_R0_MINUS:I I1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_R0_MINUS:I I1_1_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_R0_MINUS:I I1_1_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_R0_MINUS:I I1_1_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_R0_MINUS:I I1_1_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_R0_MINUS:I I1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_R0_MINUS:I I1_1_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_R0_MINUS:I I1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_R0_MINUS:I I1_1_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_R0_MINUS:I I1_1_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_R0_MINUS:I I1_1_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_R0_MINUS:I I1_2_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_R0_MINUS:I I1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_R0_MINUS:I I1_2_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_R0_MINUS:I I1_2_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_R0_MINUS:I I1_2_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_R0_MINUS:I I1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_R0_MINUS:I I1_2_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_R0_MINUS:I I1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_R0_MINUS:I I1_2_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_R0_MINUS:I I1_2_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_R0_MINUS:I I1_2_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_R0_MINUS:I I1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_R0_MINUS:I I1_2_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_R0_MINUS:I I1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_R0_MINUS:I I1_2_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_R0_MINUS:I I1_2_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_R0_MINUS:I I1_2_2_2_1_0_R0_PLUS:I I1_default_MINUS:I 
-*.PININFO I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_R0 I1_2_2_2_1_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=50u w=50u r=60.6187 par=8.0 s=1
-RI1_2_2_2_0_0_R0 I1_2_2_2_0_0_R0_PLUS I1_2_2_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=50u r=60.6187 par=1.0 s=8
-RI1_2_2_1_1_0_R0 I1_2_2_1_1_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=50u w=50u r=60.6187 par=3.0 s=1
-RI1_2_2_1_0_0_R0 I1_2_2_1_0_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=50u r=60.6187 par=1.0 s=3
-RI1_2_2_0_1_0_R0 I1_2_2_0_1_0_R0_PLUS I1_2_2_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=50u r=60.6187 par=1.0 s=1
-RI1_2_2_0_0_0_R0 I1_2_2_0_0_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=50u r=60.6187 par=1.0 s=1
-RI1_2_1_2_1_0_R0 I1_2_1_2_1_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=7.6u w=50u r=9.84027 par=8.0 s=1
-RI1_2_1_2_0_0_R0 I1_2_1_2_0_0_R0_PLUS I1_2_1_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=8
-RI1_2_1_1_1_0_R0 I1_2_1_1_1_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=7.6u w=50u r=9.84027 par=3.0 s=1
-RI1_2_1_1_0_0_R0 I1_2_1_1_0_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=3
-RI1_2_1_0_1_0_R0 I1_2_1_0_1_0_R0_PLUS I1_2_1_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=1
-RI1_2_1_0_0_0_R0 I1_2_1_0_0_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=1
-RI1_2_0_2_1_0_R0 I1_2_0_2_1_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=1.6u w=50u r=2.65464 par=8.0 s=1
-RI1_2_0_2_0_0_R0 I1_2_0_2_0_0_R0_PLUS I1_2_0_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=8
-RI1_2_0_1_1_0_R0 I1_2_0_1_1_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=1.6u w=50u r=2.65464 par=3.0 s=1
-RI1_2_0_1_0_0_R0 I1_2_0_1_0_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=3
-RI1_2_0_0_1_0_R0 I1_2_0_0_1_0_R0_PLUS I1_2_0_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=1
-RI1_2_0_0_0_0_R0 I1_2_0_0_0_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=1
-RI1_1_2_2_1_0_R0 I1_1_2_2_1_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=50u w=3.62u r=816.397 par=8.0 s=1
-RI1_1_2_2_0_0_R0 I1_1_2_2_0_0_R0_PLUS I1_1_2_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=8
-RI1_1_2_1_1_0_R0 I1_1_2_1_1_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=50u w=3.62u r=816.397 par=3.0 s=1
-RI1_1_2_1_0_0_R0 I1_1_2_1_0_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=3
-RI1_1_2_0_1_0_R0 I1_1_2_0_1_0_R0_PLUS I1_1_2_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=1
-RI1_1_2_0_0_0_R0 I1_1_2_0_0_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=1
-RI1_1_1_2_1_0_R0 I1_1_1_2_1_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=7.6u w=3.62u r=132.526 par=8.0 s=1
-RI1_1_1_2_0_0_R0 I1_1_1_2_0_0_R0_PLUS I1_1_1_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=8
-RI1_1_1_1_1_0_R0 I1_1_1_1_1_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=7.6u w=3.62u r=132.526 par=3.0 s=1
-RI1_1_1_1_0_0_R0 I1_1_1_1_0_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=3
-RI1_1_1_0_1_0_R0 I1_1_1_0_1_0_R0_PLUS I1_1_1_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=1
-RI1_1_1_0_0_0_R0 I1_1_1_0_0_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=1
-RI1_1_0_2_1_0_R0 I1_1_0_2_1_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=1.6u w=3.62u r=35.752 par=8.0 s=1
-RI1_1_0_2_0_0_R0 I1_1_0_2_0_0_R0_PLUS I1_1_0_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=8
-RI1_1_0_1_1_0_R0 I1_1_0_1_1_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=1.6u w=3.62u r=35.752 par=3.0 s=1
-RI1_1_0_1_0_0_R0 I1_1_0_1_0_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=3
-RI1_1_0_0_1_0_R0 I1_1_0_0_1_0_R0_PLUS I1_1_0_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=1
-RI1_1_0_0_0_0_R0 I1_1_0_0_0_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=1
-RI1_0_2_2_1_0_R0 I1_0_2_2_1_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=50u w=800n r=3.37444K par=8.0 s=1
-RI1_0_2_2_0_0_R0 I1_0_2_2_0_0_R0_PLUS I1_0_2_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=800n r=3.37444K par=1.0 s=8
-RI1_0_2_1_1_0_R0 I1_0_2_1_1_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=50u w=800n r=3.37444K par=3.0 s=1
-RI1_0_2_1_0_0_R0 I1_0_2_1_0_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=800n r=3.37444K par=1.0 s=3
-RI1_0_2_0_1_0_R0 I1_0_2_0_1_0_R0_PLUS I1_0_2_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=800n r=3.37444K par=1.0 s=1
-RI1_0_2_0_0_0_R0 I1_0_2_0_0_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=800n r=3.37444K par=1.0 s=1
-RI1_0_1_2_1_0_R0 I1_0_1_2_1_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=7.6u w=800n r=547.775 par=8.0 s=1
-RI1_0_1_2_0_0_R0 I1_0_1_2_0_0_R0_PLUS I1_0_1_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=8
-RI1_0_1_1_1_0_R0 I1_0_1_1_1_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=7.6u w=800n r=547.775 par=3.0 s=1
-RI1_0_1_1_0_0_R0 I1_0_1_1_0_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=3
-RI1_0_1_0_1_0_R0 I1_0_1_0_1_0_R0_PLUS I1_0_1_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=1
-RI1_0_1_0_0_0_R0 I1_0_1_0_0_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=1
-RI1_0_0_2_1_0_R0 I1_0_0_2_1_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=1.6u w=800n r=147.775 par=8.0 s=1
-RI1_0_0_2_0_0_R0 I1_0_0_2_0_0_R0_PLUS I1_0_0_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=8
-RI1_0_0_1_1_0_R0 I1_0_0_1_1_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=1.6u w=800n r=147.775 par=3.0 s=1
-RI1_0_0_1_0_0_R0 I1_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=3
-RI1_0_0_0_1_0_R0 I1_0_0_0_1_0_R0_PLUS I1_0_0_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=1
-RI1_0_0_0_0_0_R0 I1_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! nplus_u m=1.0 l=2u 
-+ w=1u r=142.7251 par=1.0 s=1
-.ENDS
-
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u.cdl
deleted file mode 100644
index 6b1c7fa..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: npolyf_u
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:35:58 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    npolyf_u
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT npolyf_u I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=50u w=50u r=311.93 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=50u r=311.93 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=50u w=50u r=311.93 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=50u r=311.93 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=50u r=311.93 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=50u r=311.93 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=7.6u w=50u r=48.7706 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=7.6u w=50u r=48.7706 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=1.6u w=50u r=11.5312 par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=1.6u w=50u r=11.5312 par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=50u w=3.62u r=4.3678K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=50u w=3.62u r=4.3678K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=7.6u w=3.62u r=682.912 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=7.6u w=3.62u r=682.912 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=1.6u w=3.62u r=161.465 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=1.6u w=3.62u r=161.465 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=50u w=800n r=20.8567K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=800n r=20.8567K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=50u w=800n r=20.8567K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=800n r=20.8567K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=800n r=20.8567K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=800n r=20.8567K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=7.6u w=800n r=3.26097K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=7.6u w=800n r=3.26097K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=1.6u w=800n r=771.014 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=1.6u w=800n r=771.014 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! npolyf_u m=1.0 
-+ l=1.6u w=800.0n r=771.014 par=1.0 s=1
-.ENDS
-
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u_1k.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u_1k.cdl
deleted file mode 100644
index 3390fac..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u_1k.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: npolyf_u_1k
-* View Name:     schematic
-* Netlisted on:  Nov 24 10:10:13 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    npolyf_u_1k
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT npolyf_u_1k I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=8.0 l=50u w=3.62u r=13.9736K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=3.0 l=50u w=3.62u r=13.9736K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=8.0 l=7.6u w=3.62u r=2.16433K par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=3.0 l=7.6u w=3.62u r=2.16433K par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=8.0 l=7.24u w=3.62u r=2.06407K par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=3.0 l=7.24u w=3.62u r=2.06407K par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=8.0 l=50u w=1u r=51.7012K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=3.0 l=50u w=1u r=51.7012K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=8.0 l=7.6u w=1u r=8.00786K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=3.0 l=7.6u w=1u r=8.00786K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=8.0 l=2u w=1u r=2.23704K par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=3.0 l=2u w=1u r=2.23704K par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! npolyf_u_1k m=1.0 
-+ l=2u w=1u r=2.2370394K par=1.0 s=1
-.ENDS
-
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/nwell.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/nwell.cdl
deleted file mode 100644
index b42e276..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/nwell.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: nwell
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:41:48 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    nwell
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT nwell I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ nwell m=8.0 l=50u w=50u r=1.01864K par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=50u r=1.01864K par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ nwell m=3.0 l=50u w=50u r=1.01864K par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=50u r=1.01864K par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=50u r=1.01864K par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=50u r=1.01864K par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ nwell m=8.0 l=11.61u w=50u r=243.958 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=50u r=243.958 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ nwell m=3.0 l=11.61u w=50u r=243.958 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=50u r=243.958 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=50u r=243.958 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=50u r=243.958 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ nwell m=8.0 l=4u w=50u r=90.3947 par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=50u r=90.3947 par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ nwell m=3.0 l=4u w=50u r=90.3947 par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=50u r=90.3947 par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=50u r=90.3947 par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=50u r=90.3947 par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ nwell m=8.0 l=50u w=5.71u r=9.58595K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=5.71u r=9.58595K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ nwell m=3.0 l=50u w=5.71u r=9.58595K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=5.71u r=9.58595K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=5.71u r=9.58595K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=5.71u r=9.58595K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ nwell m=8.0 l=11.61u w=5.71u r=2.29578K par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=5.71u r=2.29578K par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ nwell m=3.0 l=11.61u w=5.71u r=2.29578K par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=5.71u r=2.29578K par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=5.71u r=2.29578K par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=5.71u r=2.29578K par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ nwell m=8.0 l=4u w=5.71u r=850.665 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=5.71u r=850.665 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ nwell m=3.0 l=4u w=5.71u r=850.665 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=5.71u r=850.665 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=5.71u r=850.665 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=5.71u r=850.665 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ nwell m=8.0 l=50u w=2u r=32.4419K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=2u r=32.4419K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ nwell m=3.0 l=50u w=2u r=32.4419K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=2u r=32.4419K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=2u r=32.4419K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=50u w=2u r=32.4419K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ nwell m=8.0 l=11.61u w=2u r=7.76967K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=2u r=7.76967K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ nwell m=3.0 l=11.61u w=2u r=7.76967K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=2u r=7.76967K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=2u r=7.76967K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=11.61u w=2u r=7.76967K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ nwell m=8.0 l=4u w=2u r=2.87892K par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=2u r=2.87892K par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ nwell m=3.0 l=4u w=2u r=2.87892K par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=2u r=2.87892K par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=2u r=2.87892K par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ nwell m=1.0 l=4u w=2u r=2.87892K par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! nwell m=1.0 l=4u 
-+ w=2u r=2.8789203K par=1.0 s=1
-.ENDS
-
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_s.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_s.cdl
deleted file mode 100644
index a0b8ed1..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_s.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: pplus_s
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:51:48 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    pplus_s
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT pplus_s I1_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_R0_MINUS I1_0_0_0_1_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS I1_0_0_1_1_0_R0_PLUS 
-+ I1_0_0_2_0_0_R0_MINUS I1_0_0_2_0_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS 
-+ I1_0_0_2_1_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS I1_0_1_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_R0_MINUS I1_0_1_0_1_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS I1_0_1_1_1_0_R0_PLUS 
-+ I1_0_1_2_0_0_R0_MINUS I1_0_1_2_0_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS 
-+ I1_0_1_2_1_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS I1_0_2_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_R0_MINUS I1_0_2_0_1_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS I1_0_2_1_1_0_R0_PLUS 
-+ I1_0_2_2_0_0_R0_MINUS I1_0_2_2_0_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS 
-+ I1_0_2_2_1_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS I1_1_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_R0_MINUS I1_1_0_0_1_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS I1_1_0_1_1_0_R0_PLUS 
-+ I1_1_0_2_0_0_R0_MINUS I1_1_0_2_0_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS 
-+ I1_1_0_2_1_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS I1_1_1_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_R0_MINUS I1_1_1_0_1_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS I1_1_1_1_1_0_R0_PLUS 
-+ I1_1_1_2_0_0_R0_MINUS I1_1_1_2_0_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS 
-+ I1_1_1_2_1_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS I1_1_2_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_R0_MINUS I1_1_2_0_1_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS I1_1_2_1_1_0_R0_PLUS 
-+ I1_1_2_2_0_0_R0_MINUS I1_1_2_2_0_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS 
-+ I1_1_2_2_1_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS I1_2_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_R0_MINUS I1_2_0_0_1_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS I1_2_0_1_1_0_R0_PLUS 
-+ I1_2_0_2_0_0_R0_MINUS I1_2_0_2_0_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS 
-+ I1_2_0_2_1_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS I1_2_1_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_R0_MINUS I1_2_1_0_1_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS I1_2_1_1_1_0_R0_PLUS 
-+ I1_2_1_2_0_0_R0_MINUS I1_2_1_2_0_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS 
-+ I1_2_1_2_1_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS I1_2_2_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_R0_MINUS I1_2_2_0_1_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS I1_2_2_1_1_0_R0_PLUS 
-+ I1_2_2_2_0_0_R0_MINUS I1_2_2_2_0_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS 
-+ I1_2_2_2_1_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_R0_MINUS:I I1_0_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_R0_MINUS:I I1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_R0_MINUS:I I1_0_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_R0_MINUS:I I1_0_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_R0_MINUS:I I1_0_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_R0_MINUS:I I1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_R0_MINUS:I I1_0_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_R0_MINUS:I I1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_R0_MINUS:I I1_0_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_R0_MINUS:I I1_0_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_R0_MINUS:I I1_0_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_R0_MINUS:I I1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_R0_MINUS:I I1_0_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_R0_MINUS:I I1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_R0_MINUS:I I1_0_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_R0_MINUS:I I1_0_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_R0_MINUS:I I1_0_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_R0_MINUS:I I1_1_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_R0_MINUS:I I1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_R0_MINUS:I I1_1_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_R0_MINUS:I I1_1_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_R0_MINUS:I I1_1_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_R0_MINUS:I I1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_R0_MINUS:I I1_1_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_R0_MINUS:I I1_1_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_R0_MINUS:I I1_1_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_R0_MINUS:I I1_1_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_R0_MINUS:I I1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_R0_MINUS:I I1_1_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_R0_MINUS:I I1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_R0_MINUS:I I1_1_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_R0_MINUS:I I1_1_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_R0_MINUS:I I1_1_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_R0_MINUS:I I1_2_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_R0_MINUS:I I1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_R0_MINUS:I I1_2_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_R0_MINUS:I I1_2_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_R0_MINUS:I I1_2_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_R0_MINUS:I I1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_R0_MINUS:I I1_2_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_R0_MINUS:I I1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_R0_MINUS:I I1_2_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_R0_MINUS:I I1_2_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_R0_MINUS:I I1_2_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_R0_MINUS:I I1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_R0_MINUS:I I1_2_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_R0_MINUS:I I1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_R0_MINUS:I I1_2_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_R0_MINUS:I I1_2_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_R0_MINUS:I I1_2_2_2_1_0_R0_PLUS:I I1_default_MINUS:I 
-*.PININFO I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_R0 I1_2_2_2_1_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=50u w=50u r=7.2455 par=8.0 s=1
-RI1_2_2_2_0_0_R0 I1_2_2_2_0_0_R0_PLUS I1_2_2_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=50u r=7.2455 par=1.0 s=8
-RI1_2_2_1_1_0_R0 I1_2_2_1_1_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=50u w=50u r=7.2455 par=3.0 s=1
-RI1_2_2_1_0_0_R0 I1_2_2_1_0_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=50u r=7.2455 par=1.0 s=3
-RI1_2_2_0_1_0_R0 I1_2_2_0_1_0_R0_PLUS I1_2_2_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=50u r=7.2455 par=1.0 s=1
-RI1_2_2_0_0_0_R0 I1_2_2_0_0_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=50u r=7.2455 par=1.0 s=1
-RI1_2_1_2_1_0_R0 I1_2_1_2_1_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=2.6u w=50u r=622.745m par=8.0 s=1
-RI1_2_1_2_0_0_R0 I1_2_1_2_0_0_R0_PLUS I1_2_1_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=8
-RI1_2_1_1_1_0_R0 I1_2_1_1_1_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=2.6u w=50u r=622.745m par=3.0 s=1
-RI1_2_1_1_0_0_R0 I1_2_1_1_0_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=3
-RI1_2_1_0_1_0_R0 I1_2_1_0_1_0_R0_PLUS I1_2_1_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=1
-RI1_2_1_0_0_0_R0 I1_2_1_0_0_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=1
-RI1_2_0_2_1_0_R0 I1_2_0_2_1_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=840n w=50u r=376.837m par=8.0 s=1
-RI1_2_0_2_0_0_R0 I1_2_0_2_0_0_R0_PLUS I1_2_0_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=50u r=376.837m par=1.0 s=8
-RI1_2_0_1_1_0_R0 I1_2_0_1_1_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=840n w=50u r=376.837m par=3.0 s=1
-RI1_2_0_1_0_0_R0 I1_2_0_1_0_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=50u r=376.837m par=1.0 s=3
-RI1_2_0_0_1_0_R0 I1_2_0_0_1_0_R0_PLUS I1_2_0_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=50u r=376.837m par=1.0 s=1
-RI1_2_0_0_0_0_R0 I1_2_0_0_0_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=50u r=376.837m par=1.0 s=1
-RI1_1_2_2_1_0_R0 I1_1_2_2_1_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=50u w=1.57u r=217.365 par=8.0 s=1
-RI1_1_2_2_0_0_R0 I1_1_2_2_0_0_R0_PLUS I1_1_2_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=8
-RI1_1_2_1_1_0_R0 I1_1_2_1_1_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=50u w=1.57u r=217.365 par=3.0 s=1
-RI1_1_2_1_0_0_R0 I1_1_2_1_0_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=3
-RI1_1_2_0_1_0_R0 I1_1_2_0_1_0_R0_PLUS I1_1_2_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=1
-RI1_1_2_0_0_0_R0 I1_1_2_0_0_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=1
-RI1_1_1_2_1_0_R0 I1_1_1_2_1_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=2.6u w=1.57u r=18.6823 par=8.0 s=1
-RI1_1_1_2_0_0_R0 I1_1_1_2_0_0_R0_PLUS I1_1_1_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=8
-RI1_1_1_1_1_0_R0 I1_1_1_1_1_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=2.6u w=1.57u r=18.6823 par=3.0 s=1
-RI1_1_1_1_0_0_R0 I1_1_1_1_0_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=3
-RI1_1_1_0_1_0_R0 I1_1_1_0_1_0_R0_PLUS I1_1_1_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=1
-RI1_1_1_0_0_0_R0 I1_1_1_0_0_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=1
-RI1_1_0_2_1_0_R0 I1_1_0_2_1_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=840n w=1.57u r=11.3051 par=8.0 s=1
-RI1_1_0_2_0_0_R0 I1_1_0_2_0_0_R0_PLUS I1_1_0_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=8
-RI1_1_0_1_1_0_R0 I1_1_0_1_1_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=840n w=1.57u r=11.3051 par=3.0 s=1
-RI1_1_0_1_0_0_R0 I1_1_0_1_0_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=3
-RI1_1_0_0_1_0_R0 I1_1_0_0_1_0_R0_PLUS I1_1_0_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=1
-RI1_1_0_0_0_0_R0 I1_1_0_0_0_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=1
-RI1_0_2_2_1_0_R0 I1_0_2_2_1_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=50u w=420n r=698.076 par=8.0 s=1
-RI1_0_2_2_0_0_R0 I1_0_2_2_0_0_R0_PLUS I1_0_2_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=420n r=698.076 par=1.0 s=8
-RI1_0_2_1_1_0_R0 I1_0_2_1_1_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=50u w=420n r=698.076 par=3.0 s=1
-RI1_0_2_1_0_0_R0 I1_0_2_1_0_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=420n r=698.076 par=1.0 s=3
-RI1_0_2_0_1_0_R0 I1_0_2_0_1_0_R0_PLUS I1_0_2_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=420n r=698.076 par=1.0 s=1
-RI1_0_2_0_0_0_R0 I1_0_2_0_0_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=420n r=698.076 par=1.0 s=1
-RI1_0_1_2_1_0_R0 I1_0_1_2_1_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=2.6u w=420n r=59.9991 par=8.0 s=1
-RI1_0_1_2_0_0_R0 I1_0_1_2_0_0_R0_PLUS I1_0_1_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=8
-RI1_0_1_1_1_0_R0 I1_0_1_1_1_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=2.6u w=420n r=59.9991 par=3.0 s=1
-RI1_0_1_1_0_0_R0 I1_0_1_1_0_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=3
-RI1_0_1_0_1_0_R0 I1_0_1_0_1_0_R0_PLUS I1_0_1_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=1
-RI1_0_1_0_0_0_R0 I1_0_1_0_0_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=1
-RI1_0_0_2_1_0_R0 I1_0_0_2_1_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=840n w=420n r=36.3068 par=8.0 s=1
-RI1_0_0_2_0_0_R0 I1_0_0_2_0_0_R0_PLUS I1_0_0_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=420n r=36.3068 par=1.0 s=8
-RI1_0_0_1_1_0_R0 I1_0_0_1_1_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=840n w=420n r=36.3068 par=3.0 s=1
-RI1_0_0_1_0_0_R0 I1_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=420n r=36.3068 par=1.0 s=3
-RI1_0_0_0_1_0_R0 I1_0_0_0_1_0_R0_PLUS I1_0_0_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=420n r=36.3068 par=1.0 s=1
-RI1_0_0_0_0_0_R0 I1_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=420n r=36.3068 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! pplus_s m=1.0 
-+ l=840.00n w=420.00n r=36.3067 par=1.0 s=1
-.ENDS
-
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_u.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_u.cdl
deleted file mode 100644
index 4b2a332..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_u.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: pplus_u
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:54:02 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    pplus_u
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT pplus_u I1_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_R0_MINUS I1_0_0_0_1_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS I1_0_0_1_1_0_R0_PLUS 
-+ I1_0_0_2_0_0_R0_MINUS I1_0_0_2_0_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS 
-+ I1_0_0_2_1_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS I1_0_1_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_R0_MINUS I1_0_1_0_1_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS I1_0_1_1_1_0_R0_PLUS 
-+ I1_0_1_2_0_0_R0_MINUS I1_0_1_2_0_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS 
-+ I1_0_1_2_1_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS I1_0_2_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_R0_MINUS I1_0_2_0_1_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS I1_0_2_1_1_0_R0_PLUS 
-+ I1_0_2_2_0_0_R0_MINUS I1_0_2_2_0_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS 
-+ I1_0_2_2_1_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS I1_1_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_R0_MINUS I1_1_0_0_1_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS I1_1_0_1_1_0_R0_PLUS 
-+ I1_1_0_2_0_0_R0_MINUS I1_1_0_2_0_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS 
-+ I1_1_0_2_1_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS I1_1_1_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_R0_MINUS I1_1_1_0_1_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS I1_1_1_1_1_0_R0_PLUS 
-+ I1_1_1_2_0_0_R0_MINUS I1_1_1_2_0_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS 
-+ I1_1_1_2_1_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS I1_1_2_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_R0_MINUS I1_1_2_0_1_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS I1_1_2_1_1_0_R0_PLUS 
-+ I1_1_2_2_0_0_R0_MINUS I1_1_2_2_0_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS 
-+ I1_1_2_2_1_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS I1_2_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_R0_MINUS I1_2_0_0_1_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS I1_2_0_1_1_0_R0_PLUS 
-+ I1_2_0_2_0_0_R0_MINUS I1_2_0_2_0_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS 
-+ I1_2_0_2_1_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS I1_2_1_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_R0_MINUS I1_2_1_0_1_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS I1_2_1_1_1_0_R0_PLUS 
-+ I1_2_1_2_0_0_R0_MINUS I1_2_1_2_0_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS 
-+ I1_2_1_2_1_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS I1_2_2_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_R0_MINUS I1_2_2_0_1_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS I1_2_2_1_1_0_R0_PLUS 
-+ I1_2_2_2_0_0_R0_MINUS I1_2_2_2_0_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS 
-+ I1_2_2_2_1_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_R0_MINUS:I I1_0_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_R0_MINUS:I I1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_R0_MINUS:I I1_0_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_R0_MINUS:I I1_0_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_R0_MINUS:I I1_0_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_R0_MINUS:I I1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_R0_MINUS:I I1_0_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_R0_MINUS:I I1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_R0_MINUS:I I1_0_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_R0_MINUS:I I1_0_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_R0_MINUS:I I1_0_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_R0_MINUS:I I1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_R0_MINUS:I I1_0_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_R0_MINUS:I I1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_R0_MINUS:I I1_0_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_R0_MINUS:I I1_0_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_R0_MINUS:I I1_0_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_R0_MINUS:I I1_1_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_R0_MINUS:I I1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_R0_MINUS:I I1_1_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_R0_MINUS:I I1_1_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_R0_MINUS:I I1_1_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_R0_MINUS:I I1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_R0_MINUS:I I1_1_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_R0_MINUS:I I1_1_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_R0_MINUS:I I1_1_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_R0_MINUS:I I1_1_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_R0_MINUS:I I1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_R0_MINUS:I I1_1_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_R0_MINUS:I I1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_R0_MINUS:I I1_1_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_R0_MINUS:I I1_1_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_R0_MINUS:I I1_1_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_R0_MINUS:I I1_2_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_R0_MINUS:I I1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_R0_MINUS:I I1_2_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_R0_MINUS:I I1_2_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_R0_MINUS:I I1_2_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_R0_MINUS:I I1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_R0_MINUS:I I1_2_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_R0_MINUS:I I1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_R0_MINUS:I I1_2_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_R0_MINUS:I I1_2_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_R0_MINUS:I I1_2_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_R0_MINUS:I I1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_R0_MINUS:I I1_2_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_R0_MINUS:I I1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_R0_MINUS:I I1_2_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_R0_MINUS:I I1_2_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_R0_MINUS:I I1_2_2_2_1_0_R0_PLUS:I I1_default_MINUS:I 
-*.PININFO I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_R0 I1_2_2_2_1_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=50u w=50u r=187.206 par=8.0 s=1
-RI1_2_2_2_0_0_R0 I1_2_2_2_0_0_R0_PLUS I1_2_2_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=50u r=187.206 par=1.0 s=8
-RI1_2_2_1_1_0_R0 I1_2_2_1_1_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=50u w=50u r=187.206 par=3.0 s=1
-RI1_2_2_1_0_0_R0 I1_2_2_1_0_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=50u r=187.206 par=1.0 s=3
-RI1_2_2_0_1_0_R0 I1_2_2_0_1_0_R0_PLUS I1_2_2_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=50u r=187.206 par=1.0 s=1
-RI1_2_2_0_0_0_R0 I1_2_2_0_0_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=50u r=187.206 par=1.0 s=1
-RI1_2_1_2_1_0_R0 I1_2_1_2_1_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=7.6u w=50u r=30.1528 par=8.0 s=1
-RI1_2_1_2_0_0_R0 I1_2_1_2_0_0_R0_PLUS I1_2_1_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=8
-RI1_2_1_1_1_0_R0 I1_2_1_1_1_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=7.6u w=50u r=30.1528 par=3.0 s=1
-RI1_2_1_1_0_0_R0 I1_2_1_1_0_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=3
-RI1_2_1_0_1_0_R0 I1_2_1_0_1_0_R0_PLUS I1_2_1_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=1
-RI1_2_1_0_0_0_R0 I1_2_1_0_0_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=1
-RI1_2_0_2_1_0_R0 I1_2_0_2_1_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=1.6u w=50u r=7.92835 par=8.0 s=1
-RI1_2_0_2_0_0_R0 I1_2_0_2_0_0_R0_PLUS I1_2_0_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=8
-RI1_2_0_1_1_0_R0 I1_2_0_1_1_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=1.6u w=50u r=7.92835 par=3.0 s=1
-RI1_2_0_1_0_0_R0 I1_2_0_1_0_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=3
-RI1_2_0_0_1_0_R0 I1_2_0_0_1_0_R0_PLUS I1_2_0_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=1
-RI1_2_0_0_0_0_R0 I1_2_0_0_0_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=1
-RI1_1_2_2_1_0_R0 I1_1_2_2_1_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=50u w=3.62u r=2.62272K par=8.0 s=1
-RI1_1_2_2_0_0_R0 I1_1_2_2_0_0_R0_PLUS I1_1_2_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=8
-RI1_1_2_1_1_0_R0 I1_1_2_1_1_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=50u w=3.62u r=2.62272K par=3.0 s=1
-RI1_1_2_1_0_0_R0 I1_1_2_1_0_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=3
-RI1_1_2_0_1_0_R0 I1_1_2_0_1_0_R0_PLUS I1_1_2_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=1
-RI1_1_2_0_0_0_R0 I1_1_2_0_0_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=1
-RI1_1_1_2_1_0_R0 I1_1_1_2_1_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=7.6u w=3.62u r=422.435 par=8.0 s=1
-RI1_1_1_2_0_0_R0 I1_1_1_2_0_0_R0_PLUS I1_1_1_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=8
-RI1_1_1_1_1_0_R0 I1_1_1_1_1_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=7.6u w=3.62u r=422.435 par=3.0 s=1
-RI1_1_1_1_0_0_R0 I1_1_1_1_0_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=3
-RI1_1_1_0_1_0_R0 I1_1_1_0_1_0_R0_PLUS I1_1_1_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=1
-RI1_1_1_0_0_0_R0 I1_1_1_0_0_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=1
-RI1_1_0_2_1_0_R0 I1_1_0_2_1_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=1.6u w=3.62u r=111.075 par=8.0 s=1
-RI1_1_0_2_0_0_R0 I1_1_0_2_0_0_R0_PLUS I1_1_0_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=8
-RI1_1_0_1_1_0_R0 I1_1_0_1_1_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=1.6u w=3.62u r=111.075 par=3.0 s=1
-RI1_1_0_1_0_0_R0 I1_1_0_1_0_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=3
-RI1_1_0_0_1_0_R0 I1_1_0_0_1_0_R0_PLUS I1_1_0_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=1
-RI1_1_0_0_0_0_R0 I1_1_0_0_0_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=1
-RI1_0_2_2_1_0_R0 I1_0_2_2_1_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=50u w=800n r=12.5503K par=8.0 s=1
-RI1_0_2_2_0_0_R0 I1_0_2_2_0_0_R0_PLUS I1_0_2_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=800n r=12.5503K par=1.0 s=8
-RI1_0_2_1_1_0_R0 I1_0_2_1_1_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=50u w=800n r=12.5503K par=3.0 s=1
-RI1_0_2_1_0_0_R0 I1_0_2_1_0_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=800n r=12.5503K par=1.0 s=3
-RI1_0_2_0_1_0_R0 I1_0_2_0_1_0_R0_PLUS I1_0_2_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=800n r=12.5503K par=1.0 s=1
-RI1_0_2_0_0_0_R0 I1_0_2_0_0_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=800n r=12.5503K par=1.0 s=1
-RI1_0_1_2_1_0_R0 I1_0_1_2_1_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=7.6u w=800n r=2.02145K par=8.0 s=1
-RI1_0_1_2_0_0_R0 I1_0_1_2_0_0_R0_PLUS I1_0_1_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=8
-RI1_0_1_1_1_0_R0 I1_0_1_1_1_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=7.6u w=800n r=2.02145K par=3.0 s=1
-RI1_0_1_1_0_0_R0 I1_0_1_1_0_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=3
-RI1_0_1_0_1_0_R0 I1_0_1_0_1_0_R0_PLUS I1_0_1_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=1
-RI1_0_1_0_0_0_R0 I1_0_1_0_0_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=1
-RI1_0_0_2_1_0_R0 I1_0_0_2_1_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=1.6u w=800n r=531.519 par=8.0 s=1
-RI1_0_0_2_0_0_R0 I1_0_0_2_0_0_R0_PLUS I1_0_0_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=8
-RI1_0_0_1_1_0_R0 I1_0_0_1_1_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=1.6u w=800n r=531.519 par=3.0 s=1
-RI1_0_0_1_0_0_R0 I1_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=3
-RI1_0_0_0_1_0_R0 I1_0_0_0_1_0_R0_PLUS I1_0_0_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=1
-RI1_0_0_0_0_0_R0 I1_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! pplus_u m=1.0 l=2u 
-+ w=1u r=497.3349 par=1.0 s=1
-.ENDS
-
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u.cdl
deleted file mode 100644
index 05fbcf8..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u
-* View Name:     schematic
-* Netlisted on:  Nov 24 10:02:18 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_u
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_u I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=50u w=50u r=352.76 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=50u r=352.76 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=50u w=50u r=352.76 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=50u r=352.76 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=7.6u w=50u r=55.6565 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=7.6u w=50u r=55.6565 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=1.6u w=50u r=13.6136 par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=1.6u w=50u r=13.6136 par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=50u w=3.62u r=4.93695K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=50u w=3.62u r=4.93695K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=7.6u w=3.62u r=778.926 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=7.6u w=3.62u r=778.926 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=1.6u w=3.62u r=190.526 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=1.6u w=3.62u r=190.526 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=50u w=800n r=23.5247K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=800n r=23.5247K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=50u w=800n r=23.5247K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=800n r=23.5247K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=7.6u w=800n r=3.7116K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=7.6u w=800n r=3.7116K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=1.6u w=800n r=907.858 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=1.6u w=800n r=907.858 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u m=1.0 
-+ l=1.6u w=800.0n r=907.8585 par=1.0 s=1
-.ENDS
-
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_1k.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_1k.cdl
deleted file mode 100644
index 9ab2d9a..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_1k.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u_1k
-* View Name:     schematic
-* Netlisted on:  Nov 24 10:10:13 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_u_1k
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_u_1k I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=50u w=3.62u r=13.9736K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=50u w=3.62u r=13.9736K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=7.6u w=3.62u r=2.16433K par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=7.6u w=3.62u r=2.16433K par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=7.24u w=3.62u r=2.06407K par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=7.24u w=3.62u r=2.06407K par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=50u w=1u r=51.7012K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=50u w=1u r=51.7012K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=7.6u w=1u r=8.00786K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=7.6u w=1u r=8.00786K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=2u w=1u r=2.23704K par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=2u w=1u r=2.23704K par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u_1k m=1.0 
-+ l=2u w=1u r=2.2370394K par=1.0 s=1
-.ENDS
-
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_2k.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_2k.cdl
deleted file mode 100644
index 9d16136..0000000
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_2k.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u_2k
-* View Name:     schematic
-* Netlisted on:  Nov 24 10:10:13 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_u_2k
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_u_2k I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=50u w=3.62u r=13.9736K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=50u w=3.62u r=13.9736K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=7.6u w=3.62u r=2.16433K par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=7.6u w=3.62u r=2.16433K par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=7.24u w=3.62u r=2.06407K par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=7.24u w=3.62u r=2.06407K par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=50u w=1u r=51.7012K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=50u w=1u r=51.7012K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=7.6u w=1u r=8.00786K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=7.6u w=1u r=8.00786K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=2u w=1u r=2.23704K par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=2u w=1u r=2.23704K par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u_2k m=1.0 
-+ l=2u w=1u r=2.2370394K par=1.0 s=1
-.ENDS
-
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal.cdl
similarity index 75%
copy from IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
copy to IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal.cdl
index d11c310..44e3619 100644
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
+++ b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal.cdl
@@ -2,9 +2,9 @@
 * auCdl Netlist:
 * 
 * Library Name:  TCG_Library
-* Top Cell Name: npolyf_s
+* Top Cell Name: res_ppo_3t_sal
 * View Name:     schematic
-* Netlisted on:  Nov 24 09:31:03 2021
+* Netlisted on:  Nov 24 09:58:06 2021
 ************************************************************************
 
 *.BIPOLAR
@@ -24,11 +24,11 @@
 
 ************************************************************************
 * Library Name: TCG_Library
-* Cell Name:    npolyf_s
+* Cell Name:    res_ppo_3t_sal
 * View Name:    schematic
 ************************************************************************
 
-.SUBCKT npolyf_s I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
+.SUBCKT res_ppo_3t_sal I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
 + I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
 + I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
 + I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
@@ -121,114 +121,114 @@
 *.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
 *.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
 RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=50u r=7.02182 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=50u w=50u r=7.50221 par=8.0 s=1
 RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=8
 RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=50u r=7.02182 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=50u w=50u r=7.50221 par=3.0 s=1
 RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=3
 RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
 RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
 RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=50u r=1.25392 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=7.6u w=50u r=1.30995 par=8.0 s=1
 RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=8
 RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=50u r=1.25392 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=7.6u w=50u r=1.30995 par=3.0 s=1
 RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=3
 RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
 RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
 RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=50u r=437.71m par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=1.6u w=50u r=433.686m par=8.0 s=1
 RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=8
 RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=50u r=437.71m par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=1.6u w=50u r=433.686m par=3.0 s=1
 RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=3
 RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
 RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
 RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=3.62u r=97.3107 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=50u w=3.62u r=104.022 par=8.0 s=1
 RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=8
 RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=3.62u r=97.3107 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=50u w=3.62u r=104.022 par=3.0 s=1
 RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=3
 RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
 RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
 RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=3.62u r=17.3773 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=7.6u w=3.62u r=18.1631 par=8.0 s=1
 RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=8
 RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=3.62u r=17.3773 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=7.6u w=3.62u r=18.1631 par=3.0 s=1
 RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=3
 RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
 RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
 RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=3.62u r=6.06593 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=1.6u w=3.62u r=6.01326 par=8.0 s=1
 RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=8
 RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=3.62u r=6.06593 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=1.6u w=3.62u r=6.01326 par=3.0 s=1
 RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=3
 RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
 RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
 RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=800n r=445.997 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=50u w=800n r=477.704 par=8.0 s=1
 RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=8
 RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=800n r=445.997 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=50u w=800n r=477.704 par=3.0 s=1
 RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=3
 RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
 RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
 RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=800n r=79.644 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=7.6u w=800n r=83.4112 par=8.0 s=1
 RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=8
 RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=800n r=79.644 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=7.6u w=800n r=83.4112 par=3.0 s=1
 RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=3
 RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
 RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
 RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=800n r=27.8015 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=1.6u w=800n r=27.615 par=8.0 s=1
 RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=8
 RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=800n r=27.8015 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=1.6u w=800n r=27.615 par=3.0 s=1
 RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=3
 RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
 RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! npolyf_s m=1.0 
-+ l=1.6u w=800.0n r=27.8015 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
+RI1_default I1_default_PLUS I1_default_MINUS gnd! res_ppo_3t_sal m=1.0 
++ l=1.6u w=800.0n r=27.615 par=1.0 s=1
 .ENDS
 
diff --git a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns.cdl
similarity index 75%
rename from IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
rename to IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns.cdl
index d11c310..2f3f2b7 100644
--- a/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
+++ b/IC/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns.cdl
@@ -2,9 +2,9 @@
 * auCdl Netlist:
 * 
 * Library Name:  TCG_Library
-* Top Cell Name: npolyf_s
+* Top Cell Name: res_ppo_3t_uns
 * View Name:     schematic
-* Netlisted on:  Nov 24 09:31:03 2021
+* Netlisted on:  Nov 24 10:02:18 2021
 ************************************************************************
 
 *.BIPOLAR
@@ -24,11 +24,11 @@
 
 ************************************************************************
 * Library Name: TCG_Library
-* Cell Name:    npolyf_s
+* Cell Name:    res_ppo_3t_uns
 * View Name:    schematic
 ************************************************************************
 
-.SUBCKT npolyf_s I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
+.SUBCKT res_ppo_3t_uns I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
 + I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
 + I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
 + I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
@@ -121,114 +121,114 @@
 *.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
 *.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
 RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=50u r=7.02182 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=50u w=50u r=352.76 par=8.0 s=1
 RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=8
 RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=50u r=7.02182 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=50u w=50u r=352.76 par=3.0 s=1
 RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=3
 RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
 RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
 RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=50u r=1.25392 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=7.6u w=50u r=55.6565 par=8.0 s=1
 RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=8
 RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=50u r=1.25392 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=7.6u w=50u r=55.6565 par=3.0 s=1
 RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=3
 RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
 RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
 RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=50u r=437.71m par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=1.6u w=50u r=13.6136 par=8.0 s=1
 RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=8
 RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=50u r=437.71m par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=1.6u w=50u r=13.6136 par=3.0 s=1
 RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=3
 RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
 RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
 RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=3.62u r=97.3107 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=50u w=3.62u r=4.93695K par=8.0 s=1
 RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=8
 RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=3.62u r=97.3107 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=50u w=3.62u r=4.93695K par=3.0 s=1
 RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=3
 RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
 RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
 RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=3.62u r=17.3773 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=7.6u w=3.62u r=778.926 par=8.0 s=1
 RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=8
 RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=3.62u r=17.3773 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=7.6u w=3.62u r=778.926 par=3.0 s=1
 RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=3
 RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
 RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
 RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=3.62u r=6.06593 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=1.6u w=3.62u r=190.526 par=8.0 s=1
 RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=8
 RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=3.62u r=6.06593 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=1.6u w=3.62u r=190.526 par=3.0 s=1
 RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=3
 RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
 RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
 RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=800n r=445.997 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=50u w=800n r=23.5247K par=8.0 s=1
 RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=8
 RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=800n r=445.997 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=50u w=800n r=23.5247K par=3.0 s=1
 RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=3
 RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
 RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
 RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=800n r=79.644 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=7.6u w=800n r=3.7116K par=8.0 s=1
 RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=8
 RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=800n r=79.644 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=7.6u w=800n r=3.7116K par=3.0 s=1
 RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=3
 RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
 RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
 RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=800n r=27.8015 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=1.6u w=800n r=907.858 par=8.0 s=1
 RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=8
 RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=800n r=27.8015 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=1.6u w=800n r=907.858 par=3.0 s=1
 RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=3
 RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
 RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! npolyf_s m=1.0 
-+ l=1.6u w=800.0n r=27.8015 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
+RI1_default I1_default_PLUS I1_default_MINUS gnd! res_ppo_3t_uns m=1.0 
++ l=1.6u w=800.0n r=907.8585 par=1.0 s=1
 .ENDS
 
diff --git a/Makefile b/Makefile
index 6273977..dcd8a7a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2022 GlobalFoundries PDK Authors
+# Copyright 2023 GlobalFoundries PDK Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,9 +36,6 @@
 #=================================
 # ----- test-DRC_regression ------
 #=================================
-.ONESHELL:
-test-DRC-main : | $(CONDA_ENV_PYTHON) 
-	@$(IN_CONDA_ENV) python3 ./scripts/run_regression_drc.py
 
 .ONESHELL:
 test-DRC-BCDLite-% : | $(CONDA_ENV_PYTHON)
@@ -58,6 +55,7 @@
 #=================================
 # -------- test-DRC-switch -------
 #=================================
+
 # LVS main testing
 test-DRC-switch: | $(CONDA_ENV_PYTHON)
 	@$(IN_CONDA_ENV) klayout -v
@@ -69,24 +67,25 @@
 # ----- test-LVS_regression ------
 #=================================
 
-# run regression on all variants` devices 
 .ONESHELL:
-test-LVS-main: | $(CONDA_ENV_PYTHON)
-	@$(IN_CONDA_ENV) cd IC/$(KLAYOUT_LVS_TESTS) && make test-LVS-main
-	@$(IN_CONDA_ENV) cd ULL/$(KLAYOUT_LVS_TESTS) && make test-LVS-main
-	@$(IN_CONDA_ENV) cd BCDLite/$(KLAYOUT_LVS_TESTS) && make test-LVS-main
-
-.ONESHELL:
-test-LVS-% : | $(CONDA_ENV_PYTHON)
+test-LVS-BCDLite-% : | $(CONDA_ENV_PYTHON)
 	@which python3
-ifeq ($(findstring ULL, $($*)), ULL)
-	cd ULL/$(KLAYOUT_LVS_TESTS) && make test-LVS-$(subst ULL-,,$($*))
-endif  
+	@$(IN_CONDA_ENV) python3 ./scripts/run_regression_lvs.py --variant=BCDLite --device=$*
 
-ifeq ($(findstring IC, $($*)), IC)
-	cd IC/$(KLAYOUT_LVS_TESTS) && make test-LVS-$(subst IC-,,$($*))
-endif
+.ONESHELL:
+test-LVS-ULL-% : | $(CONDA_ENV_PYTHON)
+	@which python3
+	@$(IN_CONDA_ENV) python3 ./scripts/run_regression_lvs.py --variant=ULL --device=$*
 
-ifeq ($(findstring BCDLite, $($*)), BCDLite)
-	cd BCDLite/$(KLAYOUT_LVS_TESTS) && make test-LVS-$(subst BCDLite-,,$($*))
-endif
\ No newline at end of file
+.ONESHELL:
+test-LVS-IC-% : | $(CONDA_ENV_PYTHON)
+	@which python3
+	@$(IN_CONDA_ENV) python3 ./scripts/run_regression_lvs.py --variant=IC --device=$*
+
+#=================================
+# -------- test-LVS-switch -------
+#=================================
+
+# LVS main testing
+test-LVS-switch: | $(CONDA_ENV_PYTHON)
+	@$(IN_CONDA_ENV) klayout -v
diff --git a/ULL/klayout/lvs/gf180ULL.lvs b/ULL/klayout/lvs/gf180ULL.lvs
index 4f6b68c..eeee8b9 100644
--- a/ULL/klayout/lvs/gf180ULL.lvs
+++ b/ULL/klayout/lvs/gf180ULL.lvs
@@ -255,12 +255,18 @@
 # %include 'rule_decks/mos_derivations.lvs'
 
 #================================
-# ------ DIODE DERIVATIONS --------
+# ----- DIODE DERIVATIONS -------
 #================================
 
 # %include 'rule_decks/diode_derivations.lvs'
 
 #================================
+# ------ RES DERIVATIONS --------
+#================================
+
+# %include 'rule_decks/res_derivations.lvs'
+
+#================================
 # ------ MOSCAP DERIVATIONS -----
 #================================
 
@@ -314,6 +320,12 @@
 
 # %include 'rule_decks/diode_extraction.lvs'
 
+#==============================
+# ------- RES EXTRACTION ------
+#==============================
+
+# %include 'rule_decks/res_extraction.lvs'
+
 #================================
 # ------- MOSCAP EXTRACTION -----
 #================================
diff --git a/ULL/klayout/lvs/rule_decks/general_derivations.lvs b/ULL/klayout/lvs/rule_decks/general_derivations.lvs
index 3c8912c..d49b7b0 100644
--- a/ULL/klayout/lvs/rule_decks/general_derivations.lvs
+++ b/ULL/klayout/lvs/rule_decks/general_derivations.lvs
@@ -39,7 +39,7 @@
 pactive         = pcomp.and(all_nwell)
 pgate           = pactive.and(tgate)
 psd             = pactive.interacting(pgate).not(pgate).not(res_mk)
-ntap            = ncomp.and(all_nwell_pw).not(res_mk)
+ntap            = ncomp.and(all_nwell).not(res_mk)
 
 ngate_dn        = ngate.and(dnwell_p)
 ptap_dn         = ptap.and(dnwell_p)
diff --git a/ULL/klayout/lvs/rule_decks/moscap_derivations.lvs b/ULL/klayout/lvs/rule_decks/moscap_derivations.lvs
index 78e569d..e195820 100644
--- a/ULL/klayout/lvs/rule_decks/moscap_derivations.lvs
+++ b/ULL/klayout/lvs/rule_decks/moscap_derivations.lvs
@@ -36,10 +36,10 @@
 nmos_gate_1p8_dw = moscap_ngate.and(dnwell).not(nwell).not(dv2).not(dualgate)
 
 # pmoscap_1p8 capacitor
-pmos_gate_1p8 = pgate.not(dnwell).and(nwell).not(dv2).not(dualgate)
+pmos_gate_1p8 = moscap_pgate.not(dnwell).and(nwell).not(dv2).not(dualgate)
 
 # pmoscap_1p8_dw capacitor
-pmos_gate_1p8_dw = pgate.and(dnwell).not(dv2).not(dualgate)
+pmos_gate_1p8_dw = moscap_pgate.and(dnwell).not(dv2).not(dualgate)
 
 # nmoscap_6p0 capacitor
 nmoscap_6p0_g = moscap_ngate.not(nwell).not(dnwell).and(dv2).not(dualgate)
@@ -48,10 +48,10 @@
 nmoscap_6p0_dw_g = moscap_ngate.and(dnwell).not(nwell).and(dv2).not(dualgate)
 
 # pmoscap_6p0 capacitor
-pmoscap_6p0_g = pgate.not(dnwell).and(nwell).and(dv2).not(dualgate)
+pmoscap_6p0_g = moscap_pgate.not(dnwell).and(nwell).and(dv2).not(dualgate)
 
 # pmoscap_6p0_dw capacitor
-pmoscap_6p0_dw_g = pgate.and(dnwell).and(dv2).not(dualgate)
+pmoscap_6p0_dw_g = moscap_pgate.and(dnwell).and(dv2).not(dualgate)
 
 # nmoscap_1p8_nwell capacitor
 nmoscap_1p8_nwell_g = moscap_ngate.not(dnwell).and(nwell).not(dv2).not(dualgate)
diff --git a/ULL/klayout/lvs/rule_decks/res_connections.lvs b/ULL/klayout/lvs/rule_decks/res_connections.lvs
deleted file mode 100644
index b408d49..0000000
--- a/ULL/klayout/lvs/rule_decks/res_connections.lvs
+++ /dev/null
@@ -1,25 +0,0 @@
-################################################################################################
-# Copyright 2023 GlobalFoundries PDK Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-################################################################################################
-
-#================================
-# ---- RESISTOR CONNECTIONS -----
-#================================
-
-logger.info('Starting LVS RESISTOR CONNECTIONS')
-
-connect(nplus_cont, contact)
-connect(pplus_cont, contact)
-connect(pplus_dw_cont, contact)
\ No newline at end of file
diff --git a/ULL/klayout/lvs/rule_decks/res_derivations.lvs b/ULL/klayout/lvs/rule_decks/res_derivations.lvs
index 425ea0a..cbe19f2 100644
--- a/ULL/klayout/lvs/rule_decks/res_derivations.lvs
+++ b/ULL/klayout/lvs/rule_decks/res_derivations.lvs
@@ -21,165 +21,32 @@
 
 logger.info('Starting RESISTOR DERIVATIONS')
 
-#====================
-# ---- Diff RES ----
-#====================
 
-# general diffusion contacts derivations
-nplus_cont = ncomp.outside(nwell).not_interacting(ngate).interacting(res_mk).not(res_mk).not_interacting(diode_mk)
-                    .not(esd).not(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not(pplus)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
+#==========================
+# --- PPOLY-RES EXCLUDE ---
+#==========================
 
-pplus_cont = pcomp.inside(nwell).not_interacting(pgate).interacting(res_mk).not(res_mk).not_interacting(diode_mk)
-                    .not(esd).not(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
-
-pplus_dw_cont = pcomp.not(lvpwell).and(dnwell).not_interacting(pgate).interacting(res_mk).not(res_mk)
-                    .not(esd).not(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
-
-
-# nplus_u (3-terminal unsalicided n+ diffusion resistor (outside DNWELL))
-nplus_u_layer = ncomp.and(lvpwell).and(sab).and(res_mk).not(dnwell).not(nat).interacting(nplus_cont)
-
-# nplus_u_dw (3-terminal unsalicided n+ diffusion resistor (inside DNWELL))
-nplus_u_dw_layer = ncomp.and(lvpwell).and(sab).and(res_mk).and(dnwell).not(nat).interacting(nplus_cont)
-
-# pplus_u (3-terminal unsalicided P+ diffusion resistor (outside DNWELL))
-pplus_u_layer = pcomp.and(nwell).and(sab).and(res_mk).not(dnwell).outside(lvpwell).not(nat).interacting(pplus_cont)
-
-# pplus_u_dw (3-terminal unsalicided P+ diffusion resistor (inside DNWELL))
-pplus_u_dw_layer = pcomp.and(sab).and(res_mk).and(dnwell).interacting(pplus_dw_cont)
-
-# nplus_s (3-terminal salicided N+ diffusion resistor (outside DNWELL))
-nplus_s_layer = ncomp.and(lvpwell).and(res_mk).not_interacting(sab).not(dnwell).interacting(nplus_cont)
-
-# nplus_s_dw (3-terminal salicided N+ diffusion resistor (inside DNWELL))
-nplus_s_dw_layer = ncomp.and(lvpwell).and(res_mk).and(dnwell).not_interacting(sab).interacting(nplus_cont)
-
-# pplus_s (3-terminal salicided P+ diffusion resistor (outside DNWELL))
-pplus_s_layer = pcomp.and(nwell).and(res_mk).not_interacting(sab).not(dnwell).interacting(nplus_cont)
-
-# pplus_s_dw (3-terminal salicided P+ diffusion resistor (inside DNWELL))
-pplus_s_dw_layer = pcomp.not_interacting(sab).and(res_mk).and(dnwell).not_interacting(sab)
-
-
-#====================
-# ---- PWELL RES ----
-#====================
-
-# pwell (3-terminal low voltage pwell resistor for 1.8V/6V process (inside DNWELL only))
-pwell_res = lvpwell.and(res_mk).and(dnwell).not_covering(comp).not(poly2).outside(lvs_rf)
-                    .not(esd).not_interacting(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
-
+ppoly_exclude =  comp.join(nplus).join(esd)
+                     .join(resistor).join(polyfuse).join(cap_mk)
+                     .join(fusewindow_d).join(polyfuse).join(drc_bjt)
+                     .join(lvs_bjt).outside(fhres).join(fusetop)
+                     .join(diode_mk).join(piscap).join(mos_cap_mk)
+                     .join(mim_l_mk).join(nat).join(v5_xtor)
 
 #====================
 # ---- POLY RES ----
 #====================
 
-# npolyf_u (3-terminal unsalicided n+ poly resistor (outside DNWELL))
-npolyf_u_layer = nplus.and(poly2).and(sab).and(res_mk).not(dnwell).outside(comp)
-                    .not(esd).not_interacting(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
-
-# npolyf_u_dw (3-terminal unsalicided n+ poly resistor (inside DNWELL))
-npolyf_u_dw_layer = nplus.and(poly2).and(sab).and(res_mk).and(dnwell).outside(comp)
-                    .not(esd).not_interacting(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
+ppoly_res = pplus.and(poly2).and(res_mk).not(ppoly_exclude)
 
 # ppolyf_u (3-terminal unsalicided p+ poly resistor (outside DNWELL))
-ppolyf_u_layer = pplus.and(poly2).and(sab).and(res_mk).not(dnwell).outside(comp)
-                    .not(esd).not_interacting(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
+ppolyf_u_layer = ppoly_res.and(sab).not(dnwell)
 
 # ppolyf_u_dw (3-terminal unsalicided p+ poly resistor (inside DNWELL))
-ppolyf_u_dw_layer = pplus.and(poly2).and(sab).and(res_mk).and(dnwell).outside(comp)
-                    .not(esd).not_interacting(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
-
-# npolyf_s (3-terminal salicided n+ poly resistor (outside DNWELL))
-npolyf_s_layer = nplus.and(poly2).not_interacting(sab).and(res_mk).not(dnwell).outside(comp)
-                    .not(esd).not_interacting(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
-
-# npolyf_s_dw (3-terminal salicided n+ poly resistor (inside DNWELL))
-npolyf_s_dw_layer = nplus.and(poly2).not_interacting(sab).and(res_mk).and(dnwell).outside(comp)
-                    .not(esd).not_interacting(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
+ppolyf_u_dw_layer = ppoly_res.and(sab).and(dnwell)
 
 # ppolyf_s (3-terminal salicided p+ poly resistor (outside DNWELL))
-ppolyf_s_layer = pplus.and(poly2).not_interacting(sab).and(res_mk).not(dnwell).outside(comp)
-                    .not(esd).not_interacting(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
+ppolyf_s_layer = ppoly_res.not_interacting(sab).not(dnwell)
 
 # ppolyf_s_dw (3-terminal salicided p+ poly resistor (inside DNWELL))
-ppolyf_s_dw_layer = pplus.and(poly2).not_interacting(sab).and(res_mk).and(dnwell).outside(comp)
-                    .not(esd).not_interacting(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
-
-
-#========================
-# ---- POLY High RES ----
-#========================
-
-# general derivations for High RES POLY
-poly_hr_layer = pplus.and(poly2).and(sab).and(res_mk).not(dnwell).outside(comp)
-                    .not(esd).and(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
-
-poly_hr_dw_layer = pplus.and(poly2).and(sab).and(res_mk).and(dnwell).outside(comp)
-                    .not(esd).and(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                    .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(fhres).not(fusetop).not_interacting(diode_mk)
-                    .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
-
-case POLY_RES
-when '1k'
-
-  # ppolyf_u_1k (3-terminal 1k high-Rs p+ poly resistor on field oxide (outside DNWELL))
-  ppolyf_u_1k_layer = poly_hr_layer
-
-  # ppolyf_u_1k_dw (3-terminal 1k high-Rs p+ poly resistor on field oxide (inside DNWELL))
-  ppolyf_u_1k_dw_layer = poly_hr_dw_layer
-
-when '2k'
-
-  # ppolyf_u_2k (3-terminal 2k high-Rs p+ poly resistor on field oxide (outside DNWELL))
-  ppolyf_u_2k_layer = poly_hr_layer
-
-  # ppolyf_u_2k_dw (3-terminal 2k high-Rs p+ poly resistor on field oxide (inside DNWELL))
-  ppolyf_u_2k_dw_layer = poly_hr_dw_layer
-
-end
-
-#=============================
-# ---- POLY Free High RES ----
-#=============================
-
-# ppolyf_u_fhr_16p0_lv (3-terminal free high-Rs p+ poly res. On field oxide (LV/MV area outside DNWELL))
-ppolyf_u_fhr_16p0_lv_layer = pplus.and(poly2).and(sab).and(res_mk).not(dnwell).and(fhres).not_interacting(diode_mk)
-                                .not(esd).not(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                                .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(comp).not(fusetop)
-                                .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
-
-# ppolyf_u_fhr_16p0_lv_dw (3-terminal free high-Rs p+ poly res. On field oxide (LV/MV area inside DNWELL))
-ppolyf_u_fhr_16p0_lv_dw_layer = pplus.and(poly2).and(sab).and(res_mk).and(dnwell).and(fhres).not_interacting(diode_mk)
-                                .not(esd).not(resistor).not(polyfuse).not_interacting(cap_mk).not(fusewindow_d)
-                                .not(polyfuse).not(drc_bjt).not(lvs_bjt).outside(comp).not(fusetop)
-                                .not(piscap).not_interacting(mos_cap_mk).not_interacting(mim_l_mk).not(nat).not(v5_xtor)
-
-
-                    
+ppolyf_s_dw_layer = ppoly_res.not_interacting(sab).and(dnwell)
diff --git a/ULL/klayout/lvs/rule_decks/res_extraction.lvs b/ULL/klayout/lvs/rule_decks/res_extraction.lvs
index 1f723ae..0304361 100644
--- a/ULL/klayout/lvs/rule_decks/res_extraction.lvs
+++ b/ULL/klayout/lvs/rule_decks/res_extraction.lvs
@@ -19,146 +19,27 @@
 #================================
 
 logger.info('Starting RESISTOR EXTRACTION')
-
-#====================
-# ---- Diff RES ----
-#====================
-
-# nplus_u (3-terminal unsalicided n+ diffusion resistor (outside DNWELL))
-logger.info('Extracting nplus_u device')
-extract_devices(resistor_with_bulk('nplus_u', 60, BResistor), { 'R' => nplus_u_layer, 'C' => nplus_cont, 'W' => sub })
-
-# nplus_u_dw (3-terminal unsalicided n+ diffusion resistor (inside DNWELL))
-logger.info('Extracting nplus_u_dw device')
-extract_devices(resistor_with_bulk('nplus_u_dw', 60, BResistor),
-                { 'R' => nplus_u_dw_layer, 'C' => nplus_cont, 'W' => lvpwell_con })
-
-# pplus_u (3-terminal unsalicided P+ diffusion resistor (outside DNWELL))
-logger.info('Extracting pplus_u device')
-extract_devices(resistor_with_bulk('pplus_u', 185, BResistor),
-                { 'R' => pplus_u_layer, 'C' => pplus_cont, 'W' => nwell_con })
-
-# pplus_u_dw (3-terminal unsalicided P+ diffusion resistor (inside DNWELL))
-logger.info('Extracting pplus_u_dw device')
-extract_devices(resistor_with_bulk('pplus_u_dw', 185, BResistor),
-                { 'R' => pplus_u_dw_layer, 'C' => pplus_dw_cont, 'W' => dnwell })
-
-# nplus_s (3-terminal salicided N+ diffusion resistor (outside DNWELL))
-logger.info('Extracting nplus_s device')
-extract_devices(resistor_with_bulk('nplus_s', 6.3, BResistor), { 'R' => nplus_s_layer, 'C' => nplus_cont, 'W' => sub })
-
-# nplus_s_dw (3-terminal salicided N+ diffusion resistor (inside DNWELL))
-logger.info('Extracting nplus_s_dw device')
-extract_devices(resistor_with_bulk('nplus_s_dw', 6.3, BResistor),
-                { 'R' => nplus_s_dw_layer, 'C' => nplus_cont, 'W' => lvpwell_con })
-
-# pplus_s (3-terminal salicided P+ diffusion resistor (outside DNWELL))
-logger.info('Extracting pplus_s device')
-extract_devices(resistor_with_bulk('pplus_s', 7, BResistor),
-                { 'R' => pplus_s_layer, 'C' => pplus_cont, 'W' => nwell_con })
-
-# pplus_s_dw (3-terminal salicided P+ diffusion resistor (inside DNWELL))
-logger.info('Extracting pplus_s_dw device')
-extract_devices(resistor_with_bulk('pplus_s_dw', 7, BResistor),
-                { 'R' => pplus_s_dw_layer, 'C' => pplus_dw_cont, 'W' => dnwell })
-
-#====================
-# ---- PWELL RES ----
-#====================
-
-# pwell (3-terminal low voltage pwell resistor for 1.8V/6V process (inside DNWELL only))
-logger.info('Extracting PWELL device')
-extract_devices(resistor_with_bulk('pwell', 1000, BResistor), 
-                { 'R' => pwell_res, 'C' => lvpwell_con, 'W' => dnwell })
-
-
-                
+              
 #====================
 # ---- POLY RES ----
 #====================
 
-# npolyf_u (3-terminal unsalicided n+ poly resistor (outside DNWELL))
-logger.info('Extracting npolyf_u device')
-extract_devices(resistor_with_bulk('npolyf_u', 310, BResistor), 
-                { 'R' => npolyf_u_layer, 'C' => poly2_con, 'W' => sub })
-
-# npolyf_u_dw (3-terminal unsalicided n+ poly resistor (inside DNWELL))
-logger.info('Extracting npolyf_u_dw device')
-extract_devices(resistor_with_bulk('npolyf_u_dw', 310, BResistor),
-                { 'R' => npolyf_u_dw_layer, 'C' => poly2_con, 'W' => dnwell })
-
-# ppolyf_u (3-terminal unsalicided p+ poly resistor (outside DNWELL))
-logger.info('Extracting ppolyf_u device')
-extract_devices(resistor_with_bulk('ppolyf_u', 350, BResistor),
+# res_ppo_3t_uns: 3-terminal unsalicided p+ poly resistor (outside DNWELL) [ppolyf_u]
+logger.info('Extracting res_ppo_3t_uns resistor')
+extract_devices(resistor_with_bulk('res_ppo_3t_uns', 350, BResistor),
                  { 'R' => ppolyf_u_layer, 'C' => poly2_con, 'W' => sub })
 
-# ppolyf_u_dw (3-terminal unsalicided p+ poly resistor (inside DNWELL))
-logger.info('Extracting ppolyf_u_dw device')
-extract_devices(resistor_with_bulk('ppolyf_u_dw', 350, BResistor),
+# res_ppo_3t_uns_dn: 3-terminal unsalicided p+ poly resistor (inside DNWELL) [ppolyf_u_dw]
+logger.info('Extracting res_ppo_3t_uns_dn resistor')
+extract_devices(resistor_with_bulk('res_ppo_3t_uns_dn', 350, BResistor),
                 { 'R' => ppolyf_u_dw_layer, 'C' => poly2_con, 'W' => dnwell })
 
-# npolyf_s (3-terminal salicided n+ poly resistor (outside DNWELL))
-logger.info('Extracting npolyf_s device')
-extract_devices(resistor_with_bulk('npolyf_s', 6.8, BResistor),
-                { 'R' => npolyf_s_layer, 'C' => poly2_con, 'W' => sub })
-
-# npolyf_s_dw (3-terminal salicided n+ poly resistor (inside DNWELL))
-logger.info('Extracting npolyf_s_dw device')
-extract_devices(resistor_with_bulk('npolyf_s_dw', 6.8, BResistor),
-                { 'R' => npolyf_s_dw_layer, 'C' => poly2_con, 'W' => dnwell })
-
-# ppolyf_s (3-terminal salicided p+ poly resistor (outside DNWELL))
-logger.info('Extracting ppolyf_s device')
-extract_devices(resistor_with_bulk('ppolyf_s', 7.3, BResistor), 
+# res_ppo_3t_sal: 3-terminal salicided p+ poly resistor (outside DNWELL) [ppolyf_s]
+logger.info('Extracting res_ppo_3t_sal resistor')
+extract_devices(resistor_with_bulk('res_ppo_3t_sal', 7.3, BResistor), 
                 { 'R' => ppolyf_s_layer, 'C' => poly2_con, 'W' => sub })
 
-# ppolyf_s_dw (3-terminal salicided p+ poly resistor (inside DNWELL))
-logger.info('Extracting ppolyf_s_dw device')
-extract_devices(resistor_with_bulk('ppolyf_s_dw', 7.3, BResistor),
+# res_ppo_3t_sal_dn: 3-terminal salicided p+ poly resistor (inside DNWELL) [ppolyf_s_dw]
+logger.info('Extracting res_ppo_3t_sal_dn resistor')
+extract_devices(resistor_with_bulk('res_ppo_3t_sal_dn', 7.3, BResistor),
                 { 'R' => ppolyf_s_dw_layer, 'C' => poly2_con, 'W' => dnwell })
-
-
-#========================
-# ---- POLY High RES ----
-#========================
-
-case POLY_RES
-when '1k'
-
-  # ppolyf_u_1k (3-terminal 1k high-Rs p+ poly resistor on field oxide (outside DNWELL))
-  logger.info('Extracting ppolyf_u_1k device')
-  extract_devices(resistor_with_bulk('ppolyf_u_1k', 1000, BResistor),
-                  { 'R' => ppolyf_u_1k_layer, 'C' => poly2_con, 'W' => sub })
-
-  # ppolyf_u_1k_dw (3-terminal 1k high-Rs p+ poly resistor on field oxide (inside DNWELL))
-  logger.info('Extracting ppolyf_u_1k_dw device')
-  extract_devices(resistor_with_bulk('ppolyf_u_1k_dw', 1000, BResistor),
-                  { 'R' => ppolyf_u_1k_dw_layer, 'C' => poly2_con, 'W' => dnwell })
-
-
-when '2k'
-
-   # ppolyf_u_2k (3-terminal 2k high-Rs p+ poly resistor on field oxide (outside DNWELL))
-   logger.info('Extracting ppolyf_u_2k device')
-   extract_devices(resistor_with_bulk('ppolyf_u_2k', 2000, BResistor),
-                   { 'R' => ppolyf_u_2k_layer, 'C' => poly2_con, 'W' => sub })
-  
-   # ppolyf_u_2k_dw (3-terminal 2k high-Rs p+ poly resistor on field oxide (inside DNWELL))
-   logger.info('Extracting ppolyf_u_2k_dw device')
-   extract_devices(resistor_with_bulk('ppolyf_u_2k_dw', 2000, BResistor),
-                   { 'R' => ppolyf_u_2k_dw_layer, 'C' => poly2_con, 'W' => dnwell })
-
-end
-#=============================
-# ---- POLY Free High RES ----
-#=============================
-
-# ppolyf_u_fhr_16p0_lv (3-terminal free high-Rs p+ poly res. On field oxide (LV/MV area outside DNWELL))
-logger.info('Extracting ppolyf_u_fhr_16p0_lv device')
-extract_devices(resistor_with_bulk('ppolyf_u_fhr_16p0_lv', 6000, BResistor),
-                 { 'R' => ppolyf_u_fhr_16p0_lv_layer, 'C' => poly2_con, 'W' => sub })
-
-# ppolyf_u_fhr_16p0_lv_dw (3-terminal free high-Rs p+ poly res. On field oxide (LV/MV area inside DNWELL))
-logger.info('Extracting ppolyf_u_fhr_16p0_lv_dw device')
-extract_devices(resistor_with_bulk('ppolyf_u_fhr_16p0_lv_dw', 6000, BResistor),
-                { 'R' => ppolyf_u_fhr_16p0_lv_dw_layer, 'C' => poly2_con, 'W' => dnwell })
diff --git a/ULL/klayout/lvs/testing/run_regression.py b/ULL/klayout/lvs/testing/run_regression.py
index 1271f2a..8923512 100644
--- a/ULL/klayout/lvs/testing/run_regression.py
+++ b/ULL/klayout/lvs/testing/run_regression.py
@@ -20,7 +20,7 @@
 
 Options:
     --help -h                      Print this help message.
-    --device_name=<device_name>    Name of device that we want to run regression for, Allowed values (MOS, BJT, DIODE, RES, MIMCAP, MOSCAP, PISCAP, VARACTOR, MOS_SAB).
+    --device_name=<device_name>    Name of device that we want to run regression for, Allowed values (MOS, BJT, DIODE, RES, MIMCAP, MOSCAP, PISCAP, VARACTOR).
     --mp=<num>                     The number of threads used in run.
     --run_name=<run_name>          Select your run name.
 """
@@ -519,11 +519,11 @@
     )
 
     ## selected device
-    allowed_devices = ["MOS", "BJT", "DIODE", "RES", "MIMCAP", "MOSCAP", "PISCAP", "VARACTOR", "MOS_SAB"]
+    allowed_devices = ["MOS", "BJT", "DIODE", "RES", "MIMCAP", "MOSCAP", "PISCAP", "VARACTOR"]
     target_device_group = args["--device_name"]
 
     if target_device_group and target_device_group not in allowed_devices:
-        logging.error("Allowed devices are (MOS, BJT, DIODE, RES, MIMCAP, MOSCAP, PISCAP, VARACTOR, MOS_SAB) only")
+        logging.error("Allowed devices are (MOS, BJT, DIODE, RES, MIMCAP, MOSCAP, PISCAP, VARACTOR) only")
         exit(1)
 
     # Calling main function
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_s.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_s.gds
deleted file mode 100644
index 86025f7..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_s.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_s_dw.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_s_dw.gds
deleted file mode 100644
index d5b7cf6..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_s_dw.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_u.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_u.gds
deleted file mode 100644
index 33dc444..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_u.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_u_dw.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_u_dw.gds
deleted file mode 100644
index 84947cb..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/nplus_u_dw.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_s.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_s.gds
deleted file mode 100644
index 8de85ee..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_s.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_s_dw.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_s_dw.gds
deleted file mode 100644
index 227e797..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_s_dw.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u.gds
deleted file mode 100644
index 328c751..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u_dw.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u_dw.gds
deleted file mode 100644
index e4a3622..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/npolyf_u_dw.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_s.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_s.gds
deleted file mode 100644
index 48a1652..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_s.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_s_dw.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_s_dw.gds
deleted file mode 100644
index 391cd72..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_s_dw.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_u.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_u.gds
deleted file mode 100644
index 11db435..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_u.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_u_dw.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_u_dw.gds
deleted file mode 100644
index d019e2c..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pplus_u_dw.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_s.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_s.gds
deleted file mode 100644
index 9139447..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_s.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_s_dw.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_s_dw.gds
deleted file mode 100644
index 4992508..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_s_dw.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u.gds
deleted file mode 100644
index d2fc3fd..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k.gds
deleted file mode 100644
index 688e147..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k.yaml b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k.yaml
deleted file mode 100644
index 1e3edd5..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-ppolyf_u_1k:
-  -rd poly_res: "1k"
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k_dw.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k_dw.gds
deleted file mode 100644
index 76a7ce5..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k_dw.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k_dw.yaml b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k_dw.yaml
deleted file mode 100644
index e48d991..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_1k_dw.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-ppolyf_u_1k_dw:
-  -rd poly_res: "1k"
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k.gds
deleted file mode 100644
index 183a260..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k.yaml b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k.yaml
deleted file mode 100644
index c0672c2..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-ppolyf_u_2k:
-  -rd poly_res: "2k"
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k_dw.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k_dw.gds
deleted file mode 100644
index e4405f5..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k_dw.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k_dw.yaml b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k_dw.yaml
deleted file mode 100644
index b0924f7..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_2k_dw.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-ppolyf_u_2k_dw:
-  -rd poly_res: "2k"
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_dw.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_dw.gds
deleted file mode 100644
index 2abf185..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_dw.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_fhr_16p0_lv.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_fhr_16p0_lv.gds
deleted file mode 100644
index 8c8fa0f..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_fhr_16p0_lv.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_fhr_16p0_lv_dw.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_fhr_16p0_lv_dw.gds
deleted file mode 100644
index 7624ff8..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/ppolyf_u_fhr_16p0_lv_dw.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pwell.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pwell.gds
deleted file mode 100644
index c6c430e..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/pwell.gds
+++ /dev/null
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal.gds
new file mode 100644
index 0000000..5b08a50
--- /dev/null
+++ b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal.gds
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal_dn.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal_dn.gds
new file mode 100644
index 0000000..4af2d4e
--- /dev/null
+++ b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_sal_dn.gds
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns.gds
new file mode 100644
index 0000000..b76034d
--- /dev/null
+++ b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns.gds
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns_dn.gds b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns_dn.gds
new file mode 100644
index 0000000..ce82a1d
--- /dev/null
+++ b/ULL/klayout/lvs/testing/testcases/unit/res_devices/layout/res_ppo_3t_uns_dn.gds
Binary files differ
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_s.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_s.cdl
deleted file mode 100644
index 1345128..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_s.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: nplus_s
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:19:41 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    nplus_s
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT nplus_s I1_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_R0_MINUS I1_0_0_0_1_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS I1_0_0_1_1_0_R0_PLUS 
-+ I1_0_0_2_0_0_R0_MINUS I1_0_0_2_0_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS 
-+ I1_0_0_2_1_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS I1_0_1_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_R0_MINUS I1_0_1_0_1_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS I1_0_1_1_1_0_R0_PLUS 
-+ I1_0_1_2_0_0_R0_MINUS I1_0_1_2_0_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS 
-+ I1_0_1_2_1_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS I1_0_2_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_R0_MINUS I1_0_2_0_1_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS I1_0_2_1_1_0_R0_PLUS 
-+ I1_0_2_2_0_0_R0_MINUS I1_0_2_2_0_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS 
-+ I1_0_2_2_1_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS I1_1_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_R0_MINUS I1_1_0_0_1_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS I1_1_0_1_1_0_R0_PLUS 
-+ I1_1_0_2_0_0_R0_MINUS I1_1_0_2_0_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS 
-+ I1_1_0_2_1_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS I1_1_1_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_R0_MINUS I1_1_1_0_1_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS I1_1_1_1_1_0_R0_PLUS 
-+ I1_1_1_2_0_0_R0_MINUS I1_1_1_2_0_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS 
-+ I1_1_1_2_1_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS I1_1_2_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_R0_MINUS I1_1_2_0_1_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS I1_1_2_1_1_0_R0_PLUS 
-+ I1_1_2_2_0_0_R0_MINUS I1_1_2_2_0_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS 
-+ I1_1_2_2_1_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS I1_2_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_R0_MINUS I1_2_0_0_1_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS I1_2_0_1_1_0_R0_PLUS 
-+ I1_2_0_2_0_0_R0_MINUS I1_2_0_2_0_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS 
-+ I1_2_0_2_1_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS I1_2_1_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_R0_MINUS I1_2_1_0_1_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS I1_2_1_1_1_0_R0_PLUS 
-+ I1_2_1_2_0_0_R0_MINUS I1_2_1_2_0_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS 
-+ I1_2_1_2_1_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS I1_2_2_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_R0_MINUS I1_2_2_0_1_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS I1_2_2_1_1_0_R0_PLUS 
-+ I1_2_2_2_0_0_R0_MINUS I1_2_2_2_0_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS 
-+ I1_2_2_2_1_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_R0_MINUS:I I1_0_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_R0_MINUS:I I1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_R0_MINUS:I I1_0_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_R0_MINUS:I I1_0_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_R0_MINUS:I I1_0_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_R0_MINUS:I I1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_R0_MINUS:I I1_0_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_R0_MINUS:I I1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_R0_MINUS:I I1_0_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_R0_MINUS:I I1_0_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_R0_MINUS:I I1_0_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_R0_MINUS:I I1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_R0_MINUS:I I1_0_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_R0_MINUS:I I1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_R0_MINUS:I I1_0_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_R0_MINUS:I I1_0_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_R0_MINUS:I I1_0_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_R0_MINUS:I I1_1_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_R0_MINUS:I I1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_R0_MINUS:I I1_1_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_R0_MINUS:I I1_1_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_R0_MINUS:I I1_1_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_R0_MINUS:I I1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_R0_MINUS:I I1_1_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_R0_MINUS:I I1_1_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_R0_MINUS:I I1_1_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_R0_MINUS:I I1_1_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_R0_MINUS:I I1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_R0_MINUS:I I1_1_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_R0_MINUS:I I1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_R0_MINUS:I I1_1_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_R0_MINUS:I I1_1_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_R0_MINUS:I I1_1_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_R0_MINUS:I I1_2_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_R0_MINUS:I I1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_R0_MINUS:I I1_2_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_R0_MINUS:I I1_2_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_R0_MINUS:I I1_2_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_R0_MINUS:I I1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_R0_MINUS:I I1_2_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_R0_MINUS:I I1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_R0_MINUS:I I1_2_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_R0_MINUS:I I1_2_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_R0_MINUS:I I1_2_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_R0_MINUS:I I1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_R0_MINUS:I I1_2_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_R0_MINUS:I I1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_R0_MINUS:I I1_2_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_R0_MINUS:I I1_2_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_R0_MINUS:I I1_2_2_2_1_0_R0_PLUS:I I1_default_MINUS:I 
-*.PININFO I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_R0 I1_2_2_2_1_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=50u w=50u r=6.53672 par=8.0 s=1
-RI1_2_2_2_0_0_R0 I1_2_2_2_0_0_R0_PLUS I1_2_2_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=50u r=6.53672 par=1.0 s=8
-RI1_2_2_1_1_0_R0 I1_2_2_1_1_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=50u w=50u r=6.53672 par=3.0 s=1
-RI1_2_2_1_0_0_R0 I1_2_2_1_0_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=50u r=6.53672 par=1.0 s=3
-RI1_2_2_0_1_0_R0 I1_2_2_0_1_0_R0_PLUS I1_2_2_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=50u r=6.53672 par=1.0 s=1
-RI1_2_2_0_0_0_R0 I1_2_2_0_0_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=50u r=6.53672 par=1.0 s=1
-RI1_2_1_2_1_0_R0 I1_2_1_2_1_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=2.6u w=50u r=567.308m par=8.0 s=1
-RI1_2_1_2_0_0_R0 I1_2_1_2_0_0_R0_PLUS I1_2_1_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=8
-RI1_2_1_1_1_0_R0 I1_2_1_1_1_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=2.6u w=50u r=567.308m par=3.0 s=1
-RI1_2_1_1_0_0_R0 I1_2_1_1_0_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=3
-RI1_2_1_0_1_0_R0 I1_2_1_0_1_0_R0_PLUS I1_2_1_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=1
-RI1_2_1_0_0_0_R0 I1_2_1_0_0_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=1
-RI1_2_0_2_1_0_R0 I1_2_0_2_1_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=840n w=50u r=345.658m par=8.0 s=1
-RI1_2_0_2_0_0_R0 I1_2_0_2_0_0_R0_PLUS I1_2_0_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=50u r=345.658m par=1.0 s=8
-RI1_2_0_1_1_0_R0 I1_2_0_1_1_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=840n w=50u r=345.658m par=3.0 s=1
-RI1_2_0_1_0_0_R0 I1_2_0_1_0_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=50u r=345.658m par=1.0 s=3
-RI1_2_0_0_1_0_R0 I1_2_0_0_1_0_R0_PLUS I1_2_0_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=50u r=345.658m par=1.0 s=1
-RI1_2_0_0_0_0_R0 I1_2_0_0_0_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=50u r=345.658m par=1.0 s=1
-RI1_1_2_2_1_0_R0 I1_1_2_2_1_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=50u w=1.57u r=205.015 par=8.0 s=1
-RI1_1_2_2_0_0_R0 I1_1_2_2_0_0_R0_PLUS I1_1_2_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=8
-RI1_1_2_1_1_0_R0 I1_1_2_1_1_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=50u w=1.57u r=205.015 par=3.0 s=1
-RI1_1_2_1_0_0_R0 I1_1_2_1_0_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=3
-RI1_1_2_0_1_0_R0 I1_1_2_0_1_0_R0_PLUS I1_1_2_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=1
-RI1_1_2_0_0_0_R0 I1_1_2_0_0_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=1
-RI1_1_1_2_1_0_R0 I1_1_1_2_1_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=2.6u w=1.57u r=17.7928 par=8.0 s=1
-RI1_1_1_2_0_0_R0 I1_1_1_2_0_0_R0_PLUS I1_1_1_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=8
-RI1_1_1_1_1_0_R0 I1_1_1_1_1_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=2.6u w=1.57u r=17.7928 par=3.0 s=1
-RI1_1_1_1_0_0_R0 I1_1_1_1_0_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=3
-RI1_1_1_0_1_0_R0 I1_1_1_0_1_0_R0_PLUS I1_1_1_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=1
-RI1_1_1_0_0_0_R0 I1_1_1_0_0_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=1
-RI1_1_0_2_1_0_R0 I1_1_0_2_1_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=840n w=1.57u r=10.8411 par=8.0 s=1
-RI1_1_0_2_0_0_R0 I1_1_0_2_0_0_R0_PLUS I1_1_0_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=8
-RI1_1_0_1_1_0_R0 I1_1_0_1_1_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=840n w=1.57u r=10.8411 par=3.0 s=1
-RI1_1_0_1_0_0_R0 I1_1_0_1_0_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=3
-RI1_1_0_0_1_0_R0 I1_1_0_0_1_0_R0_PLUS I1_1_0_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=1
-RI1_1_0_0_0_0_R0 I1_1_0_0_0_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=1
-RI1_0_2_2_1_0_R0 I1_0_2_2_1_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=50u w=420n r=734.83 par=8.0 s=1
-RI1_0_2_2_0_0_R0 I1_0_2_2_0_0_R0_PLUS I1_0_2_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=420n r=734.83 par=1.0 s=8
-RI1_0_2_1_1_0_R0 I1_0_2_1_1_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=50u w=420n r=734.83 par=3.0 s=1
-RI1_0_2_1_0_0_R0 I1_0_2_1_0_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=420n r=734.83 par=1.0 s=3
-RI1_0_2_0_1_0_R0 I1_0_2_0_1_0_R0_PLUS I1_0_2_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=420n r=734.83 par=1.0 s=1
-RI1_0_2_0_0_0_R0 I1_0_2_0_0_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=50u w=420n r=734.83 par=1.0 s=1
-RI1_0_1_2_1_0_R0 I1_0_1_2_1_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=2.6u w=420n r=63.7743 par=8.0 s=1
-RI1_0_1_2_0_0_R0 I1_0_1_2_0_0_R0_PLUS I1_0_1_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=8
-RI1_0_1_1_1_0_R0 I1_0_1_1_1_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=2.6u w=420n r=63.7743 par=3.0 s=1
-RI1_0_1_1_0_0_R0 I1_0_1_1_0_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=3
-RI1_0_1_0_1_0_R0 I1_0_1_0_1_0_R0_PLUS I1_0_1_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=1
-RI1_0_1_0_0_0_R0 I1_0_1_0_0_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=1
-RI1_0_0_2_1_0_R0 I1_0_0_2_1_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS gnd! 
-+ nplus_s m=8.0 l=840n w=420n r=38.8574 par=8.0 s=1
-RI1_0_0_2_0_0_R0 I1_0_0_2_0_0_R0_PLUS I1_0_0_2_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=420n r=38.8574 par=1.0 s=8
-RI1_0_0_1_1_0_R0 I1_0_0_1_1_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS gnd! 
-+ nplus_s m=3.0 l=840n w=420n r=38.8574 par=3.0 s=1
-RI1_0_0_1_0_0_R0 I1_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=420n r=38.8574 par=1.0 s=3
-RI1_0_0_0_1_0_R0 I1_0_0_0_1_0_R0_PLUS I1_0_0_0_1_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=420n r=38.8574 par=1.0 s=1
-RI1_0_0_0_0_0_R0 I1_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s m=1.0 l=840n w=420n r=38.8574 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! nplus_s m=1.0 
-+ l=840.00n w=420.00n r=38.8574 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_s_dw.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_s_dw.cdl
deleted file mode 100644
index 9f47539..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_s_dw.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: nplus_s_dw
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:25:53 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    nplus_s_dw
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT nplus_s_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=8.0 l=50u w=50u r=6.53672 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=50u r=6.53672 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=3.0 l=50u w=50u r=6.53672 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=50u r=6.53672 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=50u r=6.53672 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=50u r=6.53672 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=8.0 l=2.6u w=50u r=567.308m par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=3.0 l=2.6u w=50u r=567.308m par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=50u r=567.308m par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=8.0 l=840n w=50u r=345.658m par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=50u r=345.658m par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=3.0 l=840n w=50u r=345.658m par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=50u r=345.658m par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=50u r=345.658m par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=50u r=345.658m par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=8.0 l=50u w=1.57u r=205.015 par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=3.0 l=50u w=1.57u r=205.015 par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=1.57u r=205.015 par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=8.0 l=2.6u w=1.57u r=17.7928 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=3.0 l=2.6u w=1.57u r=17.7928 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=1.57u r=17.7928 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=8.0 l=840n w=1.57u r=10.8411 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=3.0 l=840n w=1.57u r=10.8411 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=1.57u r=10.8411 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=8.0 l=50u w=420n r=734.83 par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=420n r=734.83 par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=3.0 l=50u w=420n r=734.83 par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=420n r=734.83 par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=420n r=734.83 par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=50u w=420n r=734.83 par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=8.0 l=2.6u w=420n r=63.7743 par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=3.0 l=2.6u w=420n r=63.7743 par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=2.6u w=420n r=63.7743 par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=8.0 l=840n w=420n r=38.8574 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=420n r=38.8574 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=3.0 l=840n w=420n r=38.8574 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=420n r=38.8574 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=420n r=38.8574 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ nplus_s_dw m=1.0 l=840n w=420n r=38.8574 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! nplus_s_dw m=1.0 
-+ l=840.00n w=420.00n r=38.8574 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_u.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_u.cdl
deleted file mode 100644
index f1c6c45..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_u.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: nplus_u
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:29:33 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    nplus_u
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT nplus_u I1_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_R0_MINUS I1_0_0_0_1_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS I1_0_0_1_1_0_R0_PLUS 
-+ I1_0_0_2_0_0_R0_MINUS I1_0_0_2_0_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS 
-+ I1_0_0_2_1_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS I1_0_1_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_R0_MINUS I1_0_1_0_1_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS I1_0_1_1_1_0_R0_PLUS 
-+ I1_0_1_2_0_0_R0_MINUS I1_0_1_2_0_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS 
-+ I1_0_1_2_1_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS I1_0_2_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_R0_MINUS I1_0_2_0_1_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS I1_0_2_1_1_0_R0_PLUS 
-+ I1_0_2_2_0_0_R0_MINUS I1_0_2_2_0_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS 
-+ I1_0_2_2_1_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS I1_1_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_R0_MINUS I1_1_0_0_1_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS I1_1_0_1_1_0_R0_PLUS 
-+ I1_1_0_2_0_0_R0_MINUS I1_1_0_2_0_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS 
-+ I1_1_0_2_1_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS I1_1_1_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_R0_MINUS I1_1_1_0_1_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS I1_1_1_1_1_0_R0_PLUS 
-+ I1_1_1_2_0_0_R0_MINUS I1_1_1_2_0_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS 
-+ I1_1_1_2_1_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS I1_1_2_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_R0_MINUS I1_1_2_0_1_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS I1_1_2_1_1_0_R0_PLUS 
-+ I1_1_2_2_0_0_R0_MINUS I1_1_2_2_0_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS 
-+ I1_1_2_2_1_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS I1_2_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_R0_MINUS I1_2_0_0_1_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS I1_2_0_1_1_0_R0_PLUS 
-+ I1_2_0_2_0_0_R0_MINUS I1_2_0_2_0_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS 
-+ I1_2_0_2_1_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS I1_2_1_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_R0_MINUS I1_2_1_0_1_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS I1_2_1_1_1_0_R0_PLUS 
-+ I1_2_1_2_0_0_R0_MINUS I1_2_1_2_0_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS 
-+ I1_2_1_2_1_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS I1_2_2_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_R0_MINUS I1_2_2_0_1_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS I1_2_2_1_1_0_R0_PLUS 
-+ I1_2_2_2_0_0_R0_MINUS I1_2_2_2_0_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS 
-+ I1_2_2_2_1_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_R0_MINUS:I I1_0_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_R0_MINUS:I I1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_R0_MINUS:I I1_0_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_R0_MINUS:I I1_0_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_R0_MINUS:I I1_0_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_R0_MINUS:I I1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_R0_MINUS:I I1_0_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_R0_MINUS:I I1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_R0_MINUS:I I1_0_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_R0_MINUS:I I1_0_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_R0_MINUS:I I1_0_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_R0_MINUS:I I1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_R0_MINUS:I I1_0_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_R0_MINUS:I I1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_R0_MINUS:I I1_0_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_R0_MINUS:I I1_0_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_R0_MINUS:I I1_0_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_R0_MINUS:I I1_1_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_R0_MINUS:I I1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_R0_MINUS:I I1_1_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_R0_MINUS:I I1_1_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_R0_MINUS:I I1_1_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_R0_MINUS:I I1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_R0_MINUS:I I1_1_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_R0_MINUS:I I1_1_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_R0_MINUS:I I1_1_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_R0_MINUS:I I1_1_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_R0_MINUS:I I1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_R0_MINUS:I I1_1_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_R0_MINUS:I I1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_R0_MINUS:I I1_1_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_R0_MINUS:I I1_1_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_R0_MINUS:I I1_1_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_R0_MINUS:I I1_2_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_R0_MINUS:I I1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_R0_MINUS:I I1_2_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_R0_MINUS:I I1_2_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_R0_MINUS:I I1_2_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_R0_MINUS:I I1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_R0_MINUS:I I1_2_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_R0_MINUS:I I1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_R0_MINUS:I I1_2_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_R0_MINUS:I I1_2_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_R0_MINUS:I I1_2_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_R0_MINUS:I I1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_R0_MINUS:I I1_2_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_R0_MINUS:I I1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_R0_MINUS:I I1_2_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_R0_MINUS:I I1_2_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_R0_MINUS:I I1_2_2_2_1_0_R0_PLUS:I I1_default_MINUS:I 
-*.PININFO I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_R0 I1_2_2_2_1_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=50u w=50u r=60.6187 par=8.0 s=1
-RI1_2_2_2_0_0_R0 I1_2_2_2_0_0_R0_PLUS I1_2_2_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=50u r=60.6187 par=1.0 s=8
-RI1_2_2_1_1_0_R0 I1_2_2_1_1_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=50u w=50u r=60.6187 par=3.0 s=1
-RI1_2_2_1_0_0_R0 I1_2_2_1_0_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=50u r=60.6187 par=1.0 s=3
-RI1_2_2_0_1_0_R0 I1_2_2_0_1_0_R0_PLUS I1_2_2_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=50u r=60.6187 par=1.0 s=1
-RI1_2_2_0_0_0_R0 I1_2_2_0_0_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=50u r=60.6187 par=1.0 s=1
-RI1_2_1_2_1_0_R0 I1_2_1_2_1_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=7.6u w=50u r=9.84027 par=8.0 s=1
-RI1_2_1_2_0_0_R0 I1_2_1_2_0_0_R0_PLUS I1_2_1_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=8
-RI1_2_1_1_1_0_R0 I1_2_1_1_1_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=7.6u w=50u r=9.84027 par=3.0 s=1
-RI1_2_1_1_0_0_R0 I1_2_1_1_0_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=3
-RI1_2_1_0_1_0_R0 I1_2_1_0_1_0_R0_PLUS I1_2_1_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=1
-RI1_2_1_0_0_0_R0 I1_2_1_0_0_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=1
-RI1_2_0_2_1_0_R0 I1_2_0_2_1_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=1.6u w=50u r=2.65464 par=8.0 s=1
-RI1_2_0_2_0_0_R0 I1_2_0_2_0_0_R0_PLUS I1_2_0_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=8
-RI1_2_0_1_1_0_R0 I1_2_0_1_1_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=1.6u w=50u r=2.65464 par=3.0 s=1
-RI1_2_0_1_0_0_R0 I1_2_0_1_0_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=3
-RI1_2_0_0_1_0_R0 I1_2_0_0_1_0_R0_PLUS I1_2_0_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=1
-RI1_2_0_0_0_0_R0 I1_2_0_0_0_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=1
-RI1_1_2_2_1_0_R0 I1_1_2_2_1_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=50u w=3.62u r=816.397 par=8.0 s=1
-RI1_1_2_2_0_0_R0 I1_1_2_2_0_0_R0_PLUS I1_1_2_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=8
-RI1_1_2_1_1_0_R0 I1_1_2_1_1_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=50u w=3.62u r=816.397 par=3.0 s=1
-RI1_1_2_1_0_0_R0 I1_1_2_1_0_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=3
-RI1_1_2_0_1_0_R0 I1_1_2_0_1_0_R0_PLUS I1_1_2_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=1
-RI1_1_2_0_0_0_R0 I1_1_2_0_0_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=1
-RI1_1_1_2_1_0_R0 I1_1_1_2_1_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=7.6u w=3.62u r=132.526 par=8.0 s=1
-RI1_1_1_2_0_0_R0 I1_1_1_2_0_0_R0_PLUS I1_1_1_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=8
-RI1_1_1_1_1_0_R0 I1_1_1_1_1_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=7.6u w=3.62u r=132.526 par=3.0 s=1
-RI1_1_1_1_0_0_R0 I1_1_1_1_0_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=3
-RI1_1_1_0_1_0_R0 I1_1_1_0_1_0_R0_PLUS I1_1_1_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=1
-RI1_1_1_0_0_0_R0 I1_1_1_0_0_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=1
-RI1_1_0_2_1_0_R0 I1_1_0_2_1_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=1.6u w=3.62u r=35.752 par=8.0 s=1
-RI1_1_0_2_0_0_R0 I1_1_0_2_0_0_R0_PLUS I1_1_0_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=8
-RI1_1_0_1_1_0_R0 I1_1_0_1_1_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=1.6u w=3.62u r=35.752 par=3.0 s=1
-RI1_1_0_1_0_0_R0 I1_1_0_1_0_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=3
-RI1_1_0_0_1_0_R0 I1_1_0_0_1_0_R0_PLUS I1_1_0_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=1
-RI1_1_0_0_0_0_R0 I1_1_0_0_0_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=1
-RI1_0_2_2_1_0_R0 I1_0_2_2_1_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=50u w=800n r=3.37444K par=8.0 s=1
-RI1_0_2_2_0_0_R0 I1_0_2_2_0_0_R0_PLUS I1_0_2_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=800n r=3.37444K par=1.0 s=8
-RI1_0_2_1_1_0_R0 I1_0_2_1_1_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=50u w=800n r=3.37444K par=3.0 s=1
-RI1_0_2_1_0_0_R0 I1_0_2_1_0_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=800n r=3.37444K par=1.0 s=3
-RI1_0_2_0_1_0_R0 I1_0_2_0_1_0_R0_PLUS I1_0_2_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=800n r=3.37444K par=1.0 s=1
-RI1_0_2_0_0_0_R0 I1_0_2_0_0_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=50u w=800n r=3.37444K par=1.0 s=1
-RI1_0_1_2_1_0_R0 I1_0_1_2_1_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=7.6u w=800n r=547.775 par=8.0 s=1
-RI1_0_1_2_0_0_R0 I1_0_1_2_0_0_R0_PLUS I1_0_1_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=8
-RI1_0_1_1_1_0_R0 I1_0_1_1_1_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=7.6u w=800n r=547.775 par=3.0 s=1
-RI1_0_1_1_0_0_R0 I1_0_1_1_0_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=3
-RI1_0_1_0_1_0_R0 I1_0_1_0_1_0_R0_PLUS I1_0_1_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=1
-RI1_0_1_0_0_0_R0 I1_0_1_0_0_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=1
-RI1_0_0_2_1_0_R0 I1_0_0_2_1_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS gnd! 
-+ nplus_u m=8.0 l=1.6u w=800n r=147.775 par=8.0 s=1
-RI1_0_0_2_0_0_R0 I1_0_0_2_0_0_R0_PLUS I1_0_0_2_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=8
-RI1_0_0_1_1_0_R0 I1_0_0_1_1_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS gnd! 
-+ nplus_u m=3.0 l=1.6u w=800n r=147.775 par=3.0 s=1
-RI1_0_0_1_0_0_R0 I1_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=3
-RI1_0_0_0_1_0_R0 I1_0_0_0_1_0_R0_PLUS I1_0_0_0_1_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=1
-RI1_0_0_0_0_0_R0 I1_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! nplus_u m=1.0 l=2u 
-+ w=1u r=142.7251 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_u_dw.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_u_dw.cdl
deleted file mode 100644
index cc9e2e7..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/nplus_u_dw.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: nplus_u_dw
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:30:25 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    nplus_u_dw
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT nplus_u_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=8.0 l=50u w=50u r=60.6187 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=50u r=60.6187 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=3.0 l=50u w=50u r=60.6187 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=50u r=60.6187 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=50u r=60.6187 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=50u r=60.6187 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=8.0 l=7.6u w=50u r=9.84027 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=3.0 l=7.6u w=50u r=9.84027 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=50u r=9.84027 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=8.0 l=1.6u w=50u r=2.65464 par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=3.0 l=1.6u w=50u r=2.65464 par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=50u r=2.65464 par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=8.0 l=50u w=3.62u r=816.397 par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=3.0 l=50u w=3.62u r=816.397 par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=3.62u r=816.397 par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=8.0 l=7.6u w=3.62u r=132.526 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=3.0 l=7.6u w=3.62u r=132.526 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=3.62u r=132.526 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=8.0 l=1.6u w=3.62u r=35.752 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=3.0 l=1.6u w=3.62u r=35.752 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=3.62u r=35.752 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=8.0 l=50u w=800n r=3.37444K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=800n r=3.37444K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=3.0 l=50u w=800n r=3.37444K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=800n r=3.37444K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=800n r=3.37444K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=50u w=800n r=3.37444K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=8.0 l=7.6u w=800n r=547.775 par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=3.0 l=7.6u w=800n r=547.775 par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=7.6u w=800n r=547.775 par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=8.0 l=1.6u w=800n r=147.775 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=3.0 l=1.6u w=800n r=147.775 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ nplus_u_dw m=1.0 l=1.6u w=800n r=147.775 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! nplus_u_dw m=1.0 
-+ l=2u w=1u r=142.7251 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s_dw.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s_dw.cdl
deleted file mode 100644
index 528cb97..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s_dw.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: npolyf_s_dw
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:31:45 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    npolyf_s_dw
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT npolyf_s_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=8.0 l=50u w=50u r=7.02182 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=50u r=7.02182 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=3.0 l=50u w=50u r=7.02182 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=50u r=7.02182 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=8.0 l=7.6u w=50u r=1.25392 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=3.0 l=7.6u w=50u r=1.25392 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=8.0 l=1.6u w=50u r=437.71m par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=3.0 l=1.6u w=50u r=437.71m par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=8.0 l=50u w=3.62u r=97.3107 par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=3.0 l=50u w=3.62u r=97.3107 par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=8.0 l=7.6u w=3.62u r=17.3773 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=3.0 l=7.6u w=3.62u r=17.3773 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=8.0 l=1.6u w=3.62u r=6.06593 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=3.0 l=1.6u w=3.62u r=6.06593 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=8.0 l=50u w=800n r=445.997 par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=800n r=445.997 par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=3.0 l=50u w=800n r=445.997 par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=800n r=445.997 par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=8.0 l=7.6u w=800n r=79.644 par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=3.0 l=7.6u w=800n r=79.644 par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=8.0 l=1.6u w=800n r=27.8015 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=3.0 l=1.6u w=800n r=27.8015 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s_dw m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! npolyf_s_dw m=1.0 
-+ l=1.6u w=800.0n r=27.8015 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u.cdl
deleted file mode 100644
index 6b1c7fa..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: npolyf_u
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:35:58 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    npolyf_u
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT npolyf_u I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=50u w=50u r=311.93 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=50u r=311.93 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=50u w=50u r=311.93 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=50u r=311.93 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=50u r=311.93 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=50u r=311.93 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=7.6u w=50u r=48.7706 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=7.6u w=50u r=48.7706 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=1.6u w=50u r=11.5312 par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=1.6u w=50u r=11.5312 par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=50u w=3.62u r=4.3678K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=50u w=3.62u r=4.3678K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=7.6u w=3.62u r=682.912 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=7.6u w=3.62u r=682.912 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=1.6u w=3.62u r=161.465 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=1.6u w=3.62u r=161.465 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=50u w=800n r=20.8567K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=800n r=20.8567K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=50u w=800n r=20.8567K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=800n r=20.8567K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=800n r=20.8567K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=50u w=800n r=20.8567K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=7.6u w=800n r=3.26097K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=7.6u w=800n r=3.26097K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=8.0 l=1.6u w=800n r=771.014 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=3.0 l=1.6u w=800n r=771.014 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! npolyf_u m=1.0 
-+ l=1.6u w=800.0n r=771.014 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u_dw.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u_dw.cdl
deleted file mode 100644
index f1000fb..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_u_dw.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: npolyf_u_dw
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:40:44 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    npolyf_u_dw
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT npolyf_u_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=8.0 l=50u w=50u r=311.93 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=50u r=311.93 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=3.0 l=50u w=50u r=311.93 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=50u r=311.93 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=50u r=311.93 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=50u r=311.93 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=8.0 l=7.6u w=50u r=48.7706 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=3.0 l=7.6u w=50u r=48.7706 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=50u r=48.7706 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=8.0 l=1.6u w=50u r=11.5312 par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=3.0 l=1.6u w=50u r=11.5312 par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=50u r=11.5312 par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=8.0 l=50u w=3.62u r=4.3678K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=3.0 l=50u w=3.62u r=4.3678K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=3.62u r=4.3678K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=8.0 l=7.6u w=3.62u r=682.912 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=3.0 l=7.6u w=3.62u r=682.912 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=3.62u r=682.912 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=8.0 l=1.6u w=3.62u r=161.465 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=3.0 l=1.6u w=3.62u r=161.465 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=3.62u r=161.465 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=8.0 l=50u w=800n r=20.8567K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=800n r=20.8567K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=3.0 l=50u w=800n r=20.8567K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=800n r=20.8567K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=800n r=20.8567K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=50u w=800n r=20.8567K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=8.0 l=7.6u w=800n r=3.26097K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=3.0 l=7.6u w=800n r=3.26097K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=7.6u w=800n r=3.26097K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=8.0 l=1.6u w=800n r=771.014 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=3.0 l=1.6u w=800n r=771.014 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_u_dw m=1.0 l=1.6u w=800n r=771.014 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! npolyf_u_dw m=1.0 
-+ l=1.6u w=800.0n r=771.014 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_s.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_s.cdl
deleted file mode 100644
index a0b8ed1..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_s.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: pplus_s
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:51:48 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    pplus_s
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT pplus_s I1_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_R0_MINUS I1_0_0_0_1_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS I1_0_0_1_1_0_R0_PLUS 
-+ I1_0_0_2_0_0_R0_MINUS I1_0_0_2_0_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS 
-+ I1_0_0_2_1_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS I1_0_1_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_R0_MINUS I1_0_1_0_1_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS I1_0_1_1_1_0_R0_PLUS 
-+ I1_0_1_2_0_0_R0_MINUS I1_0_1_2_0_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS 
-+ I1_0_1_2_1_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS I1_0_2_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_R0_MINUS I1_0_2_0_1_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS I1_0_2_1_1_0_R0_PLUS 
-+ I1_0_2_2_0_0_R0_MINUS I1_0_2_2_0_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS 
-+ I1_0_2_2_1_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS I1_1_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_R0_MINUS I1_1_0_0_1_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS I1_1_0_1_1_0_R0_PLUS 
-+ I1_1_0_2_0_0_R0_MINUS I1_1_0_2_0_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS 
-+ I1_1_0_2_1_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS I1_1_1_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_R0_MINUS I1_1_1_0_1_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS I1_1_1_1_1_0_R0_PLUS 
-+ I1_1_1_2_0_0_R0_MINUS I1_1_1_2_0_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS 
-+ I1_1_1_2_1_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS I1_1_2_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_R0_MINUS I1_1_2_0_1_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS I1_1_2_1_1_0_R0_PLUS 
-+ I1_1_2_2_0_0_R0_MINUS I1_1_2_2_0_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS 
-+ I1_1_2_2_1_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS I1_2_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_R0_MINUS I1_2_0_0_1_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS I1_2_0_1_1_0_R0_PLUS 
-+ I1_2_0_2_0_0_R0_MINUS I1_2_0_2_0_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS 
-+ I1_2_0_2_1_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS I1_2_1_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_R0_MINUS I1_2_1_0_1_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS I1_2_1_1_1_0_R0_PLUS 
-+ I1_2_1_2_0_0_R0_MINUS I1_2_1_2_0_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS 
-+ I1_2_1_2_1_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS I1_2_2_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_R0_MINUS I1_2_2_0_1_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS I1_2_2_1_1_0_R0_PLUS 
-+ I1_2_2_2_0_0_R0_MINUS I1_2_2_2_0_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS 
-+ I1_2_2_2_1_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_R0_MINUS:I I1_0_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_R0_MINUS:I I1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_R0_MINUS:I I1_0_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_R0_MINUS:I I1_0_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_R0_MINUS:I I1_0_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_R0_MINUS:I I1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_R0_MINUS:I I1_0_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_R0_MINUS:I I1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_R0_MINUS:I I1_0_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_R0_MINUS:I I1_0_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_R0_MINUS:I I1_0_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_R0_MINUS:I I1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_R0_MINUS:I I1_0_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_R0_MINUS:I I1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_R0_MINUS:I I1_0_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_R0_MINUS:I I1_0_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_R0_MINUS:I I1_0_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_R0_MINUS:I I1_1_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_R0_MINUS:I I1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_R0_MINUS:I I1_1_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_R0_MINUS:I I1_1_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_R0_MINUS:I I1_1_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_R0_MINUS:I I1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_R0_MINUS:I I1_1_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_R0_MINUS:I I1_1_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_R0_MINUS:I I1_1_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_R0_MINUS:I I1_1_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_R0_MINUS:I I1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_R0_MINUS:I I1_1_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_R0_MINUS:I I1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_R0_MINUS:I I1_1_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_R0_MINUS:I I1_1_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_R0_MINUS:I I1_1_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_R0_MINUS:I I1_2_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_R0_MINUS:I I1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_R0_MINUS:I I1_2_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_R0_MINUS:I I1_2_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_R0_MINUS:I I1_2_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_R0_MINUS:I I1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_R0_MINUS:I I1_2_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_R0_MINUS:I I1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_R0_MINUS:I I1_2_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_R0_MINUS:I I1_2_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_R0_MINUS:I I1_2_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_R0_MINUS:I I1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_R0_MINUS:I I1_2_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_R0_MINUS:I I1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_R0_MINUS:I I1_2_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_R0_MINUS:I I1_2_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_R0_MINUS:I I1_2_2_2_1_0_R0_PLUS:I I1_default_MINUS:I 
-*.PININFO I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_R0 I1_2_2_2_1_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=50u w=50u r=7.2455 par=8.0 s=1
-RI1_2_2_2_0_0_R0 I1_2_2_2_0_0_R0_PLUS I1_2_2_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=50u r=7.2455 par=1.0 s=8
-RI1_2_2_1_1_0_R0 I1_2_2_1_1_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=50u w=50u r=7.2455 par=3.0 s=1
-RI1_2_2_1_0_0_R0 I1_2_2_1_0_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=50u r=7.2455 par=1.0 s=3
-RI1_2_2_0_1_0_R0 I1_2_2_0_1_0_R0_PLUS I1_2_2_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=50u r=7.2455 par=1.0 s=1
-RI1_2_2_0_0_0_R0 I1_2_2_0_0_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=50u r=7.2455 par=1.0 s=1
-RI1_2_1_2_1_0_R0 I1_2_1_2_1_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=2.6u w=50u r=622.745m par=8.0 s=1
-RI1_2_1_2_0_0_R0 I1_2_1_2_0_0_R0_PLUS I1_2_1_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=8
-RI1_2_1_1_1_0_R0 I1_2_1_1_1_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=2.6u w=50u r=622.745m par=3.0 s=1
-RI1_2_1_1_0_0_R0 I1_2_1_1_0_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=3
-RI1_2_1_0_1_0_R0 I1_2_1_0_1_0_R0_PLUS I1_2_1_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=1
-RI1_2_1_0_0_0_R0 I1_2_1_0_0_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=1
-RI1_2_0_2_1_0_R0 I1_2_0_2_1_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=840n w=50u r=376.837m par=8.0 s=1
-RI1_2_0_2_0_0_R0 I1_2_0_2_0_0_R0_PLUS I1_2_0_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=50u r=376.837m par=1.0 s=8
-RI1_2_0_1_1_0_R0 I1_2_0_1_1_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=840n w=50u r=376.837m par=3.0 s=1
-RI1_2_0_1_0_0_R0 I1_2_0_1_0_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=50u r=376.837m par=1.0 s=3
-RI1_2_0_0_1_0_R0 I1_2_0_0_1_0_R0_PLUS I1_2_0_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=50u r=376.837m par=1.0 s=1
-RI1_2_0_0_0_0_R0 I1_2_0_0_0_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=50u r=376.837m par=1.0 s=1
-RI1_1_2_2_1_0_R0 I1_1_2_2_1_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=50u w=1.57u r=217.365 par=8.0 s=1
-RI1_1_2_2_0_0_R0 I1_1_2_2_0_0_R0_PLUS I1_1_2_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=8
-RI1_1_2_1_1_0_R0 I1_1_2_1_1_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=50u w=1.57u r=217.365 par=3.0 s=1
-RI1_1_2_1_0_0_R0 I1_1_2_1_0_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=3
-RI1_1_2_0_1_0_R0 I1_1_2_0_1_0_R0_PLUS I1_1_2_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=1
-RI1_1_2_0_0_0_R0 I1_1_2_0_0_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=1
-RI1_1_1_2_1_0_R0 I1_1_1_2_1_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=2.6u w=1.57u r=18.6823 par=8.0 s=1
-RI1_1_1_2_0_0_R0 I1_1_1_2_0_0_R0_PLUS I1_1_1_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=8
-RI1_1_1_1_1_0_R0 I1_1_1_1_1_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=2.6u w=1.57u r=18.6823 par=3.0 s=1
-RI1_1_1_1_0_0_R0 I1_1_1_1_0_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=3
-RI1_1_1_0_1_0_R0 I1_1_1_0_1_0_R0_PLUS I1_1_1_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=1
-RI1_1_1_0_0_0_R0 I1_1_1_0_0_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=1
-RI1_1_0_2_1_0_R0 I1_1_0_2_1_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=840n w=1.57u r=11.3051 par=8.0 s=1
-RI1_1_0_2_0_0_R0 I1_1_0_2_0_0_R0_PLUS I1_1_0_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=8
-RI1_1_0_1_1_0_R0 I1_1_0_1_1_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=840n w=1.57u r=11.3051 par=3.0 s=1
-RI1_1_0_1_0_0_R0 I1_1_0_1_0_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=3
-RI1_1_0_0_1_0_R0 I1_1_0_0_1_0_R0_PLUS I1_1_0_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=1
-RI1_1_0_0_0_0_R0 I1_1_0_0_0_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=1
-RI1_0_2_2_1_0_R0 I1_0_2_2_1_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=50u w=420n r=698.076 par=8.0 s=1
-RI1_0_2_2_0_0_R0 I1_0_2_2_0_0_R0_PLUS I1_0_2_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=420n r=698.076 par=1.0 s=8
-RI1_0_2_1_1_0_R0 I1_0_2_1_1_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=50u w=420n r=698.076 par=3.0 s=1
-RI1_0_2_1_0_0_R0 I1_0_2_1_0_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=420n r=698.076 par=1.0 s=3
-RI1_0_2_0_1_0_R0 I1_0_2_0_1_0_R0_PLUS I1_0_2_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=420n r=698.076 par=1.0 s=1
-RI1_0_2_0_0_0_R0 I1_0_2_0_0_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=50u w=420n r=698.076 par=1.0 s=1
-RI1_0_1_2_1_0_R0 I1_0_1_2_1_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=2.6u w=420n r=59.9991 par=8.0 s=1
-RI1_0_1_2_0_0_R0 I1_0_1_2_0_0_R0_PLUS I1_0_1_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=8
-RI1_0_1_1_1_0_R0 I1_0_1_1_1_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=2.6u w=420n r=59.9991 par=3.0 s=1
-RI1_0_1_1_0_0_R0 I1_0_1_1_0_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=3
-RI1_0_1_0_1_0_R0 I1_0_1_0_1_0_R0_PLUS I1_0_1_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=1
-RI1_0_1_0_0_0_R0 I1_0_1_0_0_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=1
-RI1_0_0_2_1_0_R0 I1_0_0_2_1_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS gnd! 
-+ pplus_s m=8.0 l=840n w=420n r=36.3068 par=8.0 s=1
-RI1_0_0_2_0_0_R0 I1_0_0_2_0_0_R0_PLUS I1_0_0_2_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=420n r=36.3068 par=1.0 s=8
-RI1_0_0_1_1_0_R0 I1_0_0_1_1_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS gnd! 
-+ pplus_s m=3.0 l=840n w=420n r=36.3068 par=3.0 s=1
-RI1_0_0_1_0_0_R0 I1_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=420n r=36.3068 par=1.0 s=3
-RI1_0_0_0_1_0_R0 I1_0_0_0_1_0_R0_PLUS I1_0_0_0_1_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=420n r=36.3068 par=1.0 s=1
-RI1_0_0_0_0_0_R0 I1_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s m=1.0 l=840n w=420n r=36.3068 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! pplus_s m=1.0 
-+ l=840.00n w=420.00n r=36.3067 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_s_dw.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_s_dw.cdl
deleted file mode 100644
index 189dbce..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_s_dw.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: pplus_s_dw
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:52:12 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    pplus_s_dw
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT pplus_s_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=8.0 l=50u w=50u r=7.2455 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=50u r=7.2455 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=3.0 l=50u w=50u r=7.2455 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=50u r=7.2455 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=50u r=7.2455 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=50u r=7.2455 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=8.0 l=2.6u w=50u r=622.745m par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=3.0 l=2.6u w=50u r=622.745m par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=50u r=622.745m par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=8.0 l=840n w=50u r=376.837m par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=50u r=376.837m par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=3.0 l=840n w=50u r=376.837m par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=50u r=376.837m par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=50u r=376.837m par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=50u r=376.837m par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=8.0 l=50u w=1.57u r=217.365 par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=3.0 l=50u w=1.57u r=217.365 par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=1.57u r=217.365 par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=8.0 l=2.6u w=1.57u r=18.6823 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=3.0 l=2.6u w=1.57u r=18.6823 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=1.57u r=18.6823 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=8.0 l=840n w=1.57u r=11.3051 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=3.0 l=840n w=1.57u r=11.3051 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=1.57u r=11.3051 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=8.0 l=50u w=420n r=698.076 par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=420n r=698.076 par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=3.0 l=50u w=420n r=698.076 par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=420n r=698.076 par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=420n r=698.076 par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=50u w=420n r=698.076 par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=8.0 l=2.6u w=420n r=59.9991 par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=3.0 l=2.6u w=420n r=59.9991 par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=2.6u w=420n r=59.9991 par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=8.0 l=840n w=420n r=36.3068 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=420n r=36.3068 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=3.0 l=840n w=420n r=36.3068 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=420n r=36.3068 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=420n r=36.3068 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ pplus_s_dw m=1.0 l=840n w=420n r=36.3068 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! pplus_s_dw m=1.0 
-+ l=840.00n w=420.00n r=36.3067 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_u.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_u.cdl
deleted file mode 100644
index 4b2a332..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_u.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: pplus_u
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:54:02 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    pplus_u
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT pplus_u I1_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_R0_MINUS I1_0_0_0_1_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS I1_0_0_1_1_0_R0_PLUS 
-+ I1_0_0_2_0_0_R0_MINUS I1_0_0_2_0_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS 
-+ I1_0_0_2_1_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS I1_0_1_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_R0_MINUS I1_0_1_0_1_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS I1_0_1_1_1_0_R0_PLUS 
-+ I1_0_1_2_0_0_R0_MINUS I1_0_1_2_0_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS 
-+ I1_0_1_2_1_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS I1_0_2_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_R0_MINUS I1_0_2_0_1_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS I1_0_2_1_1_0_R0_PLUS 
-+ I1_0_2_2_0_0_R0_MINUS I1_0_2_2_0_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS 
-+ I1_0_2_2_1_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS I1_1_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_R0_MINUS I1_1_0_0_1_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS I1_1_0_1_1_0_R0_PLUS 
-+ I1_1_0_2_0_0_R0_MINUS I1_1_0_2_0_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS 
-+ I1_1_0_2_1_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS I1_1_1_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_R0_MINUS I1_1_1_0_1_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS I1_1_1_1_1_0_R0_PLUS 
-+ I1_1_1_2_0_0_R0_MINUS I1_1_1_2_0_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS 
-+ I1_1_1_2_1_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS I1_1_2_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_R0_MINUS I1_1_2_0_1_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS I1_1_2_1_1_0_R0_PLUS 
-+ I1_1_2_2_0_0_R0_MINUS I1_1_2_2_0_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS 
-+ I1_1_2_2_1_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS I1_2_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_R0_MINUS I1_2_0_0_1_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS I1_2_0_1_1_0_R0_PLUS 
-+ I1_2_0_2_0_0_R0_MINUS I1_2_0_2_0_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS 
-+ I1_2_0_2_1_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS I1_2_1_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_R0_MINUS I1_2_1_0_1_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS I1_2_1_1_1_0_R0_PLUS 
-+ I1_2_1_2_0_0_R0_MINUS I1_2_1_2_0_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS 
-+ I1_2_1_2_1_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS I1_2_2_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_R0_MINUS I1_2_2_0_1_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS I1_2_2_1_1_0_R0_PLUS 
-+ I1_2_2_2_0_0_R0_MINUS I1_2_2_2_0_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS 
-+ I1_2_2_2_1_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_R0_MINUS:I I1_0_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_R0_MINUS:I I1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_R0_MINUS:I I1_0_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_R0_MINUS:I I1_0_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_R0_MINUS:I I1_0_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_R0_MINUS:I I1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_R0_MINUS:I I1_0_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_R0_MINUS:I I1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_R0_MINUS:I I1_0_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_R0_MINUS:I I1_0_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_R0_MINUS:I I1_0_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_R0_MINUS:I I1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_R0_MINUS:I I1_0_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_R0_MINUS:I I1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_R0_MINUS:I I1_0_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_R0_MINUS:I I1_0_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_R0_MINUS:I I1_0_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_R0_MINUS:I I1_1_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_R0_MINUS:I I1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_R0_MINUS:I I1_1_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_R0_MINUS:I I1_1_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_R0_MINUS:I I1_1_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_R0_MINUS:I I1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_R0_MINUS:I I1_1_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_R0_MINUS:I I1_1_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_R0_MINUS:I I1_1_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_R0_MINUS:I I1_1_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_R0_MINUS:I I1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_R0_MINUS:I I1_1_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_R0_MINUS:I I1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_R0_MINUS:I I1_1_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_R0_MINUS:I I1_1_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_R0_MINUS:I I1_1_2_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_R0_MINUS:I I1_2_0_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_R0_MINUS:I I1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_R0_MINUS:I I1_2_0_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_R0_MINUS:I I1_2_0_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_R0_MINUS:I I1_2_0_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_R0_MINUS:I I1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_R0_MINUS:I I1_2_1_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_R0_MINUS:I I1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_R0_MINUS:I I1_2_1_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_R0_MINUS:I I1_2_1_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_R0_MINUS:I I1_2_1_2_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_R0_MINUS:I I1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_R0_MINUS:I I1_2_2_0_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_R0_MINUS:I I1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_R0_MINUS:I I1_2_2_1_1_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_R0_MINUS:I I1_2_2_2_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_R0_MINUS:I I1_2_2_2_1_0_R0_PLUS:I I1_default_MINUS:I 
-*.PININFO I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_R0 I1_2_2_2_1_0_R0_PLUS I1_2_2_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=50u w=50u r=187.206 par=8.0 s=1
-RI1_2_2_2_0_0_R0 I1_2_2_2_0_0_R0_PLUS I1_2_2_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=50u r=187.206 par=1.0 s=8
-RI1_2_2_1_1_0_R0 I1_2_2_1_1_0_R0_PLUS I1_2_2_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=50u w=50u r=187.206 par=3.0 s=1
-RI1_2_2_1_0_0_R0 I1_2_2_1_0_0_R0_PLUS I1_2_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=50u r=187.206 par=1.0 s=3
-RI1_2_2_0_1_0_R0 I1_2_2_0_1_0_R0_PLUS I1_2_2_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=50u r=187.206 par=1.0 s=1
-RI1_2_2_0_0_0_R0 I1_2_2_0_0_0_R0_PLUS I1_2_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=50u r=187.206 par=1.0 s=1
-RI1_2_1_2_1_0_R0 I1_2_1_2_1_0_R0_PLUS I1_2_1_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=7.6u w=50u r=30.1528 par=8.0 s=1
-RI1_2_1_2_0_0_R0 I1_2_1_2_0_0_R0_PLUS I1_2_1_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=8
-RI1_2_1_1_1_0_R0 I1_2_1_1_1_0_R0_PLUS I1_2_1_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=7.6u w=50u r=30.1528 par=3.0 s=1
-RI1_2_1_1_0_0_R0 I1_2_1_1_0_0_R0_PLUS I1_2_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=3
-RI1_2_1_0_1_0_R0 I1_2_1_0_1_0_R0_PLUS I1_2_1_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=1
-RI1_2_1_0_0_0_R0 I1_2_1_0_0_0_R0_PLUS I1_2_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=1
-RI1_2_0_2_1_0_R0 I1_2_0_2_1_0_R0_PLUS I1_2_0_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=1.6u w=50u r=7.92835 par=8.0 s=1
-RI1_2_0_2_0_0_R0 I1_2_0_2_0_0_R0_PLUS I1_2_0_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=8
-RI1_2_0_1_1_0_R0 I1_2_0_1_1_0_R0_PLUS I1_2_0_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=1.6u w=50u r=7.92835 par=3.0 s=1
-RI1_2_0_1_0_0_R0 I1_2_0_1_0_0_R0_PLUS I1_2_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=3
-RI1_2_0_0_1_0_R0 I1_2_0_0_1_0_R0_PLUS I1_2_0_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=1
-RI1_2_0_0_0_0_R0 I1_2_0_0_0_0_R0_PLUS I1_2_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=1
-RI1_1_2_2_1_0_R0 I1_1_2_2_1_0_R0_PLUS I1_1_2_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=50u w=3.62u r=2.62272K par=8.0 s=1
-RI1_1_2_2_0_0_R0 I1_1_2_2_0_0_R0_PLUS I1_1_2_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=8
-RI1_1_2_1_1_0_R0 I1_1_2_1_1_0_R0_PLUS I1_1_2_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=50u w=3.62u r=2.62272K par=3.0 s=1
-RI1_1_2_1_0_0_R0 I1_1_2_1_0_0_R0_PLUS I1_1_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=3
-RI1_1_2_0_1_0_R0 I1_1_2_0_1_0_R0_PLUS I1_1_2_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=1
-RI1_1_2_0_0_0_R0 I1_1_2_0_0_0_R0_PLUS I1_1_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=1
-RI1_1_1_2_1_0_R0 I1_1_1_2_1_0_R0_PLUS I1_1_1_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=7.6u w=3.62u r=422.435 par=8.0 s=1
-RI1_1_1_2_0_0_R0 I1_1_1_2_0_0_R0_PLUS I1_1_1_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=8
-RI1_1_1_1_1_0_R0 I1_1_1_1_1_0_R0_PLUS I1_1_1_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=7.6u w=3.62u r=422.435 par=3.0 s=1
-RI1_1_1_1_0_0_R0 I1_1_1_1_0_0_R0_PLUS I1_1_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=3
-RI1_1_1_0_1_0_R0 I1_1_1_0_1_0_R0_PLUS I1_1_1_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=1
-RI1_1_1_0_0_0_R0 I1_1_1_0_0_0_R0_PLUS I1_1_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=1
-RI1_1_0_2_1_0_R0 I1_1_0_2_1_0_R0_PLUS I1_1_0_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=1.6u w=3.62u r=111.075 par=8.0 s=1
-RI1_1_0_2_0_0_R0 I1_1_0_2_0_0_R0_PLUS I1_1_0_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=8
-RI1_1_0_1_1_0_R0 I1_1_0_1_1_0_R0_PLUS I1_1_0_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=1.6u w=3.62u r=111.075 par=3.0 s=1
-RI1_1_0_1_0_0_R0 I1_1_0_1_0_0_R0_PLUS I1_1_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=3
-RI1_1_0_0_1_0_R0 I1_1_0_0_1_0_R0_PLUS I1_1_0_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=1
-RI1_1_0_0_0_0_R0 I1_1_0_0_0_0_R0_PLUS I1_1_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=1
-RI1_0_2_2_1_0_R0 I1_0_2_2_1_0_R0_PLUS I1_0_2_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=50u w=800n r=12.5503K par=8.0 s=1
-RI1_0_2_2_0_0_R0 I1_0_2_2_0_0_R0_PLUS I1_0_2_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=800n r=12.5503K par=1.0 s=8
-RI1_0_2_1_1_0_R0 I1_0_2_1_1_0_R0_PLUS I1_0_2_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=50u w=800n r=12.5503K par=3.0 s=1
-RI1_0_2_1_0_0_R0 I1_0_2_1_0_0_R0_PLUS I1_0_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=800n r=12.5503K par=1.0 s=3
-RI1_0_2_0_1_0_R0 I1_0_2_0_1_0_R0_PLUS I1_0_2_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=800n r=12.5503K par=1.0 s=1
-RI1_0_2_0_0_0_R0 I1_0_2_0_0_0_R0_PLUS I1_0_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=50u w=800n r=12.5503K par=1.0 s=1
-RI1_0_1_2_1_0_R0 I1_0_1_2_1_0_R0_PLUS I1_0_1_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=7.6u w=800n r=2.02145K par=8.0 s=1
-RI1_0_1_2_0_0_R0 I1_0_1_2_0_0_R0_PLUS I1_0_1_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=8
-RI1_0_1_1_1_0_R0 I1_0_1_1_1_0_R0_PLUS I1_0_1_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=7.6u w=800n r=2.02145K par=3.0 s=1
-RI1_0_1_1_0_0_R0 I1_0_1_1_0_0_R0_PLUS I1_0_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=3
-RI1_0_1_0_1_0_R0 I1_0_1_0_1_0_R0_PLUS I1_0_1_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=1
-RI1_0_1_0_0_0_R0 I1_0_1_0_0_0_R0_PLUS I1_0_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=1
-RI1_0_0_2_1_0_R0 I1_0_0_2_1_0_R0_PLUS I1_0_0_2_1_0_R0_MINUS gnd! 
-+ pplus_u m=8.0 l=1.6u w=800n r=531.519 par=8.0 s=1
-RI1_0_0_2_0_0_R0 I1_0_0_2_0_0_R0_PLUS I1_0_0_2_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=8
-RI1_0_0_1_1_0_R0 I1_0_0_1_1_0_R0_PLUS I1_0_0_1_1_0_R0_MINUS gnd! 
-+ pplus_u m=3.0 l=1.6u w=800n r=531.519 par=3.0 s=1
-RI1_0_0_1_0_0_R0 I1_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=3
-RI1_0_0_0_1_0_R0 I1_0_0_0_1_0_R0_PLUS I1_0_0_0_1_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=1
-RI1_0_0_0_0_0_R0 I1_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! pplus_u m=1.0 l=2u 
-+ w=1u r=497.3349 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_u_dw.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_u_dw.cdl
deleted file mode 100644
index 2fbec64..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pplus_u_dw.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: pplus_u_dw
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:54:28 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    pplus_u_dw
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT pplus_u_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=8.0 l=50u w=50u r=187.206 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=50u r=187.206 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=3.0 l=50u w=50u r=187.206 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=50u r=187.206 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=50u r=187.206 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=50u r=187.206 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=8.0 l=7.6u w=50u r=30.1528 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=3.0 l=7.6u w=50u r=30.1528 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=50u r=30.1528 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=8.0 l=1.6u w=50u r=7.92835 par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=3.0 l=1.6u w=50u r=7.92835 par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=50u r=7.92835 par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=8.0 l=50u w=3.62u r=2.62272K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=3.0 l=50u w=3.62u r=2.62272K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=3.62u r=2.62272K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=8.0 l=7.6u w=3.62u r=422.435 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=3.0 l=7.6u w=3.62u r=422.435 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=3.62u r=422.435 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=8.0 l=1.6u w=3.62u r=111.075 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=3.0 l=1.6u w=3.62u r=111.075 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=3.62u r=111.075 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=8.0 l=50u w=800n r=12.5503K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=800n r=12.5503K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=3.0 l=50u w=800n r=12.5503K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=800n r=12.5503K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=800n r=12.5503K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=50u w=800n r=12.5503K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=8.0 l=7.6u w=800n r=2.02145K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=3.0 l=7.6u w=800n r=2.02145K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=7.6u w=800n r=2.02145K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=8.0 l=1.6u w=800n r=531.519 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=3.0 l=1.6u w=800n r=531.519 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ pplus_u_dw m=1.0 l=1.6u w=800n r=531.519 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! pplus_u_dw m=1.0 
-+ l=2u w=1u r=497.3349 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s.cdl
deleted file mode 100644
index 94ea8c3..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_s
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:58:06 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_s
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_s I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=50u w=50u r=7.50221 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=50u w=50u r=7.50221 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=7.6u w=50u r=1.30995 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=7.6u w=50u r=1.30995 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=1.6u w=50u r=433.686m par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=1.6u w=50u r=433.686m par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=50u w=3.62u r=104.022 par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=50u w=3.62u r=104.022 par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=7.6u w=3.62u r=18.1631 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=7.6u w=3.62u r=18.1631 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=1.6u w=3.62u r=6.01326 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=1.6u w=3.62u r=6.01326 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=50u w=800n r=477.704 par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=50u w=800n r=477.704 par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=7.6u w=800n r=83.4112 par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=7.6u w=800n r=83.4112 par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=8.0 l=1.6u w=800n r=27.615 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=3.0 l=1.6u w=800n r=27.615 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_s m=1.0 
-+ l=1.6u w=800.0n r=27.615 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s_dw.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s_dw.cdl
deleted file mode 100644
index abab827..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_s_dw.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_s_dw
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:58:45 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_s_dw
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_s_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=8.0 l=50u w=50u r=7.50221 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=50u r=7.50221 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=3.0 l=50u w=50u r=7.50221 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=50u r=7.50221 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=8.0 l=7.6u w=50u r=1.30995 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=3.0 l=7.6u w=50u r=1.30995 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=8.0 l=1.6u w=50u r=433.686m par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=3.0 l=1.6u w=50u r=433.686m par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=8.0 l=50u w=3.62u r=104.022 par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=3.0 l=50u w=3.62u r=104.022 par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=8.0 l=7.6u w=3.62u r=18.1631 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=3.0 l=7.6u w=3.62u r=18.1631 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=8.0 l=1.6u w=3.62u r=6.01326 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=3.0 l=1.6u w=3.62u r=6.01326 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=8.0 l=50u w=800n r=477.704 par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=800n r=477.704 par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=3.0 l=50u w=800n r=477.704 par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=800n r=477.704 par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=8.0 l=7.6u w=800n r=83.4112 par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=3.0 l=7.6u w=800n r=83.4112 par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=8.0 l=1.6u w=800n r=27.615 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=3.0 l=1.6u w=800n r=27.615 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_s_dw m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_s_dw m=1.0 
-+ l=1.6u w=800.0n r=27.615 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u.cdl
deleted file mode 100644
index 05fbcf8..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u
-* View Name:     schematic
-* Netlisted on:  Nov 24 10:02:18 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_u
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_u I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=50u w=50u r=352.76 par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=50u r=352.76 par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=50u w=50u r=352.76 par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=50u r=352.76 par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=7.6u w=50u r=55.6565 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=7.6u w=50u r=55.6565 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=1.6u w=50u r=13.6136 par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=1.6u w=50u r=13.6136 par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=50u w=3.62u r=4.93695K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=50u w=3.62u r=4.93695K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=7.6u w=3.62u r=778.926 par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=7.6u w=3.62u r=778.926 par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=1.6u w=3.62u r=190.526 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=1.6u w=3.62u r=190.526 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=50u w=800n r=23.5247K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=800n r=23.5247K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=50u w=800n r=23.5247K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=800n r=23.5247K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=7.6u w=800n r=3.7116K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=7.6u w=800n r=3.7116K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=8.0 l=1.6u w=800n r=907.858 par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=3.0 l=1.6u w=800n r=907.858 par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u m=1.0 
-+ l=1.6u w=800.0n r=907.8585 par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_1k.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_1k.cdl
deleted file mode 100644
index 9ab2d9a..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_1k.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u_1k
-* View Name:     schematic
-* Netlisted on:  Nov 24 10:10:13 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_u_1k
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_u_1k I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=50u w=3.62u r=13.9736K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=50u w=3.62u r=13.9736K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=7.6u w=3.62u r=2.16433K par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=7.6u w=3.62u r=2.16433K par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=7.24u w=3.62u r=2.06407K par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=7.24u w=3.62u r=2.06407K par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=50u w=1u r=51.7012K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=50u w=1u r=51.7012K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=50u w=1u r=51.7012K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=7.6u w=1u r=8.00786K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=7.6u w=1u r=8.00786K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=8.0 l=2u w=1u r=2.23704K par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=3.0 l=2u w=1u r=2.23704K par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k m=1.0 l=2u w=1u r=2.23704K par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u_1k m=1.0 
-+ l=2u w=1u r=2.2370394K par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_1k_dw.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_1k_dw.cdl
deleted file mode 100644
index 3c33289..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_1k_dw.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u_1k_dw
-* View Name:     schematic
-* Netlisted on:  Nov 24 12:27:24 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_u_1k_dw
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_u_1k_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=8.0 l=100u w=50u r=2.0046K par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=3.0 l=100u w=50u r=2.0046K par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=100u w=50u r=2.0046K par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=8.0 l=50u w=3.62u r=13.9736K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=3.0 l=50u w=3.62u r=13.9736K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=50u w=3.62u r=13.9736K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=8.0 l=7.6u w=3.62u r=2.16433K par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=3.0 l=7.6u w=3.62u r=2.16433K par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.6u w=3.62u r=2.16433K par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=8.0 l=7.24u w=3.62u r=2.06407K par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=3.0 l=7.24u w=3.62u r=2.06407K par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.24u w=3.62u r=2.06407K par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=8.0 l=50u w=1u r=51.7012K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=50u w=1u r=51.7012K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=3.0 l=50u w=1u r=51.7012K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=50u w=1u r=51.7012K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=50u w=1u r=51.7012K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=50u w=1u r=51.7012K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=8.0 l=7.6u w=1u r=8.00786K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=3.0 l=7.6u w=1u r=8.00786K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=7.6u w=1u r=8.00786K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=8.0 l=2u w=1u r=2.23704K par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=2u w=1u r=2.23704K par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=3.0 l=2u w=1u r=2.23704K par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=2u w=1u r=2.23704K par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=2u w=1u r=2.23704K par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_1k_dw m=1.0 l=2u w=1u r=2.23704K par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u_1k_dw m=1.0 
-+ l=2u w=1u r=2.2370394K par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_2k.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_2k.cdl
deleted file mode 100644
index 1aca933..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_2k.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u_2k
-* View Name:     schematic
-* Netlisted on:  Nov 24 11:44:28 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_u_2k
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_u_2k I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=100u w=50u r=4.0124K par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=100u w=50u r=4.0124K par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=100u w=50u r=4.0124K par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=100u w=50u r=4.0124K par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=100u w=50u r=4.0124K par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=100u w=50u r=4.0124K par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=50u w=3.62u r=28.0958K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=3.62u r=28.0958K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=50u w=3.62u r=28.0958K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=3.62u r=28.0958K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=3.62u r=28.0958K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=3.62u r=28.0958K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=7.6u w=3.62u r=4.37473K par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=3.62u r=4.37473K par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=7.6u w=3.62u r=4.37473K par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=3.62u r=4.37473K par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=3.62u r=4.37473K par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=3.62u r=4.37473K par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=7.24u w=3.62u r=4.17332K par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.24u w=3.62u r=4.17332K par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=7.24u w=3.62u r=4.17332K par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.24u w=3.62u r=4.17332K par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.24u w=3.62u r=4.17332K par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.24u w=3.62u r=4.17332K par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=50u w=1u r=105.185K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=1u r=105.185K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=50u w=1u r=105.185K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=1u r=105.185K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=1u r=105.185K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=50u w=1u r=105.185K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=7.6u w=1u r=16.3781K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=1u r=16.3781K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=7.6u w=1u r=16.3781K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=1u r=16.3781K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=1u r=16.3781K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=7.6u w=1u r=16.3781K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=8.0 l=2u w=1u r=4.64888K par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=2u w=1u r=4.64888K par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=3.0 l=2u w=1u r=4.64888K par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=2u w=1u r=4.64888K par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=2u w=1u r=4.64888K par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k m=1.0 l=2u w=1u r=4.64888K par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u_2k m=1.0 
-+ l=2u w=1u r=4.6488773K par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_2k_dw.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_2k_dw.cdl
deleted file mode 100644
index e08fea5..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_2k_dw.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u_2k_dw
-* View Name:     schematic
-* Netlisted on:  Nov 24 11:48:25 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_u_2k_dw
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_u_2k_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=8.0 l=100u w=50u r=4.0124K par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=3.0 l=100u w=50u r=4.0124K par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=8.0 l=100u w=50u r=4.0124K par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=3.0 l=100u w=50u r=4.0124K par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=8.0 l=100u w=50u r=4.0124K par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=3.0 l=100u w=50u r=4.0124K par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=100u w=50u r=4.0124K par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=8.0 l=50u w=3.62u r=28.0958K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=50u w=3.62u r=28.0958K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=3.0 l=50u w=3.62u r=28.0958K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=50u w=3.62u r=28.0958K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=50u w=3.62u r=28.0958K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=50u w=3.62u r=28.0958K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=8.0 l=7.6u w=3.62u r=4.37473K par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.6u w=3.62u r=4.37473K par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=3.0 l=7.6u w=3.62u r=4.37473K par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.6u w=3.62u r=4.37473K par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.6u w=3.62u r=4.37473K par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.6u w=3.62u r=4.37473K par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=8.0 l=7.24u w=3.62u r=4.17332K par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.24u w=3.62u r=4.17332K par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=3.0 l=7.24u w=3.62u r=4.17332K par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.24u w=3.62u r=4.17332K par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.24u w=3.62u r=4.17332K par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.24u w=3.62u r=4.17332K par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=8.0 l=50u w=1u r=105.185K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=50u w=1u r=105.185K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=3.0 l=50u w=1u r=105.185K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=50u w=1u r=105.185K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=50u w=1u r=105.185K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=50u w=1u r=105.185K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=8.0 l=7.6u w=1u r=16.3781K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.6u w=1u r=16.3781K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=3.0 l=7.6u w=1u r=16.3781K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.6u w=1u r=16.3781K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.6u w=1u r=16.3781K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=7.6u w=1u r=16.3781K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=8.0 l=2u w=1u r=4.64888K par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=2u w=1u r=4.64888K par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=3.0 l=2u w=1u r=4.64888K par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=2u w=1u r=4.64888K par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=2u w=1u r=4.64888K par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_2k_dw m=1.0 l=2u w=1u r=4.64888K par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u_2k_dw m=1.0 
-+ l=2u w=1u r=4.6488773K par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_fhr_16p0_lv.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_fhr_16p0_lv.cdl
deleted file mode 100644
index b977cd1..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_fhr_16p0_lv.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u_fhr_16p0_lv
-* View Name:     schematic
-* Netlisted on:  Nov 24 10:10:13 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_u_fhr_16p0_lv
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_u_fhr_16p0_lv I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=8.0 l=100u w=50u  par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=3.0 l=100u w=50u  par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=8.0 l=100u w=50u  par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=3.0 l=100u w=50u  par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=8.0 l=100u w=50u  par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=3.0 l=100u w=50u  par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=8.0 l=50u w=3.62u  par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=50u w=3.62u  par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=3.0 l=50u w=3.62u  par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=50u w=3.62u  par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=50u w=3.62u  par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=50u w=3.62u  par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=8.0 l=7.6u w=3.62u  par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.6u w=3.62u  par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=3.0 l=7.6u w=3.62u  par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.6u w=3.62u  par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.6u w=3.62u  par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.6u w=3.62u  par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=8.0 l=7.24u w=3.62u  par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.24u w=3.62u  par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=3.0 l=7.24u w=3.62u  par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.24u w=3.62u  par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.24u w=3.62u  par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.24u w=3.62u  par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=8.0 l=50u w=1u  par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=50u w=1u  par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=3.0 l=50u w=1u  par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=50u w=1u  par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=50u w=1u  par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=50u w=1u  par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=8.0 l=7.6u w=1u  par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.6u w=1u  par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=3.0 l=7.6u w=1u  par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.6u w=1u  par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.6u w=1u  par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=7.6u w=1u  par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=8.0 l=2u w=1u  par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=2u w=1u  par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=3.0 l=2u w=1u  par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=2u w=1u  par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=2u w=1u  par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv m=1.0 l=2u w=1u  par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u_fhr_16p0_lv m=1.0 
-+ l=2u w=1u par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_fhr_16p0_lv_dw.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_fhr_16p0_lv_dw.cdl
deleted file mode 100644
index efab9f4..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/ppolyf_u_fhr_16p0_lv_dw.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: ppolyf_u_fhr_16p0_lv_dw
-* View Name:     schematic
-* Netlisted on:  Nov 24 10:10:13 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    ppolyf_u_fhr_16p0_lv_dw
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT ppolyf_u_fhr_16p0_lv_dw I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=8.0 l=100u w=50u  par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=3.0 l=100u w=50u  par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=8.0 l=100u w=50u  par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=3.0 l=100u w=50u  par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=8.0 l=100u w=50u  par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=3.0 l=100u w=50u  par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=100u w=50u  par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=8.0 l=50u w=3.62u  par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=50u w=3.62u  par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=3.0 l=50u w=3.62u  par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=50u w=3.62u  par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=50u w=3.62u  par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=50u w=3.62u  par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=8.0 l=7.6u w=3.62u  par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.6u w=3.62u  par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=3.0 l=7.6u w=3.62u  par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.6u w=3.62u  par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.6u w=3.62u  par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.6u w=3.62u  par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=8.0 l=7.24u w=3.62u  par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.24u w=3.62u  par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=3.0 l=7.24u w=3.62u  par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.24u w=3.62u  par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.24u w=3.62u  par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.24u w=3.62u  par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=8.0 l=50u w=1u  par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=50u w=1u  par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=3.0 l=50u w=1u  par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=50u w=1u  par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=50u w=1u  par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=50u w=1u  par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=8.0 l=7.6u w=1u  par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.6u w=1u  par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=3.0 l=7.6u w=1u  par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.6u w=1u  par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.6u w=1u  par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=7.6u w=1u  par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=8.0 l=2u w=1u  par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=2u w=1u  par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=3.0 l=2u w=1u  par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=2u w=1u  par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=2u w=1u  par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ ppolyf_u_fhr_16p0_lv_dw m=1.0 l=2u w=1u  par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! ppolyf_u_fhr_16p0_lv_dw m=1.0 
-+ l=2u w=1u par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pwell.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pwell.cdl
deleted file mode 100644
index 5ecec85..0000000
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/pwell.cdl
+++ /dev/null
@@ -1,234 +0,0 @@
-************************************************************************
-* auCdl Netlist:
-* 
-* Library Name:  TCG_Library
-* Top Cell Name: pwell
-* View Name:     schematic
-* Netlisted on:  Nov 24 09:41:48 2021
-************************************************************************
-
-*.BIPOLAR
-*.RESI = 2000 
-*.RESVAL
-*.CAPVAL
-*.DIOPERI
-*.DIOAREA
-*.EQUATION
-*.SCALE METER
-*.MEGA
-.PARAM
-
-*.GLOBAL gnd!
-
-*.PIN gnd!
-
-************************************************************************
-* Library Name: TCG_Library
-* Cell Name:    pwell
-* View Name:    schematic
-************************************************************************
-
-.SUBCKT pwell I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
-+ I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
-+ I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
-+ I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
-+ I1_0_0_2_1_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS I1_0_1_0_0_0_0_R0_PLUS 
-+ I1_0_1_0_1_0_0_R0_MINUS I1_0_1_0_1_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS 
-+ I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS I1_0_1_1_1_0_0_R0_PLUS 
-+ I1_0_1_2_0_0_0_R0_MINUS I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS 
-+ I1_0_1_2_1_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS I1_0_2_0_0_0_0_R0_PLUS 
-+ I1_0_2_0_1_0_0_R0_MINUS I1_0_2_0_1_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS 
-+ I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS I1_0_2_1_1_0_0_R0_PLUS 
-+ I1_0_2_2_0_0_0_R0_MINUS I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS 
-+ I1_0_2_2_1_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS I1_1_0_0_0_0_0_R0_PLUS 
-+ I1_1_0_0_1_0_0_R0_MINUS I1_1_0_0_1_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS 
-+ I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS I1_1_0_1_1_0_0_R0_PLUS 
-+ I1_1_0_2_0_0_0_R0_MINUS I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS 
-+ I1_1_0_2_1_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS I1_1_1_0_0_0_0_R0_PLUS 
-+ I1_1_1_0_1_0_0_R0_MINUS I1_1_1_0_1_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS 
-+ I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS I1_1_1_1_1_0_0_R0_PLUS 
-+ I1_1_1_2_0_0_0_R0_MINUS I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS 
-+ I1_1_1_2_1_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS I1_1_2_0_0_0_0_R0_PLUS 
-+ I1_1_2_0_1_0_0_R0_MINUS I1_1_2_0_1_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS 
-+ I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS I1_1_2_1_1_0_0_R0_PLUS 
-+ I1_1_2_2_0_0_0_R0_MINUS I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS 
-+ I1_1_2_2_1_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS I1_2_0_0_0_0_0_R0_PLUS 
-+ I1_2_0_0_1_0_0_R0_MINUS I1_2_0_0_1_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS 
-+ I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS I1_2_0_1_1_0_0_R0_PLUS 
-+ I1_2_0_2_0_0_0_R0_MINUS I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS 
-+ I1_2_0_2_1_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS I1_2_1_0_0_0_0_R0_PLUS 
-+ I1_2_1_0_1_0_0_R0_MINUS I1_2_1_0_1_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS 
-+ I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS I1_2_1_1_1_0_0_R0_PLUS 
-+ I1_2_1_2_0_0_0_R0_MINUS I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS 
-+ I1_2_1_2_1_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS I1_2_2_0_0_0_0_R0_PLUS 
-+ I1_2_2_0_1_0_0_R0_MINUS I1_2_2_0_1_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS 
-+ I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS I1_2_2_1_1_0_0_R0_PLUS 
-+ I1_2_2_2_0_0_0_R0_MINUS I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS 
-+ I1_2_2_2_1_0_0_R0_PLUS I1_default_MINUS I1_default_PLUS gnd!
-*.PININFO I1_0_0_0_0_0_0_R0_MINUS:I I1_0_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_0_1_0_0_R0_MINUS:I I1_0_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_0_0_0_R0_MINUS:I I1_0_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_1_1_0_0_R0_MINUS:I I1_0_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_0_0_0_R0_MINUS:I I1_0_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_0_2_1_0_0_R0_MINUS:I I1_0_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_0_0_0_R0_MINUS:I I1_0_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_0_1_0_0_R0_MINUS:I I1_0_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_0_0_0_R0_MINUS:I I1_0_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_1_1_0_0_R0_MINUS:I I1_0_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_0_0_0_R0_MINUS:I I1_0_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_1_2_1_0_0_R0_MINUS:I I1_0_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_0_0_0_R0_MINUS:I I1_0_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_0_1_0_0_R0_MINUS:I I1_0_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_0_0_0_R0_MINUS:I I1_0_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_1_1_0_0_R0_MINUS:I I1_0_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_0_0_0_R0_MINUS:I I1_0_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_0_2_2_1_0_0_R0_MINUS:I I1_0_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_0_0_0_R0_MINUS:I I1_1_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_0_1_0_0_R0_MINUS:I I1_1_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_0_0_0_R0_MINUS:I I1_1_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_1_1_0_0_R0_MINUS:I I1_1_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_0_0_0_R0_MINUS:I I1_1_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_0_2_1_0_0_R0_MINUS:I I1_1_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_0_0_0_R0_MINUS:I I1_1_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_0_1_0_0_R0_MINUS:I I1_1_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_0_0_0_R0_MINUS:I I1_1_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_1_1_0_0_R0_MINUS:I I1_1_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_0_0_0_R0_MINUS:I I1_1_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_1_2_1_0_0_R0_MINUS:I I1_1_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_0_0_0_R0_MINUS:I I1_1_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_0_1_0_0_R0_MINUS:I I1_1_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_0_0_0_R0_MINUS:I I1_1_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_1_1_0_0_R0_MINUS:I I1_1_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_0_0_0_R0_MINUS:I I1_1_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_1_2_2_1_0_0_R0_MINUS:I I1_1_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_0_0_0_R0_MINUS:I I1_2_0_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_0_1_0_0_R0_MINUS:I I1_2_0_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_0_0_0_R0_MINUS:I I1_2_0_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_1_1_0_0_R0_MINUS:I I1_2_0_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_0_0_0_R0_MINUS:I I1_2_0_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_0_2_1_0_0_R0_MINUS:I I1_2_0_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_0_0_0_R0_MINUS:I I1_2_1_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_0_1_0_0_R0_MINUS:I I1_2_1_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_0_0_0_R0_MINUS:I I1_2_1_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_1_1_0_0_R0_MINUS:I I1_2_1_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_0_0_0_R0_MINUS:I I1_2_1_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_1_2_1_0_0_R0_MINUS:I I1_2_1_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_0_0_0_R0_MINUS:I I1_2_2_0_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_0_1_0_0_R0_MINUS:I I1_2_2_0_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_0_0_0_R0_MINUS:I I1_2_2_1_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_1_1_0_0_R0_MINUS:I I1_2_2_1_1_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_0_0_0_R0_MINUS:I I1_2_2_2_0_0_0_R0_PLUS:I 
-*.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
-*.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
-RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ pwell m=8.0 l=50u w=50u r=1.01864K par=8.0 s=1
-RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=50u r=1.01864K par=1.0 s=8
-RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ pwell m=3.0 l=50u w=50u r=1.01864K par=3.0 s=1
-RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=50u r=1.01864K par=1.0 s=3
-RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=50u r=1.01864K par=1.0 s=1
-RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=50u r=1.01864K par=1.0 s=1
-RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ pwell m=8.0 l=11.61u w=50u r=243.958 par=8.0 s=1
-RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=50u r=243.958 par=1.0 s=8
-RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ pwell m=3.0 l=11.61u w=50u r=243.958 par=3.0 s=1
-RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=50u r=243.958 par=1.0 s=3
-RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=50u r=243.958 par=1.0 s=1
-RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=50u r=243.958 par=1.0 s=1
-RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ pwell m=8.0 l=4u w=50u r=90.3947 par=8.0 s=1
-RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=50u r=90.3947 par=1.0 s=8
-RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ pwell m=3.0 l=4u w=50u r=90.3947 par=3.0 s=1
-RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=50u r=90.3947 par=1.0 s=3
-RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=50u r=90.3947 par=1.0 s=1
-RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=50u r=90.3947 par=1.0 s=1
-RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ pwell m=8.0 l=50u w=5.71u r=9.58595K par=8.0 s=1
-RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=5.71u r=9.58595K par=1.0 s=8
-RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ pwell m=3.0 l=50u w=5.71u r=9.58595K par=3.0 s=1
-RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=5.71u r=9.58595K par=1.0 s=3
-RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=5.71u r=9.58595K par=1.0 s=1
-RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=5.71u r=9.58595K par=1.0 s=1
-RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ pwell m=8.0 l=11.61u w=5.71u r=2.29578K par=8.0 s=1
-RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=5.71u r=2.29578K par=1.0 s=8
-RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ pwell m=3.0 l=11.61u w=5.71u r=2.29578K par=3.0 s=1
-RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=5.71u r=2.29578K par=1.0 s=3
-RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=5.71u r=2.29578K par=1.0 s=1
-RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=5.71u r=2.29578K par=1.0 s=1
-RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ pwell m=8.0 l=4u w=5.71u r=850.665 par=8.0 s=1
-RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=5.71u r=850.665 par=1.0 s=8
-RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ pwell m=3.0 l=4u w=5.71u r=850.665 par=3.0 s=1
-RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=5.71u r=850.665 par=1.0 s=3
-RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=5.71u r=850.665 par=1.0 s=1
-RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=5.71u r=850.665 par=1.0 s=1
-RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ pwell m=8.0 l=50u w=2u r=32.4419K par=8.0 s=1
-RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=2u r=32.4419K par=1.0 s=8
-RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ pwell m=3.0 l=50u w=2u r=32.4419K par=3.0 s=1
-RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=2u r=32.4419K par=1.0 s=3
-RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=2u r=32.4419K par=1.0 s=1
-RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=50u w=2u r=32.4419K par=1.0 s=1
-RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ pwell m=8.0 l=11.61u w=2u r=7.76967K par=8.0 s=1
-RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=2u r=7.76967K par=1.0 s=8
-RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ pwell m=3.0 l=11.61u w=2u r=7.76967K par=3.0 s=1
-RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=2u r=7.76967K par=1.0 s=3
-RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=2u r=7.76967K par=1.0 s=1
-RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=11.61u w=2u r=7.76967K par=1.0 s=1
-RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ pwell m=8.0 l=4u w=2u r=2.87892K par=8.0 s=1
-RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=2u r=2.87892K par=1.0 s=8
-RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ pwell m=3.0 l=4u w=2u r=2.87892K par=3.0 s=1
-RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=2u r=2.87892K par=1.0 s=3
-RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=2u r=2.87892K par=1.0 s=1
-RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ pwell m=1.0 l=4u w=2u r=2.87892K par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! pwell m=1.0 l=4u 
-+ w=2u r=2.8789203K par=1.0 s=1
-.ENDS
-
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal.cdl
similarity index 75%
copy from ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
copy to ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal.cdl
index d11c310..44e3619 100644
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
+++ b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal.cdl
@@ -2,9 +2,9 @@
 * auCdl Netlist:
 * 
 * Library Name:  TCG_Library
-* Top Cell Name: npolyf_s
+* Top Cell Name: res_ppo_3t_sal
 * View Name:     schematic
-* Netlisted on:  Nov 24 09:31:03 2021
+* Netlisted on:  Nov 24 09:58:06 2021
 ************************************************************************
 
 *.BIPOLAR
@@ -24,11 +24,11 @@
 
 ************************************************************************
 * Library Name: TCG_Library
-* Cell Name:    npolyf_s
+* Cell Name:    res_ppo_3t_sal
 * View Name:    schematic
 ************************************************************************
 
-.SUBCKT npolyf_s I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
+.SUBCKT res_ppo_3t_sal I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
 + I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
 + I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
 + I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
@@ -121,114 +121,114 @@
 *.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
 *.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
 RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=50u r=7.02182 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=50u w=50u r=7.50221 par=8.0 s=1
 RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=8
 RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=50u r=7.02182 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=50u w=50u r=7.50221 par=3.0 s=1
 RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=3
 RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
 RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
 RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=50u r=1.25392 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=7.6u w=50u r=1.30995 par=8.0 s=1
 RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=8
 RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=50u r=1.25392 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=7.6u w=50u r=1.30995 par=3.0 s=1
 RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=3
 RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
 RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
 RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=50u r=437.71m par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=1.6u w=50u r=433.686m par=8.0 s=1
 RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=8
 RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=50u r=437.71m par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=1.6u w=50u r=433.686m par=3.0 s=1
 RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=3
 RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
 RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
 RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=3.62u r=97.3107 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=50u w=3.62u r=104.022 par=8.0 s=1
 RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=8
 RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=3.62u r=97.3107 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=50u w=3.62u r=104.022 par=3.0 s=1
 RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=3
 RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
 RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
 RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=3.62u r=17.3773 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=7.6u w=3.62u r=18.1631 par=8.0 s=1
 RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=8
 RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=3.62u r=17.3773 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=7.6u w=3.62u r=18.1631 par=3.0 s=1
 RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=3
 RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
 RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
 RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=3.62u r=6.06593 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=1.6u w=3.62u r=6.01326 par=8.0 s=1
 RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=8
 RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=3.62u r=6.06593 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=1.6u w=3.62u r=6.01326 par=3.0 s=1
 RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=3
 RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
 RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
 RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=800n r=445.997 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=50u w=800n r=477.704 par=8.0 s=1
 RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=8
 RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=800n r=445.997 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=50u w=800n r=477.704 par=3.0 s=1
 RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=3
 RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
 RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
 RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=800n r=79.644 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=7.6u w=800n r=83.4112 par=8.0 s=1
 RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=8
 RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=800n r=79.644 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=7.6u w=800n r=83.4112 par=3.0 s=1
 RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=3
 RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
 RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
 RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=800n r=27.8015 par=8.0 s=1
++ res_ppo_3t_sal m=8.0 l=1.6u w=800n r=27.615 par=8.0 s=1
 RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=8
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=8
 RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=800n r=27.8015 par=3.0 s=1
++ res_ppo_3t_sal m=3.0 l=1.6u w=800n r=27.615 par=3.0 s=1
 RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=3
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=3
 RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
 RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! npolyf_s m=1.0 
-+ l=1.6u w=800.0n r=27.8015 par=1.0 s=1
++ res_ppo_3t_sal m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
+RI1_default I1_default_PLUS I1_default_MINUS gnd! res_ppo_3t_sal m=1.0 
++ l=1.6u w=800.0n r=27.615 par=1.0 s=1
 .ENDS
 
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal_dn.cdl
similarity index 74%
copy from ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
copy to ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal_dn.cdl
index d11c310..c832af6 100644
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
+++ b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_sal_dn.cdl
@@ -2,9 +2,9 @@
 * auCdl Netlist:
 * 
 * Library Name:  TCG_Library
-* Top Cell Name: npolyf_s
+* Top Cell Name: res_ppo_3t_sal_dn
 * View Name:     schematic
-* Netlisted on:  Nov 24 09:31:03 2021
+* Netlisted on:  Nov 24 09:58:45 2021
 ************************************************************************
 
 *.BIPOLAR
@@ -24,11 +24,11 @@
 
 ************************************************************************
 * Library Name: TCG_Library
-* Cell Name:    npolyf_s
+* Cell Name:    res_ppo_3t_sal_dn
 * View Name:    schematic
 ************************************************************************
 
-.SUBCKT npolyf_s I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
+.SUBCKT res_ppo_3t_sal_dn I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
 + I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
 + I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
 + I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
@@ -121,114 +121,114 @@
 *.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
 *.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
 RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=50u r=7.02182 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=50u w=50u r=7.50221 par=8.0 s=1
 RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=50u w=50u r=7.50221 par=1.0 s=8
 RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=50u r=7.02182 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=50u w=50u r=7.50221 par=3.0 s=1
 RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=50u w=50u r=7.50221 par=1.0 s=3
 RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
 RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=50u r=7.50221 par=1.0 s=1
 RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=50u r=1.25392 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=7.6u w=50u r=1.30995 par=8.0 s=1
 RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=8
 RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=50u r=1.25392 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=7.6u w=50u r=1.30995 par=3.0 s=1
 RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=3
 RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
 RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=50u r=1.30995 par=1.0 s=1
 RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=50u r=437.71m par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=1.6u w=50u r=433.686m par=8.0 s=1
 RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=8
 RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=50u r=437.71m par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=1.6u w=50u r=433.686m par=3.0 s=1
 RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=3
 RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
 RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=50u r=433.686m par=1.0 s=1
 RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=3.62u r=97.3107 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=50u w=3.62u r=104.022 par=8.0 s=1
 RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=8
 RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=3.62u r=97.3107 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=50u w=3.62u r=104.022 par=3.0 s=1
 RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=3
 RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
 RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=3.62u r=104.022 par=1.0 s=1
 RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=3.62u r=17.3773 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=7.6u w=3.62u r=18.1631 par=8.0 s=1
 RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=8
 RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=3.62u r=17.3773 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=7.6u w=3.62u r=18.1631 par=3.0 s=1
 RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=3
 RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
 RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=3.62u r=18.1631 par=1.0 s=1
 RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=3.62u r=6.06593 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=1.6u w=3.62u r=6.01326 par=8.0 s=1
 RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=8
 RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=3.62u r=6.06593 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=1.6u w=3.62u r=6.01326 par=3.0 s=1
 RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=3
 RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
 RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=3.62u r=6.01326 par=1.0 s=1
 RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=800n r=445.997 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=50u w=800n r=477.704 par=8.0 s=1
 RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=50u w=800n r=477.704 par=1.0 s=8
 RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=800n r=445.997 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=50u w=800n r=477.704 par=3.0 s=1
 RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=50u w=800n r=477.704 par=1.0 s=3
 RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
 RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=50u w=800n r=477.704 par=1.0 s=1
 RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=800n r=79.644 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=7.6u w=800n r=83.4112 par=8.0 s=1
 RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=8
 RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=800n r=79.644 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=7.6u w=800n r=83.4112 par=3.0 s=1
 RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=3
 RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
 RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=7.6u w=800n r=83.4112 par=1.0 s=1
 RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=800n r=27.8015 par=8.0 s=1
++ res_ppo_3t_sal_dn m=8.0 l=1.6u w=800n r=27.615 par=8.0 s=1
 RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=8
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=8
 RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=800n r=27.8015 par=3.0 s=1
++ res_ppo_3t_sal_dn m=3.0 l=1.6u w=800n r=27.615 par=3.0 s=1
 RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=3
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=3
 RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
 RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! npolyf_s m=1.0 
-+ l=1.6u w=800.0n r=27.8015 par=1.0 s=1
++ res_ppo_3t_sal_dn m=1.0 l=1.6u w=800n r=27.615 par=1.0 s=1
+RI1_default I1_default_PLUS I1_default_MINUS gnd! res_ppo_3t_sal_dn m=1.0 
++ l=1.6u w=800.0n r=27.615 par=1.0 s=1
 .ENDS
 
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns.cdl
similarity index 75%
rename from ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
rename to ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns.cdl
index d11c310..2f3f2b7 100644
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
+++ b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns.cdl
@@ -2,9 +2,9 @@
 * auCdl Netlist:
 * 
 * Library Name:  TCG_Library
-* Top Cell Name: npolyf_s
+* Top Cell Name: res_ppo_3t_uns
 * View Name:     schematic
-* Netlisted on:  Nov 24 09:31:03 2021
+* Netlisted on:  Nov 24 10:02:18 2021
 ************************************************************************
 
 *.BIPOLAR
@@ -24,11 +24,11 @@
 
 ************************************************************************
 * Library Name: TCG_Library
-* Cell Name:    npolyf_s
+* Cell Name:    res_ppo_3t_uns
 * View Name:    schematic
 ************************************************************************
 
-.SUBCKT npolyf_s I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
+.SUBCKT res_ppo_3t_uns I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
 + I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
 + I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
 + I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
@@ -121,114 +121,114 @@
 *.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
 *.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
 RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=50u r=7.02182 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=50u w=50u r=352.76 par=8.0 s=1
 RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=8
 RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=50u r=7.02182 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=50u w=50u r=352.76 par=3.0 s=1
 RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=3
 RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
 RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
 RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=50u r=1.25392 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=7.6u w=50u r=55.6565 par=8.0 s=1
 RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=8
 RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=50u r=1.25392 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=7.6u w=50u r=55.6565 par=3.0 s=1
 RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=3
 RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
 RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
 RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=50u r=437.71m par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=1.6u w=50u r=13.6136 par=8.0 s=1
 RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=8
 RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=50u r=437.71m par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=1.6u w=50u r=13.6136 par=3.0 s=1
 RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=3
 RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
 RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
 RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=3.62u r=97.3107 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=50u w=3.62u r=4.93695K par=8.0 s=1
 RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=8
 RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=3.62u r=97.3107 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=50u w=3.62u r=4.93695K par=3.0 s=1
 RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=3
 RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
 RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
 RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=3.62u r=17.3773 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=7.6u w=3.62u r=778.926 par=8.0 s=1
 RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=8
 RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=3.62u r=17.3773 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=7.6u w=3.62u r=778.926 par=3.0 s=1
 RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=3
 RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
 RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
 RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=3.62u r=6.06593 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=1.6u w=3.62u r=190.526 par=8.0 s=1
 RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=8
 RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=3.62u r=6.06593 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=1.6u w=3.62u r=190.526 par=3.0 s=1
 RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=3
 RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
 RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
 RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=800n r=445.997 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=50u w=800n r=23.5247K par=8.0 s=1
 RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=8
 RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=800n r=445.997 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=50u w=800n r=23.5247K par=3.0 s=1
 RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=3
 RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
 RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
 RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=800n r=79.644 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=7.6u w=800n r=3.7116K par=8.0 s=1
 RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=8
 RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=800n r=79.644 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=7.6u w=800n r=3.7116K par=3.0 s=1
 RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=3
 RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
 RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
 RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=800n r=27.8015 par=8.0 s=1
++ res_ppo_3t_uns m=8.0 l=1.6u w=800n r=907.858 par=8.0 s=1
 RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=8
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=8
 RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=800n r=27.8015 par=3.0 s=1
++ res_ppo_3t_uns m=3.0 l=1.6u w=800n r=907.858 par=3.0 s=1
 RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=3
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=3
 RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
 RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! npolyf_s m=1.0 
-+ l=1.6u w=800.0n r=27.8015 par=1.0 s=1
++ res_ppo_3t_uns m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
+RI1_default I1_default_PLUS I1_default_MINUS gnd! res_ppo_3t_uns m=1.0 
++ l=1.6u w=800.0n r=907.8585 par=1.0 s=1
 .ENDS
 
diff --git a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns_dn.cdl
similarity index 74%
copy from ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
copy to ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns_dn.cdl
index d11c310..4db2364 100644
--- a/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/npolyf_s.cdl
+++ b/ULL/klayout/lvs/testing/testcases/unit/res_devices/netlist/res_ppo_3t_uns_dn.cdl
@@ -2,9 +2,9 @@
 * auCdl Netlist:
 * 
 * Library Name:  TCG_Library
-* Top Cell Name: npolyf_s
+* Top Cell Name: res_ppo_3t_uns_dn
 * View Name:     schematic
-* Netlisted on:  Nov 24 09:31:03 2021
+* Netlisted on:  Nov 24 10:15:15 2021
 ************************************************************************
 
 *.BIPOLAR
@@ -24,11 +24,11 @@
 
 ************************************************************************
 * Library Name: TCG_Library
-* Cell Name:    npolyf_s
+* Cell Name:    res_ppo_3t_uns_dn
 * View Name:    schematic
 ************************************************************************
 
-.SUBCKT npolyf_s I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
+.SUBCKT res_ppo_3t_uns_dn I1_0_0_0_0_0_0_R0_MINUS I1_0_0_0_0_0_0_R0_PLUS 
 + I1_0_0_0_1_0_0_R0_MINUS I1_0_0_0_1_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS 
 + I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS I1_0_0_1_1_0_0_R0_PLUS 
 + I1_0_0_2_0_0_0_R0_MINUS I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS 
@@ -121,114 +121,114 @@
 *.PININFO I1_2_2_2_1_0_0_R0_MINUS:I I1_2_2_2_1_0_0_R0_PLUS:I 
 *.PININFO I1_default_MINUS:I I1_default_PLUS:I gnd!:I
 RI1_2_2_2_1_0_0_R0 I1_2_2_2_1_0_0_R0_PLUS I1_2_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=50u r=7.02182 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=50u w=50u r=352.76 par=8.0 s=1
 RI1_2_2_2_0_0_0_R0 I1_2_2_2_0_0_0_R0_PLUS I1_2_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=50u w=50u r=352.76 par=1.0 s=8
 RI1_2_2_1_1_0_0_R0 I1_2_2_1_1_0_0_R0_PLUS I1_2_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=50u r=7.02182 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=50u w=50u r=352.76 par=3.0 s=1
 RI1_2_2_1_0_0_0_R0 I1_2_2_1_0_0_0_R0_PLUS I1_2_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=50u w=50u r=352.76 par=1.0 s=3
 RI1_2_2_0_1_0_0_R0 I1_2_2_0_1_0_0_R0_PLUS I1_2_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
 RI1_2_2_0_0_0_0_R0 I1_2_2_0_0_0_0_R0_PLUS I1_2_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=50u r=7.02182 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=50u r=352.76 par=1.0 s=1
 RI1_2_1_2_1_0_0_R0 I1_2_1_2_1_0_0_R0_PLUS I1_2_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=50u r=1.25392 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=7.6u w=50u r=55.6565 par=8.0 s=1
 RI1_2_1_2_0_0_0_R0 I1_2_1_2_0_0_0_R0_PLUS I1_2_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=8
 RI1_2_1_1_1_0_0_R0 I1_2_1_1_1_0_0_R0_PLUS I1_2_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=50u r=1.25392 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=7.6u w=50u r=55.6565 par=3.0 s=1
 RI1_2_1_1_0_0_0_R0 I1_2_1_1_0_0_0_R0_PLUS I1_2_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=3
 RI1_2_1_0_1_0_0_R0 I1_2_1_0_1_0_0_R0_PLUS I1_2_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
 RI1_2_1_0_0_0_0_R0 I1_2_1_0_0_0_0_R0_PLUS I1_2_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=50u r=1.25392 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=50u r=55.6565 par=1.0 s=1
 RI1_2_0_2_1_0_0_R0 I1_2_0_2_1_0_0_R0_PLUS I1_2_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=50u r=437.71m par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=1.6u w=50u r=13.6136 par=8.0 s=1
 RI1_2_0_2_0_0_0_R0 I1_2_0_2_0_0_0_R0_PLUS I1_2_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=8
 RI1_2_0_1_1_0_0_R0 I1_2_0_1_1_0_0_R0_PLUS I1_2_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=50u r=437.71m par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=1.6u w=50u r=13.6136 par=3.0 s=1
 RI1_2_0_1_0_0_0_R0 I1_2_0_1_0_0_0_R0_PLUS I1_2_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=3
 RI1_2_0_0_1_0_0_R0 I1_2_0_0_1_0_0_R0_PLUS I1_2_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
 RI1_2_0_0_0_0_0_R0 I1_2_0_0_0_0_0_R0_PLUS I1_2_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=50u r=437.71m par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=50u r=13.6136 par=1.0 s=1
 RI1_1_2_2_1_0_0_R0 I1_1_2_2_1_0_0_R0_PLUS I1_1_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=3.62u r=97.3107 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=50u w=3.62u r=4.93695K par=8.0 s=1
 RI1_1_2_2_0_0_0_R0 I1_1_2_2_0_0_0_R0_PLUS I1_1_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=8
 RI1_1_2_1_1_0_0_R0 I1_1_2_1_1_0_0_R0_PLUS I1_1_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=3.62u r=97.3107 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=50u w=3.62u r=4.93695K par=3.0 s=1
 RI1_1_2_1_0_0_0_R0 I1_1_2_1_0_0_0_R0_PLUS I1_1_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=3
 RI1_1_2_0_1_0_0_R0 I1_1_2_0_1_0_0_R0_PLUS I1_1_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
 RI1_1_2_0_0_0_0_R0 I1_1_2_0_0_0_0_R0_PLUS I1_1_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=3.62u r=97.3107 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=3.62u r=4.93695K par=1.0 s=1
 RI1_1_1_2_1_0_0_R0 I1_1_1_2_1_0_0_R0_PLUS I1_1_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=3.62u r=17.3773 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=7.6u w=3.62u r=778.926 par=8.0 s=1
 RI1_1_1_2_0_0_0_R0 I1_1_1_2_0_0_0_R0_PLUS I1_1_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=8
 RI1_1_1_1_1_0_0_R0 I1_1_1_1_1_0_0_R0_PLUS I1_1_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=3.62u r=17.3773 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=7.6u w=3.62u r=778.926 par=3.0 s=1
 RI1_1_1_1_0_0_0_R0 I1_1_1_1_0_0_0_R0_PLUS I1_1_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=3
 RI1_1_1_0_1_0_0_R0 I1_1_1_0_1_0_0_R0_PLUS I1_1_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
 RI1_1_1_0_0_0_0_R0 I1_1_1_0_0_0_0_R0_PLUS I1_1_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=3.62u r=17.3773 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=3.62u r=778.926 par=1.0 s=1
 RI1_1_0_2_1_0_0_R0 I1_1_0_2_1_0_0_R0_PLUS I1_1_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=3.62u r=6.06593 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=1.6u w=3.62u r=190.526 par=8.0 s=1
 RI1_1_0_2_0_0_0_R0 I1_1_0_2_0_0_0_R0_PLUS I1_1_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=8
 RI1_1_0_1_1_0_0_R0 I1_1_0_1_1_0_0_R0_PLUS I1_1_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=3.62u r=6.06593 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=1.6u w=3.62u r=190.526 par=3.0 s=1
 RI1_1_0_1_0_0_0_R0 I1_1_0_1_0_0_0_R0_PLUS I1_1_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=3
 RI1_1_0_0_1_0_0_R0 I1_1_0_0_1_0_0_R0_PLUS I1_1_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
 RI1_1_0_0_0_0_0_R0 I1_1_0_0_0_0_0_R0_PLUS I1_1_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=3.62u r=6.06593 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=3.62u r=190.526 par=1.0 s=1
 RI1_0_2_2_1_0_0_R0 I1_0_2_2_1_0_0_R0_PLUS I1_0_2_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=50u w=800n r=445.997 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=50u w=800n r=23.5247K par=8.0 s=1
 RI1_0_2_2_0_0_0_R0 I1_0_2_2_0_0_0_R0_PLUS I1_0_2_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=50u w=800n r=23.5247K par=1.0 s=8
 RI1_0_2_1_1_0_0_R0 I1_0_2_1_1_0_0_R0_PLUS I1_0_2_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=50u w=800n r=445.997 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=50u w=800n r=23.5247K par=3.0 s=1
 RI1_0_2_1_0_0_0_R0 I1_0_2_1_0_0_0_R0_PLUS I1_0_2_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=50u w=800n r=23.5247K par=1.0 s=3
 RI1_0_2_0_1_0_0_R0 I1_0_2_0_1_0_0_R0_PLUS I1_0_2_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
 RI1_0_2_0_0_0_0_R0 I1_0_2_0_0_0_0_R0_PLUS I1_0_2_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=50u w=800n r=445.997 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=50u w=800n r=23.5247K par=1.0 s=1
 RI1_0_1_2_1_0_0_R0 I1_0_1_2_1_0_0_R0_PLUS I1_0_1_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=7.6u w=800n r=79.644 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=7.6u w=800n r=3.7116K par=8.0 s=1
 RI1_0_1_2_0_0_0_R0 I1_0_1_2_0_0_0_R0_PLUS I1_0_1_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=8
 RI1_0_1_1_1_0_0_R0 I1_0_1_1_1_0_0_R0_PLUS I1_0_1_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=7.6u w=800n r=79.644 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=7.6u w=800n r=3.7116K par=3.0 s=1
 RI1_0_1_1_0_0_0_R0 I1_0_1_1_0_0_0_R0_PLUS I1_0_1_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=3
 RI1_0_1_0_1_0_0_R0 I1_0_1_0_1_0_0_R0_PLUS I1_0_1_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
 RI1_0_1_0_0_0_0_R0 I1_0_1_0_0_0_0_R0_PLUS I1_0_1_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=7.6u w=800n r=79.644 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=7.6u w=800n r=3.7116K par=1.0 s=1
 RI1_0_0_2_1_0_0_R0 I1_0_0_2_1_0_0_R0_PLUS I1_0_0_2_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=8.0 l=1.6u w=800n r=27.8015 par=8.0 s=1
++ res_ppo_3t_uns_dn m=8.0 l=1.6u w=800n r=907.858 par=8.0 s=1
 RI1_0_0_2_0_0_0_R0 I1_0_0_2_0_0_0_R0_PLUS I1_0_0_2_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=8
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=8
 RI1_0_0_1_1_0_0_R0 I1_0_0_1_1_0_0_R0_PLUS I1_0_0_1_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=3.0 l=1.6u w=800n r=27.8015 par=3.0 s=1
++ res_ppo_3t_uns_dn m=3.0 l=1.6u w=800n r=907.858 par=3.0 s=1
 RI1_0_0_1_0_0_0_R0 I1_0_0_1_0_0_0_R0_PLUS I1_0_0_1_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=3
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=3
 RI1_0_0_0_1_0_0_R0 I1_0_0_0_1_0_0_R0_PLUS I1_0_0_0_1_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
 RI1_0_0_0_0_0_0_R0 I1_0_0_0_0_0_0_R0_PLUS I1_0_0_0_0_0_0_R0_MINUS gnd! 
-+ npolyf_s m=1.0 l=1.6u w=800n r=27.8015 par=1.0 s=1
-RI1_default I1_default_PLUS I1_default_MINUS gnd! npolyf_s m=1.0 
-+ l=1.6u w=800.0n r=27.8015 par=1.0 s=1
++ res_ppo_3t_uns_dn m=1.0 l=1.6u w=800n r=907.858 par=1.0 s=1
+RI1_default I1_default_PLUS I1_default_MINUS gnd! res_ppo_3t_uns_dn m=1.0 
++ l=1.6u w=800.0n r=907.8585 par=1.0 s=1
 .ENDS
 
diff --git a/scripts/run_regression_lvs.py b/scripts/run_regression_lvs.py
new file mode 100644
index 0000000..5905ff8
--- /dev/null
+++ b/scripts/run_regression_lvs.py
@@ -0,0 +1,548 @@
+# Copyright 2023 GlobalFoundries PDK Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Run GlobalFoundries 180nm LVS Regression.
+
+Usage:
+    run_regression_lvs.py (--help| -h)
+    run_regression_lvs.py (--variant=<variant_name>) [--device_name=<device_name>] [--mp=<num>] [--run_name=<run_name>]
+
+Options:
+    --help -h                      Print this help message.
+    --variant=<variant_name>       Variant name to run on.
+    --device_name=<device_name>    Name of device that we want to run regression for.
+    --mp=<num>                     The number of threads used in run.
+    --run_name=<run_name>          Select your run name.
+"""
+
+from subprocess import check_call
+from subprocess import Popen, PIPE
+import concurrent.futures
+import traceback
+import yaml
+from docopt import docopt
+import os
+from datetime import datetime
+import xml.etree.ElementTree as ET
+import time
+import pandas as pd
+import logging
+import glob
+from pathlib import Path
+from tqdm import tqdm
+import re
+import errno
+import numpy as np
+from collections import defaultdict
+import shutil
+
+SUPPORTED_TC_EXT = "gds"
+SUPPORTED_SPICE_EXT = "cdl"
+SUPPORTED_SW_EXT = "yaml"
+
+
+def check_klayout_version():
+    """
+    check_klayout_version checks klayout version and makes sure it would work with the DRC.
+    """
+    # ======= Checking Klayout version =======
+    klayout_v_ = os.popen("klayout -b -v").read()
+    klayout_v_ = klayout_v_.split("\n")[0]
+    klayout_v_list = []
+
+    if klayout_v_ == "":
+        logging.error("Klayout is not found. Please make sure klayout is installed.")
+        exit(1)
+    else:
+        klayout_v_list = [int(v) for v in klayout_v_.split(" ")[-1].split(".")]
+
+    if len(klayout_v_list) < 1 or len(klayout_v_list) > 3:
+        logging.error("Was not able to get klayout version properly.")
+        exit(1)
+    elif len(klayout_v_list) >= 2 or len(klayout_v_list) <= 3:
+        if klayout_v_list[1] < 28 or (klayout_v_list[1] == 28 and klayout_v_list[2] <= 3):
+            logging.error("Prerequisites at a minimum: KLayout 0.28.4")
+            logging.error(
+                "Using this klayout version is not supported in this development."
+            )
+            exit(1)
+
+    logging.info(f"Your Klayout version is: {klayout_v_}")
+
+
+def parse_existing_devices(rule_deck_path, output_path, target_device_group=None):
+    """
+    This function collects the rule names from the existing drc rule decks.
+
+    Parameters
+    ----------
+    rule_deck_path : string or Path object
+        Path string to the LVS directory where all the LVS files are located.
+    output_path : string or Path
+        Path of the run location to store the output analysis file.
+    target_device_group : string Optional
+        Name of the device group to be in testing
+
+    Returns
+    -------
+    pd.DataFrame
+        A pandas DataFrame with the rule and rule deck used.
+    """
+
+    if target_device_group is None:
+        lvs_files = glob.glob(os.path.join(rule_deck_path, "rule_decks", "*_extraction.lvs"))
+    else:
+        table_device_file = os.path.join(
+            rule_deck_path, "rule_decks", f"{str(target_device_group).lower()}_extraction.lvs"
+        )
+        if not os.path.isfile(table_device_file):
+            raise FileNotFoundError(
+                errno.ENOENT, os.strerror(errno.ENOENT), table_device_file
+            )
+
+        lvs_files = [table_device_file]
+
+    rules_data = list()
+
+    for runset in lvs_files:
+        with open(runset, "r") as f:
+            for line in f:
+                if "extract_devices" in line:
+                    line_list = line.split("'")
+                    rule_info = dict()
+                    rule_info["device_group"] = os.path.basename(runset).replace(
+                        "_extraction.lvs", ""
+                    ).upper()
+                    rule_info["device_name"] = line_list[1]
+                    rule_info["in_rule_deck"] = 1
+                    rules_data.append(rule_info)
+
+    df = pd.DataFrame(rules_data)
+    df.drop_duplicates(inplace=True)
+    df.to_csv(os.path.join(output_path, "rule_deck_rules.csv"), index=False)
+    return df
+
+
+def build_tests_dataframe(unit_test_cases_dir, target_device_group):
+    """
+    This function is used for getting all test cases available in a formated dataframe before running.
+
+    Parameters
+    ----------
+    unit_test_cases_dir : str
+        Path string to the location of unit test cases path.
+    target_device_group : str or None
+        Name of device group that we want to run regression for. If None, run all found.
+
+    Returns
+    -------
+    pd.DataFrame
+        A DataFrame that has all the targetted test cases that we need to run.
+    """
+    all_unit_test_cases_layout = sorted(
+        Path(unit_test_cases_dir).rglob("*.{}".format(SUPPORTED_TC_EXT))
+    )
+    logging.info(
+        "## Total number of gds files test cases found: {}".format(len(all_unit_test_cases_layout))
+    )
+
+    all_unit_test_cases_netlist = sorted(
+        Path(unit_test_cases_dir).rglob("*.{}".format(SUPPORTED_SPICE_EXT))
+    )
+    logging.info(
+        "## Total number of spice files test cases found: {}".format(len(all_unit_test_cases_netlist))
+    )
+
+    if len(all_unit_test_cases_netlist) != len(all_unit_test_cases_layout):
+        logging.error(
+            "## Each testcase should have Layout and Netlist file"
+        )
+        exit(1)
+
+    # Get test cases df from test cases
+    tc_df = pd.DataFrame({"test_layout_path": all_unit_test_cases_layout , "test_netlist_path": all_unit_test_cases_netlist})
+    tc_df["device_name"] = tc_df["test_layout_path"].apply(lambda x: x.name.replace(".gds", ""))
+    tc_df["device_group"] = tc_df["test_layout_path"].apply(lambda x: x.parent.parent.name.replace("_devices", "").upper())
+
+    if target_device_group is not None:
+        tc_df = tc_df[tc_df["device_group"] == target_device_group]
+    if len(tc_df) < 1:
+        logging.error("No test cases remaining after filtering.")
+        exit(1)
+
+    tc_df["run_id"] = range(len(tc_df))
+    return tc_df
+
+
+def get_switches(yaml_file, rule_name):
+    """Parse yaml file and extract switches data
+    Parameters
+    ----------
+    yaml_file : str
+            yaml config file path given py the user.
+    Returns
+    -------
+    yaml_dic : dictionary
+            dictionary containing switches data.
+    """
+
+    # load yaml config data
+    with open(yaml_file, "r") as stream:
+        try:
+            yaml_dic = yaml.safe_load(stream)
+        except yaml.YAMLError as exc:
+            print(exc)
+
+    return [f"{param}={value}" for param, value in yaml_dic[rule_name].items()]
+
+
+def run_test_case(
+    lvs_dir,
+    layout_path,
+    netlist_path,
+    run_dir,
+    device_name,
+):
+    """
+    This function run a single test case using the correct DRC file.
+
+    Parameters
+    ----------
+    lvs_dir : string or Path
+        Path to the location where all runsets exist.
+    layout_path : stirng or Path object
+        Path string to the layout of the test pattern we want to test.
+    netlist_path : stirng or Path object
+        Path string to the netlist of the test pattern we want to test.
+    run_dir : stirng or Path object
+        Path to the location where is the regression run is done.
+    device_name : string
+        Device name that we are running on.
+
+    Returns
+    -------
+    dict
+        A dict with all rule counts
+    """
+
+    # Get switches used for each run
+    sw_file = os.path.join(
+        Path(layout_path.parent).absolute(), f"{device_name}.{SUPPORTED_SW_EXT}"
+    )
+
+    if os.path.exists(sw_file):
+        switches = " ".join(get_switches(sw_file, device_name))
+    else:
+        # Get switches
+        switches = " -rd lvs_sub=sub!" if device_name == "sample_ggnfet_06v0_dss" else " -rd lvs_sub=vdd!"  # default switch
+
+    # Creating run folder structure and copy testcases in it
+    pattern_clean = ".".join(os.path.basename(layout_path).split(".")[:-1])
+    output_loc = os.path.join(run_dir, device_name)
+    pattern_log = os.path.join(output_loc, f"{pattern_clean}_lvs.log")
+    os.makedirs(output_loc, exist_ok=True)
+    layout_path_run = os.path.join(run_dir, device_name, f"{device_name}.gds")
+    netlist_path_run = os.path.join(run_dir, device_name, f"{device_name}.cdl")
+    shutil.copyfile(layout_path, layout_path_run)
+    shutil.copyfile(netlist_path, netlist_path_run)
+
+    # command to run drc
+    call_str = f"klayout -b -r {lvs_dir}/gf180{variant_name}.lvs -rd input={layout_path_run} -rd schematic={device_name}.cdl -rd report={device_name}.lvsdb  -rd target_netlist={device_name}_extracted.cir {switches} > {pattern_log} 2>&1"
+
+    # Starting klayout run
+    try:
+        check_call(call_str, shell=True)
+    except Exception as e:
+        pattern_results = glob.glob(os.path.join(output_loc, f"{pattern_clean}*.lvsdb"))
+        if len(pattern_results) < 1:
+            logging.error("%s generated an exception: %s" % (pattern_clean, e))
+            traceback.print_exc()
+            raise Exception("Failed DRC run.")
+
+    # dumping log into output to make CI have the log
+    if os.path.isfile(pattern_log):
+        with open(pattern_log, "r") as f:
+            result = f.read()
+            for line in f:
+                line = line.strip()
+                logging.info(f"{line}")
+
+    # checking device status
+        device_status = 'Failed'
+        if "Congratulations! Netlists match" in result:
+            logging.info(f"{device_name} testcase passed")
+            device_status = 'Passed'
+        else:
+            logging.error(f"{device_name} testcase failed.")
+            logging.error(f"Please recheck {layout_path} file.")
+    else:
+        logging.error("Klayout LVS run failed, there is no log file is generated")
+        exit(1)
+
+    return device_status
+
+
+def run_all_test_cases(tc_df, lvs_dir, run_dir, num_workers):
+    """
+    This function run all test cases from the input dataframe.
+
+    Parameters
+    ----------
+    tc_df : pd.DataFrame
+        DataFrame that holds all the test cases information for running.
+    lvs_dir : string or Path
+        Path string to the location of the lvs runsets.
+    run_dir : string or Path
+        Path string to the location of the testing code and output.
+    num_workers : int
+        Number of workers to use for running the regression.
+
+    Returns
+    -------
+    pd.DataFrame
+        A pandas DataFrame with all test cases information post running.
+    """
+
+    tc_df["device_status"] = "no status"
+
+    with concurrent.futures.ThreadPoolExecutor(max_workers=num_workers) as executor:
+        future_to_run_id = dict()
+        for i, row in tc_df.iterrows():
+            future_to_run_id[
+                executor.submit(
+                    run_test_case,
+                    lvs_dir,
+                    row["test_layout_path"],
+                    row["test_netlist_path"],
+                    run_dir,
+                    row["device_name"],
+                )
+            ] = row["run_id"]
+
+        for future in concurrent.futures.as_completed(future_to_run_id):
+            run_id = future_to_run_id[future]
+            try:
+                tc_df.loc[tc_df["run_id"] == run_id, "device_status"] = future.result()
+            except Exception as exc:
+                logging.error("%d generated an exception: %s" % (run_id, exc))
+                traceback.print_exc()
+                tc_df.loc[tc_df["run_id"] == run_id, "device_status"] = "exception"
+
+    return tc_df
+
+
+def aggregate_results(
+    results_df: pd.DataFrame, devices_df: pd.DataFrame
+):
+    """
+    aggregate_results Aggregate the results for all runs.
+
+    Parameters
+    ----------
+    results_df : pd.DataFrame
+        Dataframe that holds the information about the unit test rules.
+    devices_df : pd.DataFrame
+        Dataframe that holds the information about all the devices implemented in the rule deck.
+
+    Returns
+    -------
+    pd.DataFrame
+        A DataFrame that has all data analysis aggregated into one.
+    """
+    if len(devices_df) < 1 and len(results_df) < 1:
+        logging.error("## There are no rules for analysis or run.")
+        exit(1)
+    elif len(devices_df) < 1 and len(results_df) > 0:
+        df = results_df
+    elif len(devices_df) > 0 and len(results_df) < 1:
+        df = devices_df
+    else:
+        df = results_df.merge(devices_df, how="outer", on=["device_group", "device_name"])
+
+    df.loc[(df["device_status"] != 'Passed'), "device_status"] = "Failed"
+
+    return df
+
+
+def run_regression(lvs_dir, output_path, target_device_group, cpu_count):
+    """
+    Running Regression Procedure.
+
+    This function runs the full regression on all test cases.
+
+    Parameters
+    ----------
+    lvs_dir : string
+        Path string to the LVS directory where all the LVS files are located.
+    output_path : str
+        Path string to the location of the output results of the run.
+    target_device_group : str or None
+        Name of device group that we want to run regression for. If None, run all found.
+    cpu_count : int
+        Number of cpus to use in running testcases.
+    Returns
+    -------
+    bool
+        If all regression passed, it returns true. If any of the rules failed it returns false.
+    """
+
+    ## Parse Existing Rules
+    devices_df = parse_existing_devices(lvs_dir, output_path, target_device_group)
+    logging.info(
+        "## Total number of devices found in rule decks: {}".format(len(devices_df))
+    )
+    logging.info("## Parsed devices: \n" + str(devices_df))
+
+    ## Get all test cases available in the repo.
+    test_cases_path = os.path.join(lvs_dir, "testing/testcases")
+    unit_test_cases_path = os.path.join(test_cases_path, "unit")
+    tc_df = build_tests_dataframe(unit_test_cases_path, target_device_group)
+    logging.info("## Total table gds files found: {}".format(len(tc_df)))
+    logging.info("## Found testcases: \n" + str(tc_df))
+
+    ## Run all test cases.
+    results_df = run_all_test_cases(tc_df, lvs_dir, output_path, cpu_count)
+    logging.info("## Testcases found results: \n" + str(results_df))
+
+    ## Aggregate all dataframes into one
+    df = aggregate_results(results_df, devices_df)
+    df.drop_duplicates(inplace=True)
+    df.drop('run_id', inplace=True, axis=1)
+    logging.info("## Final analysis table: \n" + str(df))
+
+    ## Generate error if there are any missing info or fails.
+    df.to_csv(os.path.join(output_path, "all_test_cases_results.csv"), index=False)
+
+    ## Check if there any rules that generated false positive or false negative
+    failing_results = df[~df["device_status"].isin(["Passed"])]
+    logging.info("## Failing test cases: \n" + str(failing_results))
+
+    if len(failing_results) > 0:
+        logging.error("## Some test cases failed .....")
+        return False
+    else:
+        logging.info("## All testcases passed.")
+        return True
+
+
+def main(lvs_dir, output_path, target_device_group):
+    """
+    Main Procedure.
+
+    This function is the main execution procedure
+
+    Parameters
+    ----------
+    lvs_dir : str
+        Path string to the LVS directory where all the LVS files are located.
+    output_path : str
+        Path string to the location of the output results of the run.
+    target_device_group : str or None
+        Name of device group that we want to run regression for. If None, run all found.
+    Returns
+    -------
+    bool
+        If all regression passed, it returns true. If any of the rules failed it returns false.
+    """
+
+    # No. of threads
+    cpu_count = os.cpu_count() if args["--mp"] is None else int(args["--mp"])
+
+    # Pandas printing setup
+    pd.set_option("display.max_columns", None)
+    pd.set_option("display.max_rows", None)
+    pd.set_option("max_colwidth", None)
+    pd.set_option("display.width", 1000)
+
+    # info logs for args
+    logging.info("## Run folder is: {}".format(run_name))
+    logging.info("## Target device is: {}".format(target_device_group))
+
+    # Start of execution time
+    t0 = time.time()
+
+    ## Check Klayout version
+    check_klayout_version()
+
+    # Calling regression function
+    run_status = run_regression(lvs_dir, output_path, target_device_group, cpu_count)
+
+    #  End of execution time
+    logging.info("Total execution time {}s".format(time.time() - t0))
+
+    if run_status:
+        logging.info("Test completed successfully.")
+    else:
+        logging.error("Test failed.")
+        exit(1)
+
+# ================================================================
+# -------------------------- MAIN --------------------------------
+# ================================================================
+
+
+if __name__ == "__main__":
+
+    # docopt reader
+    args = docopt(__doc__, version="LVS Regression: 0.2")
+
+    # arguments
+    variant_name = args["--variant"]
+    run_name = args["--run_name"]
+
+    # variant
+    if variant_name not in ["BCDLite", "ULL", "IC"]:
+        logging.error("Variant name must be in one of those: BCDLite, ULL, IC")
+        exit(1)
+
+    # run name
+    if run_name is None:
+        run_name = datetime.utcnow().strftime("unit_tests_%Y_%m_%d_%H_%M_%S")
+
+    # Paths of regression dirs
+    main_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    lvs_dir = os.path.join(main_dir, variant_name, "klayout", "lvs")
+    output_path = os.path.join(main_dir, run_name)
+
+    # Creating output dir
+    os.makedirs(output_path, exist_ok=True)
+
+    # logs format
+    logging.basicConfig(
+        level=logging.DEBUG,
+        handlers=[
+            logging.FileHandler(os.path.join(output_path, "{}.log".format(run_name))),
+            logging.StreamHandler(),
+        ],
+        format="%(asctime)s | %(levelname)-7s | %(message)s",
+        datefmt="%d-%b-%Y %H:%M:%S",
+    )
+
+    ## selected device
+    target_device_group = args["--device_name"]
+
+    allowed_devices_BCDLite = ["MOS", "BJT", "DIODE", "RES", "MIMCAP", "MOSCAP", "PISCAP", "VARACTOR", "MOS_SAB"]
+    allowed_devices_ULL = ["MOS", "BJT", "DIODE", "RES", "MIMCAP", "MOSCAP", "PISCAP", "VARACTOR"]
+    allowed_devices_IC = ["MOS", "BJT", "DIODE", "RES", "MIMCAP"]
+
+    variants_dict = {"BCDLite": allowed_devices_BCDLite,
+                     "ULL": allowed_devices_ULL,
+                     "IC": allowed_devices_IC}
+
+    if target_device_group and target_device_group not in variants_dict[variant_name]:
+        logging.error(f"Allowed {variant_name} devices are {variants_dict[variant_name]} only")
+        exit(1)
+
+    # Calling main function
+    run_status = main(lvs_dir, output_path, target_device_group)