diff --git a/testdata/drc/drcSimpleTests_110.drc b/testdata/drc/drcSimpleTests_110.drc
index f087e932e..6fb126755 100644
--- a/testdata/drc/drcSimpleTests_110.drc
+++ b/testdata/drc/drcSimpleTests_110.drc
@@ -8,9 +8,9 @@ l1 = input(1, 0)
 l1 = l1.sized(0.1, 0.0)
 
 l1.output("l1", "L1 (1/0 sized by x=100nm,y=0)")
-l1.drc(width < 1.0.um).output("w1um", "w < 1µm\nFrom sized input")
+l1.width(1.0.um).output("w1um", "w < 1µm\nFrom sized input")
 
 l1s = l1.snapped(200.nm)
 l1s.output("l1_snapped", "L1 snapped to 200nm")
-l1s.drc(width < 1.0.um).output("w1um_snapped", "w < 1µm\nFrom snapped input")
+l1s.width(1.0.um).output("w1um_snapped", "w < 1µm\nFrom snapped input")
 
diff --git a/testdata/drc/drcSimpleTests_111.drc b/testdata/drc/drcSimpleTests_111.drc
index 8ba7378dd..763b98b93 100644
--- a/testdata/drc/drcSimpleTests_111.drc
+++ b/testdata/drc/drcSimpleTests_111.drc
@@ -10,5 +10,5 @@ l1s = l1.sized(0.1, 0.0)
 l1.output([ "input", "L1" ], "Original layer")
 l1s.output([ "input", "L1S" ], "Sized original layer")
 
-l1s.drc(width < 1.0.um).output("w1um", "w < 1µm\nFrom sized input")
+l1s.width(1.0.um).output("w1um", "w < 1µm\nFrom sized input")
 
diff --git a/testdata/drc/drcSimpleTests_112.drc b/testdata/drc/drcSimpleTests_112.drc
index 7c21b7f48..fe79de298 100644
--- a/testdata/drc/drcSimpleTests_112.drc
+++ b/testdata/drc/drcSimpleTests_112.drc
@@ -8,9 +8,9 @@ l1 = input(1, 0)
 l1 = l1.sized(0.1, 0.0)
 
 l1.output(["inputs", "l1"], "L1 (1/0 sized by x=100nm,y=0)")
-l1.drc(width < 1.0.um).output("w1um", "w < 1µm\nAnother line")
+l1.width(1.0.um).output("w1um", "w < 1µm\nAnother line")
 
 l1s = l1.snapped(200.nm)
 l1s.output([ "inputs", "l1_snapped" ], "L1 snapped to 200nm")
-l1s.drc(width < 1.0.um).output("w1um_snapped", "w < 1µm\nFrom snapped input")
+l1s.width(1.0.um).output("w1um_snapped", "w < 1µm\nFrom snapped input")
 
diff --git a/testdata/drc/drcSimpleTests_au110.lyrdb.1 b/testdata/drc/drcSimpleTests_au110.lyrdb
similarity index 100%
rename from testdata/drc/drcSimpleTests_au110.lyrdb.1
rename to testdata/drc/drcSimpleTests_au110.lyrdb
index 793d828a3..77ef871b3 100644
--- a/testdata/drc/drcSimpleTests_au110.lyrdb.1
+++ b/testdata/drc/drcSimpleTests_au110.lyrdb
@@ -137,78 +137,6 @@ From snapped input</description>
     <value>polygon: (0,-0.1;0,1.7;0.2,1.7;0.2,-0.1)</value>
    </values>
   </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.1,4.9;5.3,4.9)|(5.3,4.9;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.6,4.6;4.408,4.762)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.3,4;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(4.138,4.708;5.1,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.9,3;2.1,3)|(2.1,3.6;2.9,3.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
   <item>
    <tags/>
    <category>w1um</category>
@@ -221,18 +149,6 @@ From snapped input</description>
     <value>edge-pair: (3.7,3.9;3.3,4)|(3.3,4;3.6,4.6)</value>
    </values>
   </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.3,4;3.6,4.6)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
   <item>
    <tags/>
    <category>w1um</category>
