diff --git a/e2etests/testdata/stable/self-referencing/elk/board.exp.json b/e2etests/testdata/stable/self-referencing/elk/board.exp.json
index beeb453d1..8ea3dd21a 100644
--- a/e2etests/testdata/stable/self-referencing/elk/board.exp.json
+++ b/e2etests/testdata/stable/self-referencing/elk/board.exp.json
@@ -5,7 +5,7 @@
       "id": "x",
       "type": "",
       "pos": {
-        "x": 389,
+        "x": 289,
         "y": 12
       },
       "width": 113,
@@ -44,7 +44,7 @@
       "id": "y",
       "type": "",
       "pos": {
-        "x": 165,
+        "x": 115,
         "y": 238
       },
       "width": 114,
@@ -83,7 +83,7 @@
       "id": "z",
       "type": "",
       "pos": {
-        "x": 147,
+        "x": 97,
         "y": 12
       },
       "width": 112,
@@ -145,20 +145,20 @@
       "labelPosition": "",
       "labelPercentage": 0,
       "route": [
-        {
-          "x": 389,
-          "y": 62.4
-        },
         {
           "x": 289,
           "y": 62.4
         },
         {
-          "x": 289,
+          "x": 239,
+          "y": 62.4
+        },
+        {
+          "x": 239,
           "y": 87.6
         },
         {
-          "x": 389,
+          "x": 289,
           "y": 87.6
         }
       ],
@@ -193,19 +193,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 389,
+          "x": 289,
           "y": 37.2
         },
         {
-          "x": 279,
+          "x": 229,
           "y": 37.2
         },
         {
-          "x": 279,
+          "x": 229,
           "y": 112.8
         },
         {
-          "x": 389,
+          "x": 289,
           "y": 112.8
         }
       ],
@@ -240,19 +240,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 445.5,
+          "x": 345.5,
           "y": 138
         },
         {
-          "x": 445.5,
+          "x": 345.5,
           "y": 188
         },
         {
-          "x": 241,
+          "x": 191,
           "y": 188
         },
         {
-          "x": 241,
+          "x": 191,
           "y": 238
         }
       ],
@@ -287,11 +287,11 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 203,
+          "x": 153,
           "y": 138
         },
         {
-          "x": 203,
+          "x": 153,
           "y": 238
         }
       ],
@@ -326,7 +326,7 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 147,
+          "x": 97,
           "y": 54
         },
         {
@@ -338,7 +338,7 @@
           "y": 96
         },
         {
-          "x": 147,
+          "x": 97,
           "y": 96
         }
       ],
diff --git a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg
index bf76bff94..6dbd18480 100644
--- a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg
@@ -2,7 +2,7 @@
 <svg
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="672" height="552" viewBox="-70 -88 672 552"><style type="text/css">
+width="572" height="552" viewBox="-70 -88 572 552"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -14,10 +14,10 @@ width="672" height="552" viewBox="-70 -88 672 552"><style type="text/css">
 }
 
 ]]>
-</style><g id="x"><g class="shape" ><rect x="389" y="12" width="113" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="445.500000" y="78.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text></g><g id="y"><g class="shape" ><rect x="165" y="238" width="114" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="222.000000" y="304.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text></g><g id="z"><g class="shape" ><rect x="147" y="12" width="112" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="203.000000" y="78.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">z</text></g><g id="(x -&gt; x)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 387.000000 62.400000 L 299.000000 62.400000 S 289.000000 62.400000 289.000000 72.400000 L 289.000000 77.600000 S 289.000000 87.600000 299.000000 87.600000 L 385.000000 87.600000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /></g><g id="(x -&gt; x)[1]"><path d="M 387.000000 37.200000 L 289.000000 37.200000 S 279.000000 37.200000 279.000000 47.200000 L 279.000000 102.800000 S 279.000000 112.800000 289.000000 112.800000 L 385.000000 112.800000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /></g><g id="(x -&gt; y)[0]"><path d="M 445.500000 140.000000 L 445.500000 178.000000 S 445.500000 188.000000 435.500000 188.000000 L 251.000000 188.000000 S 241.000000 188.000000 241.000000 198.000000 L 241.000000 234.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /></g><g id="(z -&gt; y)[0]"><path d="M 203.000000 140.000000 L 203.000000 234.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /></g><g id="(z -&gt; z)[0]"><mask id="mask-2690534573" maskUnits="userSpaceOnUse" x="31.000000" y="40.000000" width="128.000000" height="70.000000">
-<rect x="31.000000" y="40.000000" width="128.000000" height="70.000000" fill="white"></rect>
+</style><g id="x"><g class="shape" ><rect x="289" y="12" width="113" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="345.500000" y="78.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text></g><g id="y"><g class="shape" ><rect x="115" y="238" width="114" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="172.000000" y="304.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text></g><g id="z"><g class="shape" ><rect x="97" y="12" width="112" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="153.000000" y="78.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">z</text></g><g id="(x -&gt; x)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 287.000000 62.400000 L 249.000000 62.400000 S 239.000000 62.400000 239.000000 72.400000 L 239.000000 77.600000 S 239.000000 87.600000 249.000000 87.600000 L 285.000000 87.600000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /></g><g id="(x -&gt; x)[1]"><path d="M 287.000000 37.200000 L 239.000000 37.200000 S 229.000000 37.200000 229.000000 47.200000 L 229.000000 102.800000 S 229.000000 112.800000 239.000000 112.800000 L 285.000000 112.800000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /></g><g id="(x -&gt; y)[0]"><path d="M 345.500000 140.000000 L 345.500000 178.000000 S 345.500000 188.000000 335.500000 188.000000 L 201.000000 188.000000 S 191.000000 188.000000 191.000000 198.000000 L 191.000000 234.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /></g><g id="(z -&gt; y)[0]"><path d="M 153.000000 140.000000 L 153.000000 234.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" /></g><g id="(z -&gt; z)[0]"><mask id="mask-2690534573" maskUnits="userSpaceOnUse" x="31.000000" y="40.000000" width="78.000000" height="70.000000">
+<rect x="31.000000" y="40.000000" width="78.000000" height="70.000000" fill="white"></rect>
 <rect x="31.000000" y="65.000000" width="33" height="21" fill="black"></rect>
-</mask><path d="M 145.000000 54.000000 L 57.000000 54.000000 S 47.000000 54.000000 47.000000 64.000000 L 47.000000 86.000000 S 47.000000 96.000000 57.000000 96.000000 L 143.000000 96.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#mask-2690534573)" /><text class="text-italic" x="47.500000" y="81.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">hello</text></g><style type="text/css"><![CDATA[
+</mask><path d="M 95.000000 54.000000 L 57.000000 54.000000 S 47.000000 54.000000 47.000000 64.000000 L 47.000000 86.000000 S 47.000000 96.000000 57.000000 96.000000 L 93.000000 96.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#mask-2690534573)" /><text class="text-italic" x="47.500000" y="81.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">hello</text></g><style type="text/css"><![CDATA[
 .text-bold {
 	font-family: "font-bold";
 }