diff --git a/tests/board_samples/kicad_7/bom.kicad_pcb b/tests/board_samples/kicad_7/bom.kicad_pcb
index 03317e13..0636ef99 100644
--- a/tests/board_samples/kicad_7/bom.kicad_pcb
+++ b/tests/board_samples/kicad_7/bom.kicad_pcb
@@ -75,47 +75,47 @@
   (footprint "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005ebea01d)
     (at 146.3 78.6)
-    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor")
     (path "/00000000-0000-0000-0000-00005ebe91ac")
     (attr smd)
     (fp_text reference "C1" (at 0 -1.65) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp c974f755-f11c-4e72-9337-9b1b03ad46d6)
+      (tstamp 5156832d-3a20-4910-ada3-43f11349a620)
     )
     (fp_text value "1uF" (at 0 1.65) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 2b79ad18-d7d7-43df-ab38-e75b2da12556)
+      (tstamp 7d830e9e-ca8d-405c-9522-5a97f348cbb9)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
         (effects (font (size 0.5 0.5) (thickness 0.08)))
-      (tstamp 5db96da7-af8d-43d8-8dc7-a398bfc8659a)
+      (tstamp 72c04459-1877-4921-bfa8-dfb948d362ef)
     )
-    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3076b8ca-409a-4abb-8543-19f45b2d32e7))
-    (fp_line (start -0.258578 0.71) (end 0.258578 0.71)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a32b7c78-669e-4058-9e8f-159773d391d1))
-    (fp_line (start -1.68 -0.95) (end 1.68 -0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e610961e-a821-4b86-8c7d-d4cb27796910))
-    (fp_line (start -1.68 0.95) (end -1.68 -0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5298dbf1-ff20-463f-b22f-955b234f027b))
-    (fp_line (start 1.68 -0.95) (end 1.68 0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5ee42af7-ef65-46ec-93e1-21c0e6077de0))
-    (fp_line (start 1.68 0.95) (end -1.68 0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9aaa51e5-eb42-4e37-9164-e5b31a4cd652))
-    (fp_line (start -1 -0.6) (end 1 -0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8367eaee-e0ca-41eb-bc30-e532a8b59fdd))
-    (fp_line (start -1 0.6) (end -1 -0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1ffd0374-60f5-4975-8863-7ed9f29dac0e))
-    (fp_line (start 1 -0.6) (end 1 0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 26a053d6-55aa-4839-adb7-568fd5c066bb))
-    (fp_line (start 1 0.6) (end -1 0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e3a76526-d318-4ed9-8120-844abbdc3456))
-    (pad "1" smd roundrect (at -0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 2 "Net-(C1-Pad1)") (tstamp 34fb9d00-02b1-48b3-a790-0112e6a08449))
-    (pad "2" smd roundrect (at 0.9375 0) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1 "GND") (tstamp 0336c0d4-c4f4-4020-8380-287f839c852a))
-    (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.step"
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 02b7d92a-22cd-4459-9dcd-2ce5b807e2d9))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3981a3b9-cfcb-4bfb-a958-293365d7c877))
+    (fp_line (start -1.7 -0.98) (end 1.7 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3f61b978-781f-4d12-ba66-c6f14af48752))
+    (fp_line (start -1.7 0.98) (end -1.7 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp df481dfa-4060-413b-8134-0ac2115807fc))
+    (fp_line (start 1.7 -0.98) (end 1.7 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4f1195c5-11d6-4c13-a19f-c0b92d6aa5bf))
+    (fp_line (start 1.7 0.98) (end -1.7 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0a39b0eb-a969-442a-b9b2-26bc41e3156d))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4be95788-4e3c-4fcc-8dcb-5cdb6e15d6f2))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fe2c02ea-d0f9-4f3c-b111-2105791284db))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5ac523cb-ca8a-4a4a-949c-5d679fa0fa98))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7249fa99-227d-4874-8854-5ba766a0e81c))
+    (pad "1" smd roundrect (at -0.95 0) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 2 "Net-(C1-Pad1)") (tstamp 47093265-53bc-49ef-8aae-af52cab37285))
+    (pad "2" smd roundrect (at 0.95 0) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
+      (net 1 "GND") (tstamp b1f3d5f2-cf1a-4ecc-bd0f-375f4d72d1a8))
+    (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -125,47 +125,47 @@
   (footprint "Resistor_SMD:R_0805_2012Metric" (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005ebea02e)
     (at 146.3 81.55 180)
-    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor")
     (path "/00000000-0000-0000-0000-00005ebe8a2e")
     (attr smd)
     (fp_text reference "R1" (at 0 -1.65) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 7ef0f81b-f6e6-4f07-b717-38c4b1e50a5e)
+      (tstamp 1053aaea-fc19-4eee-914d-f959e8cc40e4)
     )
     (fp_text value "100" (at 0 1.65) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 8cd4eec9-ceb5-4b8f-83f2-9a146ee7ddd5)
+      (tstamp 63394e16-a998-492a-a7e7-99e409d94829)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
         (effects (font (size 0.5 0.5) (thickness 0.08)))
-      (tstamp 93acb41a-3723-4469-9dee-a34acc325774)
+      (tstamp 84210d8a-2ec3-4adf-9330-88113d389e5d)
     )
