diff --git a/Composer/packages/extensions/visual-designer/src/components/lib/EdgeUtil.tsx b/Composer/packages/extensions/visual-designer/src/components/lib/EdgeUtil.tsx
index 192990b7a5..d4b24335ab 100644
--- a/Composer/packages/extensions/visual-designer/src/components/lib/EdgeUtil.tsx
+++ b/Composer/packages/extensions/visual-designer/src/components/lib/EdgeUtil.tsx
@@ -126,7 +126,14 @@ export const drawSVGEdge = (
     const [p1, p2] = calculateArrowPoints(endPoint, direction);
     const points = [p1, endPoint, p2].map(p => `${p.x},${p.y}`).join(' ');
     const arrow = (
-      <polyline key={`edge-${id}__arrow`} points={points} {...strokeProps} fill="none" strokeDasharray="none" />
+      <polyline
+        key={`edge-${id}__arrow`}
+        name={id}
+        points={points}
+        {...strokeProps}
+        fill="none"
+        strokeDasharray="none"
+      />
     );
     elements.push(arrow);
   }
diff --git a/Composer/packages/extensions/visual-designer/src/components/menus/NodeMenu.tsx b/Composer/packages/extensions/visual-designer/src/components/menus/NodeMenu.tsx
index c05d8bd5ac..a562e37ab3 100644
--- a/Composer/packages/extensions/visual-designer/src/components/menus/NodeMenu.tsx
+++ b/Composer/packages/extensions/visual-designer/src/components/menus/NodeMenu.tsx
@@ -19,7 +19,7 @@ const declareElementAttributes = (id: string) => {
     [AttrNames.SelectedId]: `${id}${MenuTypes.NodeMenu}`,
   };
 };
-export const NodeMenu = ({ id, onEvent }): JSX.Element => {
+export const NodeMenu = ({ id, onEvent }) => {
   const menuItems = [
     {
       key: 'delete',
@@ -35,6 +35,7 @@ export const NodeMenu = ({ id, onEvent }): JSX.Element => {
 
   return (
     <div
+      data-name="nodeMenu"
       css={{
         marginRight: '1px',
       }}
diff --git a/Composer/packages/extensions/visual-designer/src/editors/StepEditor.tsx b/Composer/packages/extensions/visual-designer/src/editors/StepEditor.tsx
index 0cc9a5a9d1..c3a51f73ba 100644
--- a/Composer/packages/extensions/visual-designer/src/editors/StepEditor.tsx
+++ b/Composer/packages/extensions/visual-designer/src/editors/StepEditor.tsx
@@ -83,6 +83,7 @@ export const StepEditor = ({ id, data, onEvent, trigger, addCoachMarkRef }): JSX
           { directed: true }
         )}
         <circle
+          name="editor__end"
           r={TerminatorSize.height / 2 - 1}
           cx={editorAxisX}
           cy={contentBoundary.height + HeadSize.height + ElementInterval.y / 2 + TerminatorSize.height / 2}