Index: tests/RTT/ref/elem_pads.dsn
===================================================================
--- tests/RTT/ref/elem_pads.dsn	(revision 10495)
+++ tests/RTT/ref/elem_pads.dsn	(revision 10496)
@@ -33,19 +33,19 @@
     )
   )
   (placement
-    (component 9
+    (component 8
       (place "R1" 6.350000 10.160000 front 0 (PN 0))
     )
-    (component 17
+    (component 16
       (place "U1" 6.339840 4.241800 front 0 (PN 0))
     )
   )
   (library
-    (image 9
+    (image 8
       (pin Smd_rect_1299972x1899920 "1" -1.499870 0.000000)
       (pin Smd_rect_1299972x1899920 "2" 1.499870 0.000000)
     )
-    (image 17
+    (image 16
       (pin Smd_rect_381000x889000 "1" -0.650240 -1.066800)
       (pin Smd_rect_381000x889000 "2" 0.645160 -1.066800)
       (pin Smd_rect_381000x889000 "3" 0.645160 0.711200)
Index: tests/RTT/ref/elem_pads_ds.dsn
===================================================================
--- tests/RTT/ref/elem_pads_ds.dsn	(revision 10495)
+++ tests/RTT/ref/elem_pads_ds.dsn	(revision 10496)
@@ -33,12 +33,12 @@
     )
   )
   (placement
-    (component 9
+    (component 8
       (place "E1" 6.191250 8.096250 front 0 (PN 0))
     )
   )
   (library
-    (image 9
+    (image 8
       (pin Smd_rect_2159000x254000 "1" -0.793750 0.793750)
       (pin Smd_rect_254000x2159000 "2" 0.793750 -0.793750)
     )
Index: tests/RTT/ref/elem_pins.dsn
===================================================================
--- tests/RTT/ref/elem_pins.dsn	(revision 10495)
+++ tests/RTT/ref/elem_pins.dsn	(revision 10496)
@@ -33,19 +33,19 @@
     )
   )
   (placement
-    (component 9
+    (component 8
       (place "U1" 5.715000 9.525000 front 0 (PN 0))
     )
-    (component 21
+    (component 20
       (place "U2" 5.715000 4.445000 front 0 (PN 0))
     )
   )
   (library
-    (image 9
+    (image 8
       (pin Th_square_2032000 "1" -3.810000 0.000000)
       (pin Th_round_2032000 "2" 3.810000 0.000000)
     )
-    (image 21
+    (image 20
       (pin Th_square_2032000 "1" -3.810000 0.000000)
       (pin Th_square_2032000 "2" 3.810000 0.000000)
     )
Index: tests/RTT/ref/elem_sides_smd.dsn
===================================================================
--- tests/RTT/ref/elem_sides_smd.dsn	(revision 10495)
+++ tests/RTT/ref/elem_sides_smd.dsn	(revision 10496)
@@ -33,19 +33,19 @@
     )
   )
   (placement
-    (component 9
+    (component 8
       (place "R1" 5.715000 9.525000 front 0 (PN 0))
     )
-    (component 17
+    (component 16
       (place "R2" 5.715000 3.810000 back 0 (PN 0))
     )
   )
   (library
-    (image 9
+    (image 8
       (pin Smd_rect_1299972x1899920 "1" -1.499870 0.000000)
       (pin Smd_rect_1299972x1899920 "2" 1.499870 0.000000)
     )
-    (image 17
+    (image 16
       (pin Smd_rect_1299972x1899920 "1" 1.499870 0.000000)
       (pin Smd_rect_1299972x1899920 "2" -1.499870 0.000000)
     )
Index: tests/RTT/ref/elem_sides_trh.dsn
===================================================================
--- tests/RTT/ref/elem_sides_trh.dsn	(revision 10495)
+++ tests/RTT/ref/elem_sides_trh.dsn	(revision 10496)
@@ -33,19 +33,19 @@
     )
   )
   (placement
-    (component 9
+    (component 8
       (place "U1" 6.350000 8.890000 front 0 (PN 0))
     )
-    (component 21
+    (component 20
       (place "U2" 6.350000 3.810000 back 0 (PN 0))
     )
   )
   (library
-    (image 9
+    (image 8
       (pin Th_square_2032000 "1" -3.810000 0.000000)
       (pin Th_round_2032000 "2" 3.810000 0.000000)
     )
-    (image 21
+    (image 20
       (pin Th_square_2032000 "1" 3.810000 0.000000)
       (pin Th_round_2032000 "2" -3.810000 0.000000)
     )
Index: tests/RTT/ref/netlist.dsn
===================================================================
--- tests/RTT/ref/netlist.dsn	(revision 10495)
+++ tests/RTT/ref/netlist.dsn	(revision 10496)
@@ -33,12 +33,12 @@
     )
   )
   (placement
-    (component 9
+    (component 8
       (place "U1" 6.350000 6.985000 front 0 (PN 0))
     )
   )
   (library
-    (image 9
+    (image 8
       (pin Th_square_2032000 "1" -3.810000 1.270000)
       (pin Th_round_2032000 "4" 3.810000 1.270000)
       (pin Th_round_2032000 "2" -3.810000 -1.270000)
Index: tests/RTT/ref/netlist_ba.dsn
===================================================================
--- tests/RTT/ref/netlist_ba.dsn	(revision 10495)
+++ tests/RTT/ref/netlist_ba.dsn	(revision 10496)
@@ -33,12 +33,12 @@
     )
   )
   (placement
-    (component 9
+    (component 8
       (place "U1" 6.350000 6.985000 front 0 (PN 0))
     )
   )
   (library
-    (image 9
+    (image 8
       (pin Th_square_2032000 "1" -3.810000 1.270000)
       (pin Th_round_2032000 "4" 3.810000 1.270000)
       (pin Th_round_2032000 "2" -3.810000 -1.270000)
Index: tests/RTT/ref/thermal_last.dsn
===================================================================
--- tests/RTT/ref/thermal_last.dsn	(revision 10495)
+++ tests/RTT/ref/thermal_last.dsn	(revision 10496)
@@ -33,12 +33,12 @@
     )
   )
   (placement
-    (component 6
-      (place 6 2.540000 10.160000 front 0 (PN 0))
+    (component 5
+      (place 5 2.540000 10.160000 front 0 (PN 0))
     )
   )
   (library
-    (image 6
+    (image 5
       (pin Th_round_3015995 1 0 0)
     )
     (padstack Th_round_3015995
Index: tests/RTT/ref/thermal_layer.dsn
===================================================================
--- tests/RTT/ref/thermal_layer.dsn	(revision 10495)
+++ tests/RTT/ref/thermal_layer.dsn	(revision 10496)
@@ -33,20 +33,23 @@
     )
   )
   (placement
+    (component 5
+      (place 5 2.540000 10.160000 front 0 (PN 0))
+    )
     (component 6
-      (place 6 2.540000 10.160000 front 0 (PN 0))
+      (place 6 6.985000 10.160000 front 0 (PN 0))
     )
     (component 7
-      (place 7 6.985000 10.160000 front 0 (PN 0))
+      (place 7 2.540000 5.715000 front 0 (PN 0))
     )
     (component 8
-      (place 8 2.540000 5.715000 front 0 (PN 0))
+      (place 8 6.985000 5.715000 front 0 (PN 0))
     )
-    (component 9
-      (place 9 6.985000 5.715000 front 0 (PN 0))
-    )
   )
   (library
+    (image 5
+      (pin Th_round_3015995 1 0 0)
+    )
     (image 6
       (pin Th_round_3015995 1 0 0)
     )
@@ -56,9 +59,6 @@
     (image 8
       (pin Th_round_3015995 1 0 0)
     )
-    (image 9
-      (pin Th_round_3015995 1 0 0)
-    )
     (padstack Th_round_3015995
       (shape (circle signal 3.015995))
       (attach off)