-    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 39441d2f-6110-4320-92bb-88f09b0de90b))
-    (fp_line (start -0.258578 0.71) (end 0.258578 0.71)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ae28541a-0239-4867-9639-a73e46808278))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f0302ab2-5bf2-4f8e-87bc-054eaf7e87ca))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f9e6a748-139b-436a-8bb7-0a36ea4aa8b2))
     (fp_line (start -1.68 -0.95) (end 1.68 -0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 91e75b42-fb6a-4a6b-be78-4013b6183b9a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 77c11789-e4da-4263-939d-2f9780c7d1a3))
     (fp_line (start -1.68 0.95) (end -1.68 -0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c76bc75f-8181-4476-9973-7173e45c68ed))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fa53ad7c-8da0-472e-bc80-ff2cb5e9801a))
     (fp_line (start 1.68 -0.95) (end 1.68 0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 752a50bd-195a-4ad5-acdb-d18c11a301e4))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp db6a1a12-d325-4052-9471-0f7f586cc979))
     (fp_line (start 1.68 0.95) (end -1.68 0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 757c5363-13ba-436b-9db8-e5dc02596d27))
-    (fp_line (start -1 -0.6) (end 1 -0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 337d7915-43e4-4835-8aab-ff527c0de866))
-    (fp_line (start -1 0.6) (end -1 -0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fe5b7a7b-9594-494a-8fe7-df5ac5e9fd07))
-    (fp_line (start 1 -0.6) (end 1 0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ba9a410d-1c13-461f-b6a8-eeb7c4c46e58))
-    (fp_line (start 1 0.6) (end -1 0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 656d7de6-1e65-4eb7-8002-7e680bef80b9))
-    (pad "1" smd roundrect (at -0.9375 0 180) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 3 "VCC") (tstamp ee158b8c-0101-4c4c-b5ce-76e87c497fb9))
-    (pad "2" smd roundrect (at 0.9375 0 180) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 2 "Net-(C1-Pad1)") (tstamp b67e7460-96bc-4aa0-8593-880eb3320d89))
-    (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metrico.step"
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b80fa6a3-f5c0-4c5b-8461-ff0ec4b41b7d))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3a9a2d79-17e3-44b5-8172-197d4bacecc2))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 584b1607-1683-4d9d-a463-166798a8f09f))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fa46cddb-5e63-441b-a52c-34e3063d1cc7))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 21918345-a3a1-4d20-b002-9b270582362f))
+    (pad "1" smd roundrect (at -0.9125 0 180) (size 1.025 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.243902)
+      (net 3 "VCC") (tstamp ca5dee75-0100-4e80-9909-6f982562aed0))
+    (pad "2" smd roundrect (at 0.9125 0 180) (size 1.025 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.243902)
+      (net 2 "Net-(C1-Pad1)") (tstamp 2eaaa66f-26c8-4f24-a908-203ddfbb8a05))
+    (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -175,47 +175,47 @@
   (footprint "Resistor_SMD:R_0805_2012Metric" (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005ebea03f)
     (at 150.71 78.6 180)
-    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
+    (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor")
     (path "/00000000-0000-0000-0000-00005ebe8e9e")
     (attr smd)
     (fp_text reference "R2" (at 0 -1.65) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 9d088aec-c53e-413e-8715-779a6ee7e407)
+      (tstamp 0ab00bc7-ccce-4c58-b197-9e23eae9c42a)
     )
     (fp_text value "200" (at 0 1.65) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp abf3504c-c638-4bb0-8898-7b38d0241a11)
+      (tstamp 8c63214b-9b01-41a2-a5ec-dc9bc79be652)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
         (effects (font (size 0.5 0.5) (thickness 0.08)))
-      (tstamp 730e1bed-bd81-4343-85e9-17d6a47cb046)
+      (tstamp 0db3ec9b-2c95-4019-8e43-4e3047b0581b)
     )
-    (fp_line (start -0.258578 -0.71) (end 0.258578 -0.71)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7613df36-4992-4dd5-b97e-1f17e43e73c6))
-    (fp_line (start -0.258578 0.71) (end 0.258578 0.71)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b6f74bca-cdeb-4109-905d-6a81777da69b))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 73cc7935-382d-427f-9ae7-c1549626bf35))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4fa77920-15f8-478a-88fd-53ad3a3f1721))
     (fp_line (start -1.68 -0.95) (end 1.68 -0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ee5f10ba-08e8-4cb5-8185-dae7f54c20a3))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9f0372c1-ae1f-458e-90f4-eaafc0f34623))
     (fp_line (start -1.68 0.95) (end -1.68 -0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0e6314c1-5679-49cb-898a-296f9477855a))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8add9f1f-34dc-474e-8e5a-658ad85335ca))
     (fp_line (start 1.68 -0.95) (end 1.68 0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ea59c7f6-51a1-4630-b89e-075386e527c9))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ecd7ddf4-d72e-4029-b6bd-c9a995efd2a7))
     (fp_line (start 1.68 0.95) (end -1.68 0.95)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 434bf54a-a88a-45dc-a569-a0a5b81a7096))
