diff --git a/tests/behat/features/insert-a-link.feature b/tests/behat/features/insert-a-link.feature
index 0ec21000..0da0ec0e 100644
--- a/tests/behat/features/insert-a-link.feature
+++ b/tests/behat/features/insert-a-link.feature
@@ -7,7 +7,7 @@ So that I can link to a external website or a page on my site
   Background:
     Given a "page" "Home"
     And a "page" "About Us" has the "Content" "My awesome content"
-    #And a "file" "assets/folder1/file1.jpg"
+    And a "file" "assets/file1.jpg"
     And I am logged in with "ADMIN" permissions
     And I go to "/admin/pages"
     And I click on "About Us" in the tree
@@ -21,63 +21,60 @@ So that I can link to a external website or a page on my site
     And I press the "Insert" button
     # TODO Dynamic DB identifiers
     Then the "Content" HTML field should contain "<a title="my desc" href="[sitetree_link,id=1]">awesome</a>"
-    # Required to avoid "unsaved changed" browser dialog
+    # Required to avoid "unsaved changes" browser dialog
     Then I press the "Save draft" button
 
   Scenario: I can link to an external URL
     Given I select "awesome" in the "Content" HTML field
     And I press the "Insert Link" button
-
     When I check "Another website"
     And I fill in "http://silverstripe.org" for "URL"
     And I check "Open link in a new window"
     And I press the "Insert" button
     Then the "Content" HTML field should contain "<a href="http://silverstripe.org" target="_blank">awesome</a>"
-    # Required to avoid "unsaved changed" browser dialog
+    # Required to avoid "unsaved changes" browser dialog
     Then I press the "Save draft" button
 
-  @todo
   Scenario: I can link to a file
     Given I select "awesome" in the "Content" HTML field
     When I press the "Insert Link" button
     When I check "Download a file"
     And I fill in the "File" dropdown with "file1.jpg"
     And I press the "Insert link" button
-    Then the "Content" HTML field should contain "<a href="assets/folder1/file1.jpg">awesome</a>"
-    # Required to avoid "unsaved changed" browser dialog
+    Then the "Content" HTML field should contain "<a href="[file_link,id=1]" target="_blank">awesome</a>"
+    # Required to avoid "unsaved changes" browser dialog
     Then I press the "Save draft" button
 
-
-  @todo
   Scenario: I can link to an anchor
-    Given I fill in the "Content" HTML field with "My awesome content <a name=myanchor>"
+    Given I fill in the "Content" HTML field with "<p>My awesome content<a name=myanchor></a></p>"
     And I select "awesome" in the "Content" HTML field
     When I press the "Insert Link" button
     When I check "Anchor on this page"
-    And I fill in the "Select an anchor" dropdown with "myanchor"
+    # Need to hard-code the id attribute of the <select> here, as there are two form fields to pick from
+    And I select "myanchor" from "Form_EditorToolbarLinkForm_AnchorSelector"
     And I press the "Insert link" button
     Then the "Content" HTML field should contain "<a href="#myanchor">awesome</a>"
-    # Required to avoid "unsaved changed" browser dialog
+    # Required to avoid "unsaved changes" browser dialog
     Then I press the "Save draft" button
 
-  @todo
   Scenario: I can edit a link
-    Given I fill in the "Content" HTML field with "My <a href="http://silverstripe.org">awesome</a> content"
-    And I select "awesome" 
+    Given I fill in the "Content" HTML field with "<p>My <a href=http://silverstripe.org>awesome</a> content"
+    And I select "awesome" in the "Content" HTML field
     When I press the "Insert Link" button
-    And the "URL" field should contain "http://silverstripe.org"
-    When I fill in "http://wordpress.org" for "URL"
+    # We need to hard-code the <input> id attribute, if you say 'Then the URL field', it picks up URLSegment instead.
+    Then the "Form_EditorToolbarLinkForm_external" field should contain "http://silverstripe.org"
+    # This doesn't seem to suffer from that issue
+    When I fill in "http://google.com" for "URL"
     And I press the "Insert link" button
-    Then the "Content" HTML field should contain "<a href="http://wordpress.org">awesome</a>"
-    # Required to avoid "unsaved changed" browser dialog
+    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 draft" button
 
-  @todo
-  Scenario: I can delete a link
-    Given I fill in the "Content" HTML field with "My <a href="http://silverstripe.org">awesome</a> content"
-    And I select "awesome" 
-    When I press the "Insert Link" button
-    And I press the "Remove link" button
-    Then the "Content" HTML field should not contain "<a href="http://silverstripe.org">awesome</a>"
-    # Required to avoid "unsaved changed" browser dialog
+  Scenario: I can remove a link
+    Given I fill in the "Content" HTML field with "My <a href=http://silverstripe.org>awesome</a> content"
+    And I select "awesome" in the "Content" HTML field
+    When I press the "Unlink" button
+    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
     Then I press the "Save draft" button
\ No newline at end of file