@@ -245,42 +161,6 @@ From snapped input</description>
     <value>edge-pair: (3.7,3.9;3.3,4)|(3.6,4.6;4.256,4.731)</value>
    </values>
   </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.53,4.233;3.804,4.285)|(3.455,4.31;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.1,3;2.1,3.6)|(2.9,3.6;2.9,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(5.1,4.9;5.3,4.9)</value>
-   </values>
-  </item>
   <item>
    <tags/>
    <category>w1um</category>
@@ -302,7 +182,31 @@ From snapped input</description>
    <comment/>
    <image/>
    <values>
-    <value>edge-pair: (5,4.2;4.343,4.247)|(5.1,4.9;5.3,4.9)</value>
+    <value>edge-pair: (4.53,4.233;3.804,4.285)|(3.455,4.31;3.6,4.6)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.3,4;3.6,4.6)|(3.804,4.285;3.9,3.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.3,4;3.6,4.6)</value>
    </values>
   </item>
   <item>
@@ -317,6 +221,18 @@ From snapped input</description>
     <value>edge-pair: (4.266,4.733;5.1,4.9)|(5.3,4.9;5.2,4.2)</value>
    </values>
   </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.2,4.2;5,4.2)|(4.138,4.708;5.1,4.9)</value>
+   </values>
+  </item>
   <item>
    <tags/>
    <category>w1um</category>
@@ -329,6 +245,90 @@ From snapped input</description>
     <value>edge-pair: (5,4.2;3.804,4.285)|(3.6,4.6;5.1,4.9)</value>
    </values>
   </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.6,4.6;4.408,4.762)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.1,4.9;5.3,4.9)|(5.3,4.9;5.2,4.2)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.2,4.2;5,4.2)|(5.1,4.9;5.3,4.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5,4.2;4.343,4.247)|(5.1,4.9;5.3,4.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.804,4.285;3.9,3.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (2.1,3;2.1,3.6)|(2.9,3.6;2.9,3)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (2.9,3;2.1,3)|(2.1,3.6;2.9,3.6)</value>
+   </values>
+  </item>
   <item>
    <tags/>
    <category>w1um</category>
@@ -413,6 +413,90 @@ From snapped input</description>
     <value>polygon: (0,0;0,1.6;0.4,1.6;0.4,0)</value>
    </values>
   </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.467,4.2;3.6,4.6)|(4.521,4.2;3.8,4.2)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.4,4;3.55,4.45)|(3.8,4.2;4,4)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.4,4;3.6,4.6)|(4,4;3.4,4)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (4.314,4.778;5.2,5)|(5.4,5;5.2,4.2)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.2,4.2;3.8,4.2)|(3.6,4.6;5.2,5)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (4,4;3.4,4)|(3.6,4.6;4.547,4.837)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.2,5;5.4,5)|(5.4,5;5.2,4.2)</value>
+   </values>
+  </item>
   <item>
    <tags/>
    <category>w1um_snapped</category>
@@ -446,79 +530,7 @@ From snapped input</description>
    <comment/>
    <image/>
    <values>
-    <value>edge-pair: (5.2,5;5.4,5)|(5.4,5;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4,4;3.4,4)|(3.6,4.6;4.547,4.837)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;3.8,4.2)|(3.6,4.6;5.2,5)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.314,4.778;5.2,5)|(5.4,5;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.4,4;3.6,4.6)|(4,4;3.4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.4,4;3.55,4.45)|(3.8,4.2;4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.467,4.2;3.6,4.6)|(4.521,4.2;3.8,4.2)</value>
+    <value>edge-pair: (2.2,3;2.2,3.6)|(3,3.6;3,3)</value>
    </values>
   </item>
   <item>
@@ -533,18 +545,6 @@ From snapped input</description>
     <value>edge-pair: (3,3;2.2,3)|(2.2,3.6;3,3.6)</value>
    </values>
   </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.2,3;2.2,3.6)|(3,3.6;3,3)</value>
-   </values>
-  </item>
   <item>
    <tags/>
    <category>w1um_snapped</category>