-    (fp_line (start -1 -0.6) (end 1 -0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 608be37a-af03-4e73-9e8e-c1bb3353eaf4))
-    (fp_line (start -1 0.6) (end -1 -0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5c2f40eb-308c-4cc2-9669-44b6645a7910))
-    (fp_line (start 1 -0.6) (end 1 0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a384a468-0937-4800-9a3b-e63b6186898c))
-    (fp_line (start 1 0.6) (end -1 0.6)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dc5732f3-4764-4a19-a8e3-24308ca8b363))
-    (pad "1" smd roundrect (at -0.9375 0 180) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 2 "Net-(C1-Pad1)") (tstamp 55440b89-8f8a-483a-9b2b-9ccc95708f75))
-    (pad "2" smd roundrect (at 0.9375 0 180) (size 0.975 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1 "GND") (tstamp 3d8a4e48-dfd4-4c64-8dd3-885d6a7ed460))
-    (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0805_2012Metric.step"
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f5626507-7dda-44c5-a395-29a1d8820e69))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp db240f13-6a3e-43ef-bc53-58153445ec2d))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fab11f95-6bb3-456c-a864-e484c6d2b654))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bf1cfe02-9ffa-4325-b504-88bc94c1ab05))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0878fabd-4c6f-47fe-bf61-c62c65c2b7ad))
+    (pad "1" smd roundrect (at -0.9125 0 180) (size 1.025 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.243902)
+      (net 2 "Net-(C1-Pad1)") (tstamp c27af2e7-932c-4725-a4cb-98d32e6d6dfe))
+    (pad "2" smd roundrect (at 0.9125 0 180) (size 1.025 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.243902)
+      (net 1 "GND") (tstamp e87e7715-e05d-4071-a657-65eacaab75c4))
+    (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -232,11 +232,9 @@
     (stroke (width 0.05) (type solid)) (layer "Edge.Cuts") (tstamp ea655683-6135-4d3f-a322-1186e1a703b2))
 
   (segment (start 147.2375 78.6) (end 149.7725 78.6) (width 0.25) (layer "F.Cu") (net 1) (tstamp 4ebf58f7-8428-4480-b240-bb7d3c895103))
