diff --git a/tests/18-output.graphml b/tests/18-output.graphml
index 87df41a..f839792 100644
--- a/tests/18-output.graphml
+++ b/tests/18-output.graphml
@@ -199,6 +199,9 @@ test3sm_orient.py</data>
       <data key="dTargetPoint">
         <point x="-4.118959" y="-7.297270"/>
       </data>
+      <data key="dLabelGeometry">
+        <point x="-50.904530" y="-43.776615"/>
+      </data>
     </edge>
     <edge id="n0::e0" source="n0::n1" target="n0::n0">
       <data key="dData">TANGENT(target_a)/
@@ -213,6 +216,9 @@ update_turn_parameters(target_a, 0.0)
       <data key="dTargetPoint">
         <point x="129.207840" y="23.561827"/>
       </data>
+      <data key="dLabelGeometry">
+        <point x="-248.976791" y="112.880707"/>
+      </data>
     </edge>
     <edge id="n0::e1" source="n0::n1" target="n0::n0">
       <data key="dData">BACK(target_a)/
@@ -227,6 +233,9 @@ update_turn_parameters(target_a, 180.0)
       <data key="dTargetPoint">
         <point x="148.774094" y="117.967224"/>
       </data>
+      <data key="dLabelGeometry">
+        <point x="-263.427216" y="205.216812"/>
+      </data>
     </edge>
     <edge id="n0::n0::e0" source="n0::n0::n2" target="n0::n0::n0">
       <data key="dSourcePoint">
@@ -244,6 +253,9 @@ update_turn_parameters(target_a, 180.0)
       <data key="dTargetPoint">
         <point x="0.000000" y="0.000000"/>
       </data>
+      <data key="dLabelGeometry">
+        <point x="1.574948" y="11.386170"/>
+      </data>
     </edge>
     <edge id="n0::n0::e2" source="n0::n0::n1" target="n0::n0::n3">
       <data key="dData">[completed()]/</data>
@@ -253,6 +265,9 @@ update_turn_parameters(target_a, 180.0)
       <data key="dTargetPoint">
         <point x="0.000000" y="0.000000"/>
       </data>
+      <data key="dLabelGeometry">
+        <point x="5.912465" y="11.386169"/>
+      </data>
     </edge>
     <edge id="n0::e2" source="n0::n2" target="n0::n1">
       <data key="dData">TIME_TICK [orientation_completed()]/
@@ -268,6 +283,9 @@ DISPATCH(navigation, 'ORIENTED')
       <data key="dTargetPoint">
         <point x="128.219757" y="13.393255"/>
       </data>
+      <data key="dLabelGeometry">
+        <point x="-237.115860" y="17.656166"/>
+      </data>
     </edge>
     <edge id="n0::n2::n0::e0" source="n0::n2::n0::n0" target="n0::n2::n0::n1">
       <data key="dData">[orientation.get_angular_velocity(AXIS_Z) &lt; DW]/</data>
@@ -277,6 +295,9 @@ DISPATCH(navigation, 'ORIENTED')
       <data key="dTargetPoint">
         <point x="-154.388992" y="5.481530"/>
       </data>
+      <data key="dLabelGeometry">
+        <point x="11.403487" y="9.562100"/>
+      </data>
     </edge>
     <edge id="n0::n2::n0::e1" source="n0::n2::n0::n1" target="n0::n2::n0::n0">
       <data key="dData">[orientation.get_angular_velocity(AXIS_Z) &gt; DW]/</data>
@@ -286,6 +307,9 @@ DISPATCH(navigation, 'ORIENTED')
       <data key="dTargetPoint">
         <point x="163.300400" y="1.093013"/>
       </data>
+      <data key="dLabelGeometry">
+        <point x="-299.029510" y="-26.177195"/>
+      </data>
     </edge>
     <edge id="n0::n2::n0::e2" source="n0::n2::n0::n2" target="n0::n2::n0::n0">
       <data key="dSourcePoint">
@@ -314,6 +338,9 @@ DISPATCH(navigation, 'ORIENTED')
       <data key="dTargetPoint">
         <point x="-17.616568" y="284.015320"/>
       </data>