diff --git a/testdata/drc/drcSimpleTests_au110.lyrdb.2 b/testdata/drc/drcSimpleTests_au110.lyrdb.2
deleted file mode 100644
index 439de7517..000000000
--- a/testdata/drc/drcSimpleTests_au110.lyrdb.2
+++ /dev/null
@@ -1,585 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<report-database>
- <description>Report comment with
-another line</description>
- <original-file/>
- <generator>drc: script='.drc'</generator>
- <top-cell>TOP</top-cell>
- <tags>
- </tags>
- <categories>
-  <category>
-   <name>l1</name>
-   <description>L1 (1/0 sized by x=100nm,y=0)</description>
-   <categories>
-   </categories>
-  </category>
-  <category>
-   <name>w1um</name>
-   <description>w &lt; 1µm
-From sized input</description>
-   <categories>
-   </categories>
-  </category>
-  <category>
-   <name>l1_snapped</name>
-   <description>L1 snapped to 200nm</description>
-   <categories>
-   </categories>
-  </category>
-  <category>
-   <name>w1um_snapped</name>
-   <description>w &lt; 1µm
-From snapped input</description>
-   <categories>
-   </categories>
-  </category>
- </categories>
- <cells>
-  <cell>
-   <name>TOP</name>
-   <variant/>
-   <layout-name/>
-   <references>
-   </references>
-  </cell>
-  <cell>
-   <name>A</name>
-   <variant>r0</variant>
-   <layout-name>A</layout-name>
-   <references>
-    <ref>
-     <parent>TOP</parent>
-     <trans>r0 *1 0.5,1.2</trans>
-    </ref>
-   </references>
-  </cell>
-  <cell>
-   <name>A</name>
-   <variant>r90</variant>
-   <layout-name>A$VAR1</layout-name>
-   <references>
-    <ref>
-     <parent>TOP</parent>
-     <trans>r270 *1 2,2</trans>
-    </ref>
-   </references>
-  </cell>
-  <cell>
-   <name>A</name>
-   <variant>r0;r0(-0.1,0)</variant>
-   <layout-name>A</layout-name>
-   <references>
-    <ref>
-     <parent>TOP</parent>
-     <trans>r0 *1 0.5,1.2</trans>
-    </ref>
-   </references>
-  </cell>
-  <cell>
-   <name>A</name>
-   <variant>r0;r0</variant>
-   <layout-name>A$VAR1$1</layout-name>
-   <references>
-    <ref>
-     <parent>TOP</parent>
-     <trans>r0 *1 1.2,1.2</trans>
-    </ref>
-   </references>
-  </cell>
- </cells>
- <items>
-  <item>
-   <tags/>
-   <category>l1</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (3.7,3.9;3.3,4;3.6,4.6;5.1,4.9;5.3,4.9;5.2,4.2;5,4.2;3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>l1</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (2.1,3;2.1,3.6;2.9,3.6;2.9,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>l1</category>
-   <cell>A:r0</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (-0.1,0;-0.1,1.6;0.3,1.6;0.3,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>l1</category>
-   <cell>A:r90</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (0,-0.1;0,1.7;0.2,1.7;0.2,-0.1)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(4.138,4.708;5.1,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.7,3.9;3.3,4)|(3.3,4;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.3,4;3.6,4.6)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.7,3.9;3.3,4)|(3.6,4.6;4.256,4.731)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.53,4.233;3.804,4.285)|(3.455,4.31;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.266,4.733;5.1,4.9)|(5.3,4.9;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5,4.2;3.804,4.285)|(3.6,4.6;5.1,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.3,4;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.6,4.6;4.408,4.762)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.1,4.9;5.3,4.9)|(5.3,4.9;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.7,3.9;3.3,4)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5,4.2;4.343,4.247)|(5.1,4.9;5.3,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(5.1,4.9;5.3,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.1,3;2.1,3.6)|(2.9,3.6;2.9,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.9,3;2.1,3)|(2.1,3.6;2.9,3.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>A:r0</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (-0.1,0;-0.1,1.6)|(0.3,1.6;0.3,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>A:r90</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (0,-0.1;0,1.7)|(0.2,1.7;0.2,-0.1)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>l1_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (3.4,4;3.6,4.6;5.2,5;5.4,5;5.2,4.2;3.8,4.2;4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>l1_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (2.2,3;2.2,3.6;3,3.6;3,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>l1_snapped</category>
-   <cell>A:r0;r0(-0.1,0)</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (-0.1,0;-0.1,1.6;0.3,1.6;0.3,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>l1_snapped</category>
-   <cell>A:r90</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (0,0;0,1.8;0.2,1.8;0.2,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>l1_snapped</category>
-   <cell>A:r0;r0</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (0,0;0,1.6;0.4,1.6;0.4,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;4.6,4.2)|(5.2,5;5.4,5)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4,4;3.4,4)|(3.8,4.2;4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,5;5.4,5)|(5.4,5;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4,4;3.4,4)|(3.6,4.6;4.547,4.837)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;3.8,4.2)|(3.6,4.6;5.2,5)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.314,4.778;5.2,5)|(5.4,5;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.4,4;3.6,4.6)|(4,4;3.4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.4,4;3.55,4.45)|(3.8,4.2;4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.467,4.2;3.6,4.6)|(4.521,4.2;3.8,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3,3;2.2,3)|(2.2,3.6;3,3.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.2,3;2.2,3.6)|(3,3.6;3,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>A:r0;r0(-0.1,0)</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (-0.1,0;-0.1,1.6)|(0.3,1.6;0.3,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>A:r90</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (0,0;0,1.8)|(0.2,1.8;0.2,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>A:r0;r0</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (0,0;0,1.6)|(0.4,1.6;0.4,0)</value>
-   </values>
-  </item>
- </items>
-</report-database>
diff --git a/testdata/drc/drcSimpleTests_au111.lyrdb.1 b/testdata/drc/drcSimpleTests_au111.lyrdb
similarity index 100%
rename from testdata/drc/drcSimpleTests_au111.lyrdb.1
rename to testdata/drc/drcSimpleTests_au111.lyrdb
index 63a47e6f0..37d05841c 100644
--- a/testdata/drc/drcSimpleTests_au111.lyrdb.1
+++ b/testdata/drc/drcSimpleTests_au111.lyrdb
@@ -162,78 +162,6 @@ From sized input</description>
     <value>polygon: (0,-0.1;0,1.7;0.2,1.7;0.2,-0.1)</value>
    </values>
   </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.1,4.9;5.3,4.9)|(5.3,4.9;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.6,4.6;4.408,4.762)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.3,4;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(4.138,4.708;5.1,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.9,3;2.1,3)|(2.1,3.6;2.9,3.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
   <item>
    <tags/>
    <category>w1um</category>
@@ -246,18 +174,6 @@ From sized input</description>
     <value>edge-pair: (3.7,3.9;3.3,4)|(3.3,4;3.6,4.6)</value>
    </values>
   </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.3,4;3.6,4.6)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
   <item>
    <tags/>
    <category>w1um</category>
@@ -270,42 +186,6 @@ From sized input</description>
     <value>edge-pair: (3.7,3.9;3.3,4)|(3.6,4.6;4.256,4.731)</value>
    </values>
   </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.53,4.233;3.804,4.285)|(3.455,4.31;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.1,3;2.1,3.6)|(2.9,3.6;2.9,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(5.1,4.9;5.3,4.9)</value>
-   </values>
-  </item>
   <item>
    <tags/>
    <category>w1um</category>
@@ -327,7 +207,31 @@ From sized input</description>
    <comment/>
    <image/>
    <values>
-    <value>edge-pair: (5,4.2;4.343,4.247)|(5.1,4.9;5.3,4.9)</value>
+    <value>edge-pair: (4.53,4.233;3.804,4.285)|(3.455,4.31;3.6,4.6)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.3,4;3.6,4.6)|(3.804,4.285;3.9,3.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.3,4;3.6,4.6)</value>
    </values>
   </item>
   <item>
@@ -342,6 +246,18 @@ From sized input</description>
     <value>edge-pair: (4.266,4.733;5.1,4.9)|(5.3,4.9;5.2,4.2)</value>
    </values>
   </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.2,4.2;5,4.2)|(4.138,4.708;5.1,4.9)</value>
+   </values>
+  </item>
   <item>
    <tags/>
    <category>w1um</category>
@@ -354,6 +270,90 @@ From sized input</description>
     <value>edge-pair: (5,4.2;3.804,4.285)|(3.6,4.6;5.1,4.9)</value>
    </values>
   </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.6,4.6;4.408,4.762)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.1,4.9;5.3,4.9)|(5.3,4.9;5.2,4.2)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.2,4.2;5,4.2)|(5.1,4.9;5.3,4.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5,4.2;4.343,4.247)|(5.1,4.9;5.3,4.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.804,4.285;3.9,3.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (2.1,3;2.1,3.6)|(2.9,3.6;2.9,3)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (2.9,3;2.1,3)|(2.1,3.6;2.9,3.6)</value>
+   </values>
+  </item>
   <item>
    <tags/>
    <category>w1um</category>
diff --git a/testdata/drc/drcSimpleTests_au111.lyrdb.2 b/testdata/drc/drcSimpleTests_au111.lyrdb.2
deleted file mode 100644
index 20d7799e5..000000000
--- a/testdata/drc/drcSimpleTests_au111.lyrdb.2
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<report-database>
- <description>Report comment with
-another line</description>
- <original-file/>
- <generator>drc: script='.drc'</generator>
- <top-cell>TOP</top-cell>
- <tags>
- </tags>
- <categories>
-  <category>
-   <name>input</name>
-   <description/>
-   <categories>
-    <category>
-     <name>L1</name>
-     <description>Original layer</description>
-     <categories>
-     </categories>
-    </category>
-    <category>
-     <name>L1S</name>
-     <description>Sized original layer</description>
-     <categories>
-     </categories>
-    </category>
-   </categories>
-  </category>
-  <category>
-   <name>w1um</name>
-   <description>w &lt; 1µm
-From sized input</description>
-   <categories>
-   </categories>
-  </category>
- </categories>
- <cells>
-  <cell>
-   <name>TOP</name>
-   <variant/>
-   <layout-name/>
-   <references>
-   </references>
-  </cell>
-  <cell>
-   <name>A</name>
-   <variant>r0</variant>
-   <layout-name>A</layout-name>
-   <references>
-    <ref>
-     <parent>TOP</parent>
-     <trans>r0 *1 0.5,1.2</trans>
-    </ref>
-   </references>
-  </cell>
-  <cell>
-   <name>A</name>
-   <variant>r90</variant>
-   <layout-name>A$VAR1</layout-name>
-   <references>
-    <ref>
-     <parent>TOP</parent>
-     <trans>r270 *1 2,2</trans>
-    </ref>
-   </references>
-  </cell>
- </cells>
- <items>
-  <item>
-   <tags/>
-   <category>input.L1</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (3.8,3.9;3.4,4;3.7,4.6;5.2,4.9;5.1,4.2;3.7,4.3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>input.L1</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (2.2,3;2.2,3.6;2.8,3.6;2.8,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>input.L1</category>
-   <cell>A:r0</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (0,0;0,1.6;0.2,1.6;0.2,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>input.L1</category>
-   <cell>A:r90</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (0,0;0,1.6;0.2,1.6;0.2,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>input.L1S</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (3.7,3.9;3.3,4;3.6,4.6;5.1,4.9;5.3,4.9;5.2,4.2;5,4.2;3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>input.L1S</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (2.1,3;2.1,3.6;2.9,3.6;2.9,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>input.L1S</category>
-   <cell>A:r0</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (-0.1,0;-0.1,1.6;0.3,1.6;0.3,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>input.L1S</category>
-   <cell>A:r90</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (0,-0.1;0,1.7;0.2,1.7;0.2,-0.1)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(4.138,4.708;5.1,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.7,3.9;3.3,4)|(3.3,4;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.3,4;3.6,4.6)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.7,3.9;3.3,4)|(3.6,4.6;4.256,4.731)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.53,4.233;3.804,4.285)|(3.455,4.31;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.266,4.733;5.1,4.9)|(5.3,4.9;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5,4.2;3.804,4.285)|(3.6,4.6;5.1,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.3,4;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.6,4.6;4.408,4.762)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.1,4.9;5.3,4.9)|(5.3,4.9;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.7,3.9;3.3,4)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5,4.2;4.343,4.247)|(5.1,4.9;5.3,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(5.1,4.9;5.3,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.1,3;2.1,3.6)|(2.9,3.6;2.9,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.9,3;2.1,3)|(2.1,3.6;2.9,3.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>A:r0</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (-0.1,0;-0.1,1.6)|(0.3,1.6;0.3,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um</category>
-   <cell>A:r90</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (0,-0.1;0,1.7)|(0.2,1.7;0.2,-0.1)</value>
-   </values>
-  </item>
- </items>
-</report-database>
diff --git a/testdata/drc/drcSimpleTests_au112.lyrdb.1 b/testdata/drc/drcSimpleTests_au112.lyrdb
similarity index 100%
rename from testdata/drc/drcSimpleTests_au112.lyrdb.1
rename to testdata/drc/drcSimpleTests_au112.lyrdb
index 5a2297a78..33b59bf2b 100644
--- a/testdata/drc/drcSimpleTests_au112.lyrdb.1
+++ b/testdata/drc/drcSimpleTests_au112.lyrdb
@@ -147,78 +147,6 @@ From snapped input</description>
     <value>polygon: (0,-0.1;0,1.7;0.2,1.7;0.2,-0.1)</value>
    </values>
   </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment>First item von w1um</comment>
-   <image/>
-   <values>
-    <value>edge-pair: (5.1,4.9;5.3,4.9)|(5.3,4.9;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.6,4.6;4.408,4.762)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.3,4;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(4.138,4.708;5.1,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.9,3;2.1,3)|(2.1,3.6;2.9,3.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
   <item>
    <tags>waived</tags>
    <category>w1um</category>
@@ -231,18 +159,6 @@ From snapped input</description>
     <value>edge-pair: (3.7,3.9;3.3,4)|(3.3,4;3.6,4.6)</value>
    </values>
   </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.3,4;3.6,4.6)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
   <item>
    <tags>waived</tags>
    <category>w1um</category>
@@ -255,42 +171,6 @@ From snapped input</description>
     <value>edge-pair: (3.7,3.9;3.3,4)|(3.6,4.6;4.256,4.731)</value>
    </values>
   </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.53,4.233;3.804,4.285)|(3.455,4.31;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.1,3;2.1,3.6)|(2.9,3.6;2.9,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(5.1,4.9;5.3,4.9)</value>
-   </values>
-  </item>
   <item>
    <tags>waived</tags>
    <category>w1um</category>
@@ -312,7 +192,31 @@ From snapped input</description>
    <comment/>
    <image/>
    <values>
-    <value>edge-pair: (5,4.2;4.343,4.247)|(5.1,4.9;5.3,4.9)</value>
+    <value>edge-pair: (4.53,4.233;3.804,4.285)|(3.455,4.31;3.6,4.6)</value>
+   </values>
+  </item>
+  <item>
+   <tags>waived</tags>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.3,4;3.6,4.6)|(3.804,4.285;3.9,3.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags>waived</tags>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.3,4;3.6,4.6)</value>
    </values>
   </item>
   <item>
@@ -327,6 +231,18 @@ From snapped input</description>
     <value>edge-pair: (4.266,4.733;5.1,4.9)|(5.3,4.9;5.2,4.2)</value>
    </values>
   </item>
+  <item>
+   <tags>waived</tags>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.2,4.2;5,4.2)|(4.138,4.708;5.1,4.9)</value>
+   </values>
+  </item>
   <item>
    <tags>waived</tags>
    <category>w1um</category>
@@ -339,6 +255,90 @@ From snapped input</description>
     <value>edge-pair: (5,4.2;3.804,4.285)|(3.6,4.6;5.1,4.9)</value>
    </values>
   </item>
+  <item>
+   <tags>waived</tags>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.6,4.6;4.408,4.762)</value>
+   </values>
+  </item>
+  <item>
+   <tags>waived</tags>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment>First item von w1um</comment>
+   <image/>
+   <values>
+    <value>edge-pair: (5.1,4.9;5.3,4.9)|(5.3,4.9;5.2,4.2)</value>
+   </values>
+  </item>
+  <item>
+   <tags>waived</tags>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.2,4.2;5,4.2)|(5.1,4.9;5.3,4.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags>waived</tags>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5,4.2;4.343,4.247)|(5.1,4.9;5.3,4.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags>waived</tags>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.804,4.285;3.9,3.9)</value>
+   </values>
+  </item>
+  <item>
+   <tags>waived</tags>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (2.1,3;2.1,3.6)|(2.9,3.6;2.9,3)</value>
+   </values>
+  </item>
+  <item>
+   <tags>waived</tags>
+   <category>w1um</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (2.9,3;2.1,3)|(2.1,3.6;2.9,3.6)</value>
+   </values>
+  </item>
   <item>
    <tags>waived</tags>
    <category>w1um</category>
@@ -423,6 +423,90 @@ From snapped input</description>
     <value>polygon: (0,0;0,1.6;0.4,1.6;0.4,0)</value>
    </values>
   </item>
+  <item>
+   <tags>waived</tags>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.467,4.2;3.6,4.6)|(4.521,4.2;3.8,4.2)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.4,4;3.55,4.45)|(3.8,4.2;4,4)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (3.4,4;3.6,4.6)|(4,4;3.4,4)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (4.314,4.778;5.2,5)|(5.4,5;5.2,4.2)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.2,4.2;3.8,4.2)|(3.6,4.6;5.2,5)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (4,4;3.4,4)|(3.6,4.6;4.547,4.837)</value>
+   </values>
+  </item>
+  <item>
+   <tags/>
+   <category>w1um_snapped</category>
+   <cell>TOP</cell>
+   <visited>false</visited>
+   <multiplicity>1</multiplicity>
+   <comment/>
+   <image/>
+   <values>
+    <value>edge-pair: (5.2,5;5.4,5)|(5.4,5;5.2,4.2)</value>
+   </values>
+  </item>
   <item>
    <tags/>
    <category>w1um_snapped</category>
@@ -456,79 +540,7 @@ From snapped input</description>
    <comment/>
    <image/>
    <values>
-    <value>edge-pair: (5.2,5;5.4,5)|(5.4,5;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4,4;3.4,4)|(3.6,4.6;4.547,4.837)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;3.8,4.2)|(3.6,4.6;5.2,5)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.314,4.778;5.2,5)|(5.4,5;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.4,4;3.6,4.6)|(4,4;3.4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.4,4;3.55,4.45)|(3.8,4.2;4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.467,4.2;3.6,4.6)|(4.521,4.2;3.8,4.2)</value>
+    <value>edge-pair: (2.2,3;2.2,3.6)|(3,3.6;3,3)</value>
    </values>
   </item>
   <item>
@@ -543,18 +555,6 @@ From snapped input</description>
     <value>edge-pair: (3,3;2.2,3)|(2.2,3.6;3,3.6)</value>
    </values>
   </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.2,3;2.2,3.6)|(3,3.6;3,3)</value>
-   </values>
-  </item>
   <item>
    <tags/>
    <category>w1um_snapped</category>
diff --git a/testdata/drc/drcSimpleTests_au112.lyrdb.2 b/testdata/drc/drcSimpleTests_au112.lyrdb.2
deleted file mode 100644
index 5c9191829..000000000
--- a/testdata/drc/drcSimpleTests_au112.lyrdb.2
+++ /dev/null
@@ -1,596 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<report-database>
- <description>Report comment with
-another line</description>
- <original-file/>
- <generator>drc: script='.drc'</generator>
- <top-cell>TOP</top-cell>
- <tags>
-  <tag>
-   <name>waived</name>
-   <description/>
-  </tag>
- </tags>
- <categories>
-  <category>
-   <name>inputs</name>
-   <description/>
-   <categories>
-    <category>
-     <name>l1</name>
-     <description>L1 (1/0 sized by x=100nm,y=0)</description>
-     <categories>
-     </categories>
-    </category>
-    <category>
-     <name>l1_snapped</name>
-     <description>L1 snapped to 200nm</description>
-     <categories>
-     </categories>
-    </category>
-   </categories>
-  </category>
-  <category>
-   <name>w1um</name>
-   <description>w &lt; 1µm
-Another line</description>
-   <categories>
-   </categories>
-  </category>
-  <category>
-   <name>w1um_snapped</name>
-   <description>w &lt; 1µm
-From snapped input</description>
-   <categories>
-   </categories>
-  </category>
- </categories>
- <cells>
-  <cell>
-   <name>TOP</name>
-   <variant/>
-   <layout-name/>
-   <references>
-   </references>
-  </cell>
-  <cell>
-   <name>A</name>
-   <variant>r0</variant>
-   <layout-name>A</layout-name>
-   <references>
-    <ref>
-     <parent>TOP</parent>
-     <trans>r0 *1 0.5,1.2</trans>
-    </ref>
-   </references>
-  </cell>
-  <cell>
-   <name>A</name>
-   <variant>r90</variant>
-   <layout-name>A$VAR1</layout-name>
-   <references>
-    <ref>
-     <parent>TOP</parent>
-     <trans>r270 *1 2,2</trans>
-    </ref>
-   </references>
-  </cell>
-  <cell>
-   <name>A</name>
-   <variant>r0;r0(-0.1,0)</variant>
-   <layout-name>A</layout-name>
-   <references>
-    <ref>
-     <parent>TOP</parent>
-     <trans>r0 *1 0.5,1.2</trans>
-    </ref>
-   </references>
-  </cell>
-  <cell>
-   <name>A</name>
-   <variant>r0;r0</variant>
-   <layout-name>A$VAR1$1</layout-name>
-   <references>
-    <ref>
-     <parent>TOP</parent>
-     <trans>r0 *1 1.2,1.2</trans>
-    </ref>
-   </references>
-  </cell>
- </cells>
- <items>
-  <item>
-   <tags/>
-   <category>inputs.l1</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (3.7,3.9;3.3,4;3.6,4.6;5.1,4.9;5.3,4.9;5.2,4.2;5,4.2;3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>inputs.l1</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (2.1,3;2.1,3.6;2.9,3.6;2.9,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>inputs.l1</category>
-   <cell>A:r0</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (-0.1,0;-0.1,1.6;0.3,1.6;0.3,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>inputs.l1</category>
-   <cell>A:r90</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (0,-0.1;0,1.7;0.2,1.7;0.2,-0.1)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(4.138,4.708;5.1,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.7,3.9;3.3,4)|(3.3,4;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.3,4;3.6,4.6)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.7,3.9;3.3,4)|(3.6,4.6;4.256,4.731)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.53,4.233;3.804,4.285)|(3.455,4.31;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.266,4.733;5.1,4.9)|(5.3,4.9;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5,4.2;3.804,4.285)|(3.6,4.6;5.1,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.3,4;3.6,4.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.9,3.9;3.7,3.9)|(3.6,4.6;4.408,4.762)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment>First item von w1um</comment>
-   <image/>
-   <values>
-    <value>edge-pair: (5.1,4.9;5.3,4.9)|(5.3,4.9;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.7,3.9;3.3,4)|(3.804,4.285;3.9,3.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5,4.2;4.343,4.247)|(5.1,4.9;5.3,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;5,4.2)|(5.1,4.9;5.3,4.9)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.1,3;2.1,3.6)|(2.9,3.6;2.9,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.9,3;2.1,3)|(2.1,3.6;2.9,3.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>A:r0</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (-0.1,0;-0.1,1.6)|(0.3,1.6;0.3,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um</category>
-   <cell>A:r90</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (0,-0.1;0,1.7)|(0.2,1.7;0.2,-0.1)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>inputs.l1_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (3.4,4;3.6,4.6;5.2,5;5.4,5;5.2,4.2;3.8,4.2;4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>inputs.l1_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (2.2,3;2.2,3.6;3,3.6;3,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>inputs.l1_snapped</category>
-   <cell>A:r0;r0(-0.1,0)</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment>A comment on the only waived input shape</comment>
-   <image/>
-   <values>
-    <value>polygon: (-0.1,0;-0.1,1.6;0.3,1.6;0.3,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>inputs.l1_snapped</category>
-   <cell>A:r90</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (0,0;0,1.8;0.2,1.8;0.2,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>inputs.l1_snapped</category>
-   <cell>A:r0;r0</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>polygon: (0,0;0,1.6;0.4,1.6;0.4,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;4.6,4.2)|(5.2,5;5.4,5)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4,4;3.4,4)|(3.8,4.2;4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,5;5.4,5)|(5.4,5;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4,4;3.4,4)|(3.6,4.6;4.547,4.837)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (5.2,4.2;3.8,4.2)|(3.6,4.6;5.2,5)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (4.314,4.778;5.2,5)|(5.4,5;5.2,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.4,4;3.6,4.6)|(4,4;3.4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.4,4;3.55,4.45)|(3.8,4.2;4,4)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3.467,4.2;3.6,4.6)|(4.521,4.2;3.8,4.2)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (3,3;2.2,3)|(2.2,3.6;3,3.6)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>TOP</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (2.2,3;2.2,3.6)|(3,3.6;3,3)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>A:r0;r0(-0.1,0)</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (-0.1,0;-0.1,1.6)|(0.3,1.6;0.3,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags>waived</tags>
-   <category>w1um_snapped</category>
-   <cell>A:r90</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment/>
-   <image/>
-   <values>
-    <value>edge-pair: (0,0;0,1.8)|(0.2,1.8;0.2,0)</value>
-   </values>
-  </item>
-  <item>
-   <tags/>
-   <category>w1um_snapped</category>
-   <cell>A:r0;r0</cell>
-   <visited>false</visited>
-   <multiplicity>1</multiplicity>
-   <comment>A comment
-With two lines</comment>
-   <image/>
-   <values>
-    <value>edge-pair: (0,0;0,1.6)|(0.4,1.6;0.4,0)</value>
-   </values>
-  </item>
- </items>
-</report-database>