-  (segment (start 150.62249 77.57499) (end 151.161973 78.114473) (width 0.25) (layer "F.Cu") (net 2) (tstamp 4ed009e2-b8f5-47d8-ba45-e73cbf2524c2))
-  (segment (start 145.3625 78.6) (end 145.3625 79.3) (width 0.25) (layer "F.Cu") (net 2) (tstamp 5505e502-12b2-42b0-9e88-71997ebbcbde))
-  (segment (start 151.161973 78.114473) (end 151.6475 78.6) (width 0.25) (layer "F.Cu") (net 2) (tstamp 5e3899fa-1efc-49c7-bd03-0723e6564f66))
-  (segment (start 145.3625 78.6) (end 146.38751 77.57499) (width 0.25) (layer "F.Cu") (net 2) (tstamp 88b2a9f5-ec07-44cc-be7d-6243af8d21a7))
-  (segment (start 145.3625 79.3) (end 145.3625 81.55) (width 0.25) (layer "F.Cu") (net 2) (tstamp a49ce2ce-5d29-415b-a41f-07567cbabb0f))
-  (segment (start 146.38751 77.57499) (end 150.62249 77.57499) (width 0.25) (layer "F.Cu") (net 2) (tstamp fd90cb38-571b-4f7c-8630-139c123989e3))
+  (segment (start 145.3625 78.6) (end 146.4625 77.5) (width 0.25) (layer "F.Cu") (net 2) (tstamp 094b0da9-055e-4caf-8a61-eb0abbabc6ad))
+  (segment (start 150.5475 77.5) (end 151.6475 78.6) (width 0.25) (layer "F.Cu") (net 2) (tstamp 3ec9ac06-d662-405d-a323-fd037fa00de7))
+  (segment (start 146.4625 77.5) (end 150.5475 77.5) (width 0.25) (layer "F.Cu") (net 2) (tstamp 636a61f2-1871-4e58-a0a3-09c17469dd1e))
+  (segment (start 145.3625 81.55) (end 145.3625 78.6) (width 0.25) (layer "F.Cu") (net 2) (tstamp 88783723-a7d1-470c-aea1-fc38629b827f))
 
 )
diff --git a/tests/reference/7_0_0/bom-F_Cu+F_SilkS.pdf b/tests/reference/7_0_0/bom-F_Cu+F_SilkS.pdf
index c3d60f13..a36d9278 100644
Binary files a/tests/reference/7_0_0/bom-F_Cu+F_SilkS.pdf and b/tests/reference/7_0_0/bom-F_Cu+F_SilkS.pdf differ
diff --git a/tests/reference/7_0_0/bom-F_Cu+F_SilkS.svg b/tests/reference/7_0_0/bom-F_Cu+F_SilkS.svg
index 1bbaaf1e..c7d15a04 100644
--- a/tests/reference/7_0_0/bom-F_Cu+F_SilkS.svg
+++ b/tests/reference/7_0_0/bom-F_Cu+F_SilkS.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="841.889764pt" height="595.275591pt" viewBox="0 0 841.889764 595.275591" version="1.2">
-<g id="surface15132">
+<g id="surface14211">
 <rect x="0" y="0" width="841.889764" height="595.275591" style="fill:rgb(100%,100%,100%);fill-opacity:1;stroke:none;"/>
 <path style="fill:none;stroke-width:113;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(76.078431%,76.078431%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 38269.010417 28910.9375 L 38269.010417 10769.010417 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:113;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(76.078431%,76.078431%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 17859.114583 10769.010417 L 17859.114583 28910.9375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:113;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(76.078431%,76.078431%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 38269.010417 10769.010417 L 17859.114583 10769.010417 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:113;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(76.078431%,76.078431%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 17859.114583 28910.9375 L 38269.010417 28910.9375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 22489.0625 15054.947917 L 23660.9375 15054.947917 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 22489.0625 18275 L 23660.9375 18275 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 23660.9375 24965.104167 L 22489.0625 24965.104167 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 23660.9375 21745.052083 L 22489.0625 21745.052083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 22483.072917 14997.916667 L 23666.927083 14997.916667 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 22483.072917 18332.03125 L 23666.927083 18332.03125 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 23590.104167 25021.875 L 22559.895833 25021.875 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 23590.104167 21688.020833 L 22559.895833 21688.020833 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:340;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 22696.875 27929.947917 L 21940.885417 26850 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:340;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 21401.041667 27929.947917 L 21401.041667 25661.979167 L 22265.104167 25661.979167 L 22480.989583 25770.052083 L 22589.0625 25878.125 L 22696.875 26094.010417 L 22696.875 26417.96875 L 22589.0625 26634.114583 L 22480.989583 26741.927083 L 22265.104167 26850 L 21401.041667 26850 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:340;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24857.03125 27929.947917 L 23560.9375 27929.947917 " transform="matrix(0.015,0,0,0.015,0,0)"/>
