diff --git a/tests/behat/features/insert-a-link.feature b/tests/behat/features/insert-a-link.feature
index 2f40081a..1451420f 100644
--- a/tests/behat/features/insert-a-link.feature
+++ b/tests/behat/features/insert-a-link.feature
@@ -8,6 +8,10 @@ So that I can link to a external website or a page on my site
     Given a "page" "Home"
       And a "page" "About Us" has the "Content" "<p>My awesome content</p>"
       And a "file" "file1.jpg"
+      And a "page" "Page 1"
+      And the "page" "Page 1.1" is a child of a "page" "Page 1"
+      And the "page" "Page 1.1.1" is a child of a "page" "Page 1.1"
+      And the "page" "Page 1.1.1.1" is a child of a "page" "Page 1.1.1"
       # And the "group" "EDITOR" has permissions "Access to 'Pages' section"
       And the "group" "EDITOR" has permissions "Access to 'Files' section" and "Access to 'Pages' section" and "FILE_EDIT_ALL"
       And I am logged in as a member of "EDITOR" group
@@ -24,7 +28,8 @@ So that I can link to a external website or a page on my site
       And I press the "Insert link" button
     Then the "Content" HTML field should contain "<a title="my desc" href="[sitetree_link,id=2]">awesome</a>"
     # Required to avoid "unsaved changes" browser dialog
-    Then I press the "Save" button
+    When I press the "Save" button
+    Then I should see a "Saved 'About Us' successfully" success toast
 
   Scenario: I can wrap an image in a link to an internal page
     Given I fill in the "Content" HTML field with "<p><img src='file1.jpg'></p>"
@@ -35,9 +40,10 @@ So that I can link to a external website or a page on my site
       And I should not see "Link text"
     When I select "About Us" in the "#Form_editorInternalLink_PageID_Holder" tree dropdown
       And I press the "Insert link" button
-    Then the "Content" HTML field should contain "<a href="[sitetree_link,id=2]"><img src="file1.jpg"></a>"
-      # Required to avoid "unsaved changed" browser dialog
-      And I press the "Save" button
+    Then the "Content" HTML field should contain "<a href="[sitetree_link,id=2]"><img src="file1.jpg" alt=""></a>"
+    # Required to avoid "unsaved changes" browser dialog
+    When I press the "Save" button
+    Then I should see a "Saved 'About Us' successfully" success toast
 
   Scenario: I can edit a link to an internal page
     Given I fill in the "Content" HTML field with "<a title='my desc' href='[sitetree_link,id=2]'>awesome</a>"
@@ -53,7 +59,8 @@ So that I can link to a external website or a page on my site
       And I press the "Insert link" button
     Then the "Content" HTML field should contain "<a title="my new desc" href="[sitetree_link,id=1]">awesome</a>"
     # Required to avoid "unsaved changes" browser dialog
-    Then I press the "Save" button
+    When I press the "Save" button
+    Then I should see a "Saved 'About Us' successfully" success toast
 
   Scenario: I can link to an external URL
     Given I select "awesome" in the "Content" HTML field
@@ -65,7 +72,8 @@ So that I can link to a external website or a page on my site
       And I press the "Insert link" button
     Then the "Content" HTML field should contain "<a rel="noopener" href="http://silverstripe.org" target="_blank">awesome</a>"
     # Required to avoid "unsaved changes" browser dialog
-    Then I press the "Save" button
+    When I press the "Save" button
+    Then I should see a "Saved 'About Us' successfully" success toast
 
   Scenario: I can wrap an image in a link to an external URL
     Given I fill in the "Content" HTML field with "<p><img src='file1.jpg'></p>"
@@ -76,9 +84,10 @@ So that I can link to a external website or a page on my site
       And I should not see "Link text"
     When I fill in "http://silverstripe.org" for "URL"
       And I press the "Insert link" button
-    Then the "Content" HTML field should contain "<a href="http://silverstripe.org"><img src="file1.jpg"></a>"
-      # Required to avoid "unsaved changed" browser dialog
-      And I press the "Save" button
+    Then the "Content" HTML field should contain "<a href="http://silverstripe.org"><img src="file1.jpg" alt=""></a>"
+    # Required to avoid "unsaved changes" browser dialog
+    When I press the "Save" button
+    Then I should see a "Saved 'About Us' successfully" success toast
 
   Scenario: I can edit an external link
     Given I fill in the "Content" HTML field with "<p>My <a href='http://silverstripe.org'>awesome</a> content"
@@ -92,7 +101,8 @@ So that I can link to a external website or a page on my site
     And I press the "Insert link" button
     Then the "Content" HTML field should contain "<a href="http://google.com">awesome</a>"
     # Required to avoid "unsaved changes" browser dialog
-    Then I press the "Save" button
+    When I press the "Save" button
+    Then I should see a "Saved 'About Us' successfully" success toast
 
   Scenario: I can remove an external link
     Given I fill in the "Content" HTML field with "My <a href='http://silverstripe.org'>awesome</a> content"
@@ -101,4 +111,47 @@ So that I can link to a external website or a page on my site
     Then the "Content" HTML field should contain "My awesome content"
       And the "Content" HTML field should not contain "http://silverstripe.org"
     # Required to avoid "unsaved changes" browser dialog