+      <data key="dLabelGeometry">
+        <point x="17.582609" y="96.752647"/>
+      </data>
     </edge>
     <edge id="n0::n2::e1" source="n0::n2::n0" target="n0::n2::n1">
       <data key="dData">[is_target_dw()]/</data>
@@ -323,6 +350,9 @@ DISPATCH(navigation, 'ORIENTED')
       <data key="dTargetPoint">
         <point x="136.996552" y="11.085690"/>
       </data>
+      <data key="dLabelGeometry">
+        <point x="-100.932228" y="-30.990881"/>
+      </data>
     </edge>
     <edge id="n0::n2::e2" source="n0::n2::n1" target="n0::n2::n0">
       <data key="dData">[not is_target_dw()]/</data>
@@ -332,6 +362,9 @@ DISPATCH(navigation, 'ORIENTED')
       <data key="dTargetPoint">
         <point x="-134.980087" y="-169.298065"/>
       </data>
+      <data key="dLabelGeometry">
+        <point x="9.669483" y="13.809602"/>
+      </data>
     </edge>
   </graph>
 </graphml>
diff --git a/tests/18-output.txt b/tests/18-output.txt
index 35319a1..a9988a3 100644
--- a/tests/18-output.txt
+++ b/tests/18-output.txt
@@ -1,5 +1,5 @@
 Document: {id: '', name: 'orientation', format: 'yEd Ostranna', meta: {standard version: '1.0', name: 'orientation', transition order: transition first, event propagation: block events}, elements: {State Machine: {id: 'G', name: 'orientation', elements: {Composite State: {id: 'n0', name: 'orientation', actions: {a {entry}}, geometry: (409.905; 50.5953; 1149.48; 725.384), elements: {Composite State: {id: 'n0::n0', name: 'turn', actions: {a {entry, behavior: 'orientation.start_motor(AXIS_Z)'}, a {exit, behavior: 'orientation.stop_motor(AXIS_Z)'}}, geometry: (445.462; 97.7135; 297.495; 506.213), elements: {Simple State: {id: 'n0::n0::n0', name: 'slow_down', actions: {a {entry, behavior: 'reduce_speed()'}}, geometry: (460.462; 286.453; 267.495; 69.2119)}, Simple State: {id: 'n0::n0::n1', name: 'start_turn', actions: {a {entry, behavior: 'calculate_turn()'}}, geometry: (460.462; 396.384; 267.495; 69.2119)}, Initial: {id: 'n0::n0::n2', name: '', geometry: (594.209; 247.953)}, Simple State: {id: 'n0::n0::n3', name: 'finish_turn', actions: {a {entry, behavior: 'complete_turn()'}}, geometry: (460.462; 506.315; 267.495; 69.2119)}}}, Simple State: {id: 'n0::n1', name: 'idle', actions: {a {entry}}, geometry: (766.168; 103.962; 313.217; 117.952)}, Composite State: {id: 'n0::n2', name: 'wait', actions: {a {entry}}, geometry: (1102.6; 106.937; 432.213; 640.663), elements: {Composite State: {id: 'n0::n2::n0', name: 'maintain', actions: {a {entry, behavior: 'orientation.start_motor(AXIS_Z)'}, a {exit, behavior: 'orientation.stop_motor(AXIS_Z)'}}, geometry: (1121.6; 320.744; 393.6; 400.074), elements: {Simple State: {id: 'n0::n2::n0::n0', name: 'correct_cw', actions: {a {entry, behavior: 'orientation.set_motor_moment(AXIS_Z, -M)'}}, geometry: (1140.35; 479.237; 358.315; 75.3372)}, Simple State: {id: 'n0::n2::n0::n1', name: 'correct_ccw', actions: {a {entry, behavior: 'orientation.set_motor_moment(AXIS_Z, M)'}}, geometry: (1140.35; 624.163; 358.315; 75.3372)}, Initial: {id: 'n0::n2::n0::n2', name: '', geometry: (1319.51; 436.353)}}}, Simple State: {id: 'n0::n2::n1', name: 'static', actions: {a {entry}}, geometry: (1122.71; 201.439; 393.6; 75.3372)}, Initial: {id: 'n0::n2::n2', name: '', geometry: (1319.51; 158.554)}}}}}, Initial: {id: 'n1', name: '', geometry: (945.784; -25.4024)}, Comment: {id: 'n2', body: 'Init scripts:
 
 test3sm_constants.py
-test3sm_orient.py', geometry: (445.462; 652.554; 160.084; 95.0456)}, Transition: {id: 'e0', source: 'n1', target: 'n0::n1', sp: (0; 0), tp: (23.0079; -7.04775)}, Transition: {id: 'e1', source: 'n0', target: 'n0::n1', action: {trigger: 'STOP'}, sp: (-157.872; -122.809), tp: (-4.11896; -7.29727), polyline: [ (826.77; -4.95139), (918.657; -4.95139) ]}, Transition: {id: 'n0::e0', source: 'n0::n1', target: 'n0::n0', action: {trigger: 'TANGENT(target_a)', behavior: 'update_turn_parameters(target_a, 0.0)'}, sp: (95.232; 21.0292), tp: (129.208; 23.5618), polyline: [ (1018.01; 374.382) ]}, Transition: {id: 'n0::e1', source: 'n0::n1', target: 'n0::n0', action: {trigger: 'BACK(target_a)', behavior: 'update_turn_parameters(target_a, 180.0)'}, sp: (113.643; 25.9294), tp: (148.774; 117.967), polyline: [ (1036.42; 468.787) ]}, Transition: {id: 'n0::n0::e0', source: 'n0::n0::n2', target: 'n0::n0::n0', sp: (0; 0), tp: (0; 0)}, Transition: {id: 'n0::n0::e1', source: 'n0::n0::n0', target: 'n0::n0::n1', action: {guard: 'completed()'}, sp: (0; 0), tp: (0; 0)}, Transition: {id: 'n0::n0::e2', source: 'n0::n0::n1', target: 'n0::n0::n3', action: {guard: 'completed()'}, sp: (0; 0), tp: (0; 0)}, Transition: {id: 'n0::e2', source: 'n0::n2', target: 'n0::n1', action: {trigger: 'TIME_TICK', guard: 'orientation_completed()', behavior: 'DISPATCH(cpu, 'ORIENTED')
-DISPATCH(navigation, 'ORIENTED')'}, sp: (-216.094; 98.8431), tp: (128.22; 13.3933), polyline: [ (1051; 526.111) ]}, Transition: {id: 'n0::n2::n0::e0', source: 'n0::n2::n0::n0', target: 'n0::n2::n0::n1', action: {guard: 'orientation.get_angular_velocity(AXIS_Z) < DW'}, sp: (-154.389; 1.81038), tp: (-154.389; 5.48153)}, Transition: {id: 'n0::n2::n0::e1', source: 'n0::n2::n0::n1', target: 'n0::n2::n0::n0', action: {guard: 'orientation.get_angular_velocity(AXIS_Z) > DW'}, sp: (163.3; -10.0207), tp: (163.3; 1.09301)}, Transition: {id: 'n0::n2::n0::e2', source: 'n0::n2::n0::n2', target: 'n0::n2::n0::n0', sp: (0; 0), tp: (0; 0)}, Transition: {id: 'n0::n2::e0', source: 'n0::n2::n2', target: 'n0::n2::n1', sp: (0; 0), tp: (0; 0)}, Transition: {id: 'n0::e3', source: 'n0::n0::n3', target: 'n0::n2', action: {guard: 'completed()'}, sp: (71.4174; 14.495), tp: (-17.6166; 284.015), polyline: [ (665.627; 711.284) ]}, Transition: {id: 'n0::n2::e1', source: 'n0::n2::n0', target: 'n0::n2::n1', action: {guard: 'is_target_dw()'}, sp: (138.108; -80.2858), tp: (136.997; 11.0857)}, Transition: {id: 'n0::n2::e2', source: 'n0::n2::n1', target: 'n0::n2::n0', action: {guard: 'not is_target_dw()'}, sp: (-136.091; 13.4535), tp: (-134.98; -169.298)}}}}
+test3sm_orient.py', geometry: (445.462; 652.554; 160.084; 95.0456)}, Transition: {id: 'e0', source: 'n1', target: 'n0::n1', sp: (0; 0), tp: (23.0079; -7.04775)}, Transition: {id: 'e1', source: 'n0', target: 'n0::n1', action: {trigger: 'STOP'}, sp: (-157.872; -122.809), tp: (-4.11896; -7.29727), label: (-50.9045; -43.7766), polyline: [ (826.77; -4.95139), (918.657; -4.95139) ]}, Transition: {id: 'n0::e0', source: 'n0::n1', target: 'n0::n0', action: {trigger: 'TANGENT(target_a)', behavior: 'update_turn_parameters(target_a, 0.0)'}, sp: (95.232; 21.0292), tp: (129.208; 23.5618), label: (-248.977; 112.881), polyline: [ (1018.01; 374.382) ]}, Transition: {id: 'n0::e1', source: 'n0::n1', target: 'n0::n0', action: {trigger: 'BACK(target_a)', behavior: 'update_turn_parameters(target_a, 180.0)'}, sp: (113.643; 25.9294), tp: (148.774; 117.967), label: (-263.427; 205.217), polyline: [ (1036.42; 468.787) ]}, Transition: {id: 'n0::n0::e0', source: 'n0::n0::n2', target: 'n0::n0::n0', sp: (0; 0), tp: (0; 0)}, Transition: {id: 'n0::n0::e1', source: 'n0::n0::n0', target: 'n0::n0::n1', action: {guard: 'completed()'}, sp: (0; 0), tp: (0; 0), label: (1.57495; 11.3862)}, Transition: {id: 'n0::n0::e2', source: 'n0::n0::n1', target: 'n0::n0::n3', action: {guard: 'completed()'}, sp: (0; 0), tp: (0; 0), label: (5.91246; 11.3862)}, Transition: {id: 'n0::e2', source: 'n0::n2', target: 'n0::n1', action: {trigger: 'TIME_TICK', guard: 'orientation_completed()', behavior: 'DISPATCH(cpu, 'ORIENTED')
+DISPATCH(navigation, 'ORIENTED')'}, sp: (-216.094; 98.8431), tp: (128.22; 13.3933), label: (-237.116; 17.6562), polyline: [ (1051; 526.111) ]}, Transition: {id: 'n0::n2::n0::e0', source: 'n0::n2::n0::n0', target: 'n0::n2::n0::n1', action: {guard: 'orientation.get_angular_velocity(AXIS_Z) < DW'}, sp: (-154.389; 1.81038), tp: (-154.389; 5.48153), label: (11.4035; 9.5621)}, Transition: {id: 'n0::n2::n0::e1', source: 'n0::n2::n0::n1', target: 'n0::n2::n0::n0', action: {guard: 'orientation.get_angular_velocity(AXIS_Z) > DW'}, sp: (163.3; -10.0207), tp: (163.3; 1.09301), label: (-299.03; -26.1772)}, Transition: {id: 'n0::n2::n0::e2', source: 'n0::n2::n0::n2', target: 'n0::n2::n0::n0', sp: (0; 0), tp: (0; 0)}, Transition: {id: 'n0::n2::e0', source: 'n0::n2::n2', target: 'n0::n2::n1', sp: (0; 0), tp: (0; 0)}, Transition: {id: 'n0::e3', source: 'n0::n0::n3', target: 'n0::n2', action: {guard: 'completed()'}, sp: (71.4174; 14.495), tp: (-17.6166; 284.015), label: (17.5826; 96.7526), polyline: [ (665.627; 711.284) ]}, Transition: {id: 'n0::n2::e1', source: 'n0::n2::n0', target: 'n0::n2::n1', action: {guard: 'is_target_dw()'}, sp: (138.108; -80.2858), tp: (136.997; 11.0857), label: (-100.932; -30.9909)}, Transition: {id: 'n0::n2::e2', source: 'n0::n2::n1', target: 'n0::n2::n0', action: {guard: 'not is_target_dw()'}, sp: (-136.091; 13.4535), tp: (-134.98; -169.298), label: (9.66948; 13.8096)}}}}