@@ -17,47 +17,45 @@
 <path style="fill:none;stroke-width:340;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 22696.875 13540.885417 L 22589.0625 13648.958333 L 22265.104167 13757.03125 L 22048.958333 13757.03125 L 21725 13648.958333 L 21509.114583 13433.072917 L 21401.041667 13216.927083 L 21292.96875 12784.895833 L 21292.96875 12460.9375 L 21401.041667 12028.90625 L 21509.114583 11813.020833 L 21725 11596.875 L 22048.958333 11489.0625 L 22265.104167 11489.0625 L 22589.0625 11596.875 L 22696.875 11704.947917 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:340;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24857.03125 13757.03125 L 23560.9375 13757.03125 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:340;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24209.114583 13757.03125 L 24209.114583 11489.0625 L 23992.96875 11813.020833 L 23777.083333 12028.90625 L 23560.9375 12136.979167 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 33661.979167 18275 L 32489.0625 18275 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 33661.979167 15054.947917 L 32489.0625 15054.947917 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 33590.885417 18332.03125 L 32560.9375 18332.03125 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:272;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 33590.885417 14997.916667 L 32560.9375 14997.916667 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:340;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 32697.916667 21240.104167 L 31941.927083 20159.895833 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:340;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 31402.083333 21240.104167 L 31402.083333 18971.875 L 32265.885417 18971.875 L 32482.03125 19079.947917 L 32590.104167 19188.020833 L 32697.916667 19403.90625 L 32697.916667 19728.125 L 32590.104167 19944.010417 L 32482.03125 20052.083333 L 32265.885417 20159.895833 L 31402.083333 20159.895833 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:340;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(0%,51.764706%,51.764706%);stroke-opacity:1;stroke-miterlimit:10;" d="M 33561.979167 19188.020833 L 33670.052083 19079.947917 L 33885.9375 18971.875 L 34425 18971.875 L 34640.885417 19079.947917 L 34748.958333 19188.020833 L 34857.03125 19403.90625 L 34857.03125 19620.052083 L 34748.958333 19944.010417 L 33453.90625 21240.104167 L 34857.03125 21240.104167 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 <path style="fill:none;stroke-width:567;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 25201.041667 16665.104167 L 30950 16665.104167 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:567;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 32877.083333 14340.885417 L 34101.041667 15564.0625 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:567;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20948.958333 16665.104167 L 20948.958333 18253.125 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:567;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 34101.041667 15564.0625 L 35202.083333 16665.104167 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:567;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20948.958333 16665.104167 L 23272.916667 14340.885417 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:567;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20948.958333 18253.125 L 20948.958333 23354.947917 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:567;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 23272.916667 14340.885417 L 32877.083333 14340.885417 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 305.941406 234.464844 L 322.53125 234.464844 L 322.53125 265.5 L 305.941406 265.5 Z M 305.941406 234.464844 "/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20396.09375 17700 L 21502.083333 17700 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 21502.083333 17700 L 21502.083333 15630.989583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 21502.083333 15630.989583 L 20396.09375 15630.989583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20396.09375 15630.989583 L 20396.09375 17700 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 369.71875 234.464844 L 386.308594 234.464844 L 386.308594 265.5 L 369.71875 265.5 Z M 369.71875 234.464844 "/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24647.916667 17700 L 25753.90625 17700 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 25753.90625 17700 L 25753.90625 15630.989583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 25753.90625 15630.989583 L 24647.916667 15630.989583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24647.916667 15630.989583 L 24647.916667 17700 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 369.71875 334.800781 L 386.308594 334.800781 L 386.308594 365.851562 L 369.71875 365.851562 Z M 369.71875 334.800781 "/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 25753.90625 22320.052083 L 24647.916667 22320.052083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24647.916667 22320.052083 L 24647.916667 24390.104167 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24647.916667 24390.104167 L 25753.90625 24390.104167 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 25753.90625 24390.104167 L 25753.90625 22320.052083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 305.941406 334.800781 L 322.53125 334.800781 L 322.53125 365.851562 L 305.941406 365.851562 Z M 305.941406 334.800781 "/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 21502.083333 22320.052083 L 20396.09375 22320.052083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20396.09375 22320.052083 L 20396.09375 24390.104167 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20396.09375 24390.104167 L 21502.083333 24390.104167 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 21502.083333 24390.104167 L 21502.083333 22320.052083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 519.734375 234.464844 L 536.308594 234.464844 L 536.308594 265.5 L 519.734375 265.5 Z M 519.734375 234.464844 "/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 35753.90625 15630.989583 L 34648.958333 15630.989583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 34648.958333 15630.989583 L 34648.958333 17700 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 34648.958333 17700 L 35753.90625 17700 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 35753.90625 17700 L 35753.90625 15630.989583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 455.953125 234.464844 L 472.53125 234.464844 L 472.53125 265.5 L 455.953125 265.5 Z M 455.953125 234.464844 "/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 31502.083333 15630.989583 L 30396.875 15630.989583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 30396.875 15630.989583 L 30396.875 17700 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 30396.875 17700 L 31502.083333 17700 " transform="matrix(0.015,0,0,0.015,0,0)"/>