+    When I press the "Save" button
+    Then I should see a "Saved 'About Us' successfully" success toast
+
+  Scenario: I can navigate list of Site tree links by clicking on the dropdown elements
+    When I select "awesome" in the "Content" HTML field
+      And I press the "Insert link" HTML field button
+      And I click "Page on this site" in the ".tox-collection__group" element
+    Then I should see an "form#Form_editorInternalLink" element
+    When I click on the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__value-container" element
+    Then I click on the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-button" element
+      And I should not see "Page 1.1.1" in the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-title" element
+      And I should see "Page 1.1" in the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-title" element
+    Then I click on the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-button" element
+      And I should not see "Page 1.1.1.1" in the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-title" element
+      And I should see "Page 1.1.1" in the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-title" element
+    Then I click on the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-button" element
+      And I should see "Page 1.1.1.1" in the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-title" element
+    When I select "Page 1.1.1.1" in the "#Form_editorInternalLink_PageID_Holder" tree dropdown
+      And I fill in "my new desc" for "Link description"
+      And I press the "Insert link" button
+    Then I press the "Save" button
+
+  Scenario: I can navigate list of Site tree links by using keyboard
+    When I select "awesome" in the "Content" HTML field
+      And I press the "Insert link" HTML field button
+      And I click "Page on this site" in the ".tox-collection__group" element
+    Then I should see an "form#Form_editorInternalLink" element
+    When I click on the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__value-container" element
+      And I press the "Down" key globally
+      And I press the "Down" key globally
+      And I press the "Down" key globally
+      And I press the "Right" key globally
+    Then I should see "Page 1.1" in the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-title" element
+      And I press the "Down" key globally
+      And I press the "Right" key globally
+    Then I should see "Page 1.1.1" in the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-title" element
+      And I press the "Down" key globally
+      And I press the "Right" key globally
+    Then I should see "Page 1.1.1.1" in the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-title" element
+      And I should not see the "#Form_editorInternalLink_PageID_Holder .treedropdownfield__option-button" element
+      And I press the "Enter" key globally
+      And I fill in "my new desc" for "Link description"
+      And I press the "Insert link" button
     Then I press the "Save" button
diff --git a/tests/behat/features/insert-anchor-link.feature b/tests/behat/features/insert-anchor-link.feature
index 193a5614..440d8858 100644
--- a/tests/behat/features/insert-anchor-link.feature
+++ b/tests/behat/features/insert-anchor-link.feature
@@ -27,7 +27,8 @@ So that I can link to a external website or a page on my site
       And I press the "Insert link" button
     Then the "Content" HTML field should contain "<a title="my desc" href="[sitetree_link,id=3]#youranchor">awesome</a>"
     # Required to avoid "unsaved changes" browser dialog
-    Then I press the "Save" button
+    When I press the "Save" button
+    Then I should see a "Saved 'About Us' successfully" success toast
 
   Scenario: I can wrap an image in a link to an anchor in an internal page
     Given I fill in the "Content" HTML field with "<p><img src='file1.jpg'></p>"
@@ -40,9 +41,10 @@ So that I can link to a external website or a page on my site
     When I select "Details" in the "#Form_editorAnchorLink_PageID_Holder" tree dropdown
       And I select "youranchor" in the "#Form_editorAnchorLink_Anchor_Holder" anchor dropdown
       And I press the "Insert link" button
-    Then the "Content" HTML field should contain "<a href="[sitetree_link,id=3]#youranchor"><img src="file1.jpg"></a>"
-      # Required to avoid "unsaved changed" browser dialog
-      And I press the "Save" button
+    Then the "Content" HTML field should contain "<a href="[sitetree_link,id=3]#youranchor"><img src="file1.jpg" alt=""></a>"
+    # Required to avoid "unsaved changes" browser dialog
+    When I press the "Save" button
+    Then I should see a "Saved 'About Us' successfully" success toast
 
   Scenario: I can link to an anchor from a dataobject on the current page
     When I select "awesome" in the "Content" HTML field
@@ -56,7 +58,8 @@ So that I can link to a external website or a page on my site
       And I press the "Insert link" button
     Then the "Content" HTML field should contain "<a title="my desc" href="[sitetree_link,id=2]#dataobject-anchor">awesome</a>"
     # Required to avoid "unsaved changes" browser dialog
-    Then I press the "Save" button
+    When I press the "Save" button
+    Then I should see a "Saved 'About Us' successfully" success toast
 
   Scenario: I can link to an unsaved anchor in the current page
     Given I fill in the "Content" HTML field with "<p>My awesome content</p><p><a id='unsaved-anchor'></a>unsaved content</p>"
@@ -73,4 +76,5 @@ So that I can link to a external website or a page on my site
       And I press the "Insert link" button
     Then the "Content" HTML field should contain "<a title="my desc" href="[sitetree_link,id=2]#unsaved-anchor">awesome</a>"
     # Required to avoid "unsaved changes" browser dialog
-    Then I press the "Save" button
+    When I press the "Save" button
+    Then I should see a "Saved 'About Us' successfully" success toast