-<path style="fill:none;stroke-width:1106;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 31502.083333 17700 L 31502.083333 15630.989583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:567;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20948.958333 16665.104167 L 23444.010417 14171.09375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:567;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 32707.03125 14171.09375 L 35202.083333 16665.104167 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:567;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 23444.010417 14171.09375 L 32707.03125 14171.09375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:567;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20948.958333 23354.947917 L 20948.958333 16665.104167 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 305.308594 233.820312 L 322.320312 233.820312 L 322.320312 266.128906 L 305.308594 266.128906 Z M 305.308594 233.820312 "/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20353.90625 17741.927083 L 21488.020833 17741.927083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 21488.020833 17741.927083 L 21488.020833 15588.020833 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 21488.020833 15588.020833 L 20353.90625 15588.020833 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20353.90625 15588.020833 L 20353.90625 17741.927083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 369.929688 233.820312 L 386.941406 233.820312 L 386.941406 266.128906 L 369.929688 266.128906 Z M 369.929688 233.820312 "/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24661.979167 17741.927083 L 25796.09375 17741.927083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 25796.09375 17741.927083 L 25796.09375 15588.020833 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 25796.09375 15588.020833 L 24661.979167 15588.020833 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24661.979167 15588.020833 L 24661.979167 17741.927083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 368.234375 335.011719 L 386.101562 335.011719 L 386.101562 365.625 L 368.234375 365.625 Z M 368.234375 335.011719 "/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 25740.104167 22334.114583 L 24548.958333 22334.114583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24548.958333 22334.114583 L 24548.958333 24375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 24548.958333 24375 L 25740.104167 24375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 25740.104167 24375 L 25740.104167 22334.114583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 306.148438 335.011719 L 324.015625 335.011719 L 324.015625 365.625 L 306.148438 365.625 Z M 306.148438 335.011719 "/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 21601.041667 22334.114583 L 20409.895833 22334.114583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20409.895833 22334.114583 L 20409.895833 24375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 20409.895833 24375 L 21601.041667 24375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 21601.041667 24375 L 21601.041667 22334.114583 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 518.25 234.675781 L 536.101562 234.675781 L 536.101562 265.289062 L 518.25 265.289062 Z M 518.25 234.675781 "/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 35740.104167 15645.052083 L 34550 15645.052083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 34550 15645.052083 L 34550 17685.9375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 34550 17685.9375 L 35740.104167 17685.9375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 35740.104167 17685.9375 L 35740.104167 15645.052083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(51.764706%,0%,0%);fill-opacity:1;" d="M 456.164062 234.675781 L 474.03125 234.675781 L 474.03125 265.289062 L 456.164062 265.289062 Z M 456.164062 234.675781 "/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 31602.083333 15645.052083 L 30410.9375 15645.052083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 30410.9375 15645.052083 L 30410.9375 17685.9375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 30410.9375 17685.9375 L 31602.083333 17685.9375 " transform="matrix(0.015,0,0,0.015,0,0)"/>
+<path style="fill:none;stroke-width:1134;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(51.764706%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 31602.083333 17685.9375 L 31602.083333 15645.052083 " transform="matrix(0.015,0,0,0.015,0,0)"/>
 </g>
 </svg>
diff --git a/tests/test_plot/test_preflight.py b/tests/test_plot/test_preflight.py
index f14fb917..07f6ec6b 100644
--- a/tests/test_plot/test_preflight.py
+++ b/tests/test_plot/test_preflight.py
@@ -82,8 +82,6 @@ def test_erc_warning_2(test_dir):
 
 def test_drc_1(test_dir):
     prj = name = 'bom'
-    if context.ki7():
-        prj = 'bom/'+prj
     ctx = context.TestContext(test_dir, prj, 'drc', '')
     ctx.run()
     # Check all outputs are there