diff --git a/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature b/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature
index 396d9902931..caf46bfdb0d 100644
--- a/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature
+++ b/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature
@@ -5,8 +5,7 @@ Feature: Atto accessibility checker
   @javascript
   Scenario: Images with no alt
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p>Some plain text</p><img src='/broken-image'/><p>Some more text</p>"
     When I click on "Show more buttons" "button"
     And I click on "Accessibility checker" "button"
@@ -15,8 +14,7 @@ Feature: Atto accessibility checker
   @javascript
   Scenario: Low contrast
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p style='color: #7c7cff; background-color: #ffffff;'>Hard to read</p>"
     When I click on "Show more buttons" "button"
     And I click on "Accessibility checker" "button"
diff --git a/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature b/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature
index 92dc58e13e4..79913def2fd 100644
--- a/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature
+++ b/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature
@@ -5,8 +5,7 @@ Feature: Atto accessibility helper
   @javascript
   Scenario: Images and links
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p>Some plain text</p><img src='/broken-image' alt='Image 1'/><p><a href='#fsd'>Some link text</a></p>"
     And I select the text in the "Description" Atto editor
     When I click on "Show more buttons" "button"
@@ -21,8 +20,7 @@ Feature: Atto accessibility helper
   @javascript
   Scenario: Styles
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p>Some plain text</p>"
     When I click on "Show more buttons" "button"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/align/tests/behat/align.feature b/lib/editor/atto/plugins/align/tests/behat/align.feature
index 893fcdbe7ce..9e69765a0f7 100644
--- a/lib/editor/atto/plugins/align/tests/behat/align.feature
+++ b/lib/editor/atto/plugins/align/tests/behat/align.feature
@@ -5,8 +5,7 @@ Feature: Atto align text
   @javascript
   Scenario: Right align some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p>Fascism</p>"
     And I set the field "Text editor" to "Plain text area"
     And I click on "Show more buttons" "button"
@@ -19,8 +18,7 @@ Feature: Atto align text
   @javascript
   Scenario: Left align some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p>Communism</p>"
     And I set the field "Text editor" to "Plain text area"
     And I click on "Show more buttons" "button"
@@ -34,8 +32,7 @@ Feature: Atto align text
   @javascript
   Scenario: Center align some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p>United Future</p>"
     And I set the field "Text editor" to "Plain text area"
     And I click on "Show more buttons" "button"
diff --git a/lib/editor/atto/plugins/bold/tests/behat/bold.feature b/lib/editor/atto/plugins/bold/tests/behat/bold.feature
index 3aef641972a..2497bd2135c 100644
--- a/lib/editor/atto/plugins/bold/tests/behat/bold.feature
+++ b/lib/editor/atto/plugins/bold/tests/behat/bold.feature
@@ -5,8 +5,7 @@ Feature: Atto bold button
   @javascript
   Scenario: Bold some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Text editor" to "Plain text area"
     And I set the field "Description" to "Badger"
     And I select the text in the "Description" Atto editor
@@ -18,8 +17,7 @@ Feature: Atto bold button
   @javascript
   Scenario: Unbold some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Text editor" to "Plain text area"
     And I set the field "Description" to "Mouse"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature
index b68fddf2e52..5afc37478bf 100644
--- a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature
+++ b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature
@@ -5,8 +5,7 @@ Feature: Atto charmap button
   @javascript
   Scenario: Insert symbols
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Text editor" to "Plain text area"
     And I set the field "Description" to "<p>1980 Mullet</p>"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/clear/tests/behat/clear.feature b/lib/editor/atto/plugins/clear/tests/behat/clear.feature
index 18483996611..8189166b1e2 100644
--- a/lib/editor/atto/plugins/clear/tests/behat/clear.feature
+++ b/lib/editor/atto/plugins/clear/tests/behat/clear.feature
@@ -5,8 +5,7 @@ Feature: Atto clear button
   @javascript
   Scenario: Clear formatting
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Text editor" to "Plain text area"
     And I set the field "Description" to "<p><i>Pisa</i></p>"
     When I click on "Show more buttons" "button"
diff --git a/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature b/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature
index ed2a87e2ae9..458542325f3 100644
--- a/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature
+++ b/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature
@@ -5,8 +5,7 @@ Feature: Atto collapse button
   @javascript
   Scenario: Toggle toolbar
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     When I click on "Show more buttons" "button"
     Then "Equation editor" "button" should be visible
     And I click on "Show fewer buttons" "button"
diff --git a/lib/editor/atto/plugins/equation/tests/behat/equation.feature b/lib/editor/atto/plugins/equation/tests/behat/equation.feature
index 39754bbc2f7..44dbb3eb225 100644
--- a/lib/editor/atto/plugins/equation/tests/behat/equation.feature
+++ b/lib/editor/atto/plugins/equation/tests/behat/equation.feature
@@ -5,8 +5,7 @@ Feature: Atto equation editor
   @javascript
   Scenario: Create an equation
     Given I log in as "admin"
-    When I follow "Admin User"
-    And I follow "Edit profile"
+    When I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p>Equation test</p>"
     And I select the text in the "Description" Atto editor
     And I click on "Show more buttons" "button"
diff --git a/lib/editor/atto/plugins/html/tests/behat/html.feature b/lib/editor/atto/plugins/html/tests/behat/html.feature
index 735a8215be1..eb617c620ed 100644
--- a/lib/editor/atto/plugins/html/tests/behat/html.feature
+++ b/lib/editor/atto/plugins/html/tests/behat/html.feature
@@ -5,8 +5,7 @@ Feature: Atto edit HTML
   @javascript
   Scenario: Edit the html source
     Given I log in as "admin"
-    When I follow "Admin User"
-    And I follow "Edit profile"
+    When I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p style=\"color: blue;\">Smurf</p>"
     And I click on "Show more buttons" "button"
     And I click on "HTML" "button"
diff --git a/lib/editor/atto/plugins/image/tests/behat/image.feature b/lib/editor/atto/plugins/image/tests/behat/image.feature
index 984e5034103..77905ac6c6f 100644
--- a/lib/editor/atto/plugins/image/tests/behat/image.feature
+++ b/lib/editor/atto/plugins/image/tests/behat/image.feature
@@ -8,8 +8,7 @@ Feature: Add images to Atto
     And I navigate to "My private files" node in "My profile"
     And I upload "lib/editor/atto/tests/fixtures/moodle-logo.png" file to "Files" filemanager
     And I click on "Save changes" "button"
-    When I follow "Admin User"
-    And I follow "Edit profile"
+    When I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p>Image test</p>"
     And I select the text in the "Description" Atto editor
     And I click on "Image" "button"
diff --git a/lib/editor/atto/plugins/indent/tests/behat/indent.feature b/lib/editor/atto/plugins/indent/tests/behat/indent.feature
index 8ef72ab032e..7aa5bf60f22 100644
--- a/lib/editor/atto/plugins/indent/tests/behat/indent.feature
+++ b/lib/editor/atto/plugins/indent/tests/behat/indent.feature
@@ -5,8 +5,7 @@ Feature: Indent text in Atto
   @javascript
   Scenario: Indent
     Given I log in as "admin"
-    When I follow "Admin User"
-    And I follow "Edit profile"
+    When I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p>I need some space.</p>"
     And I set the field "Text editor" to "Plain text area"
     And I select the text in the "Description" Atto editor
@@ -19,8 +18,7 @@ Feature: Indent text in Atto
   @javascript
   Scenario: Indent and outdent
     Given I log in as "admin"
-    When I follow "Admin User"
-    And I follow "Edit profile"
+    When I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "<p>I need some space.</p>"
     And I set the field "Text editor" to "Plain text area"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/italic/tests/behat/italic.feature b/lib/editor/atto/plugins/italic/tests/behat/italic.feature
index f1fca1d23fb..e17f6366690 100644
--- a/lib/editor/atto/plugins/italic/tests/behat/italic.feature
+++ b/lib/editor/atto/plugins/italic/tests/behat/italic.feature
@@ -5,8 +5,7 @@ Feature: Atto italic button
   @javascript
   Scenario: Italicise some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "Tower of Pisa"
     And I set the field "Text editor" to "Plain text area"
     And I select the text in the "Description" Atto editor
@@ -18,8 +17,7 @@ Feature: Atto italic button
   @javascript
   Scenario: Toggle italics in some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "GHD - for hair"
     And I set the field "Text editor" to "Plain text area"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/link/tests/behat/link.feature b/lib/editor/atto/plugins/link/tests/behat/link.feature
index 8edd2e4513b..68e45cc61cf 100644
--- a/lib/editor/atto/plugins/link/tests/behat/link.feature
+++ b/lib/editor/atto/plugins/link/tests/behat/link.feature
@@ -8,8 +8,7 @@ Feature: Add links to Atto
     And I navigate to "My private files" node in "My profile"
     And I upload "lib/editor/atto/tests/fixtures/moodle-logo.png" file to "Files" filemanager
     And I click on "Save changes" "button"
-    When I follow "Admin User"
-    And I follow "Edit profile"
+    When I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Text editor" to "Plain text area"
     And I set the field "Description" to "Super cool"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature b/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature
index 38140c3d397..eb937e45b57 100644
--- a/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature
+++ b/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature
@@ -5,8 +5,7 @@ Feature: Atto ordered list button
   @javascript
   Scenario: Make a list from some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "Have you heard the news everyone's talking<br/> Life is good 'cause everything's awesome<br/>"
     And I set the field "Text editor" to "Plain text area"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/strike/tests/behat/strike.feature b/lib/editor/atto/plugins/strike/tests/behat/strike.feature
index c56f5297792..9cf737e80cf 100644
--- a/lib/editor/atto/plugins/strike/tests/behat/strike.feature
+++ b/lib/editor/atto/plugins/strike/tests/behat/strike.feature
@@ -5,8 +5,7 @@ Feature: Atto strike button
   @javascript
   Scenario: Strike some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "MUA"
     And I set the field "Text editor" to "Plain text area"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature b/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature
index 9dbc8e7376b..bbd62738c2f 100644
--- a/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature
+++ b/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature
@@ -5,8 +5,7 @@ Feature: Atto subscript button
   @javascript
   Scenario: Subscript some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "Submarine"
     And I set the field "Text editor" to "Plain text area"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature b/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature
index cf9a563b3bd..fbc3467098a 100644
--- a/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature
+++ b/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature
@@ -5,8 +5,7 @@ Feature: Atto superscript button
   @javascript
   Scenario: Subscript some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "Helicopter"
     And I set the field "Text editor" to "Plain text area"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/title/tests/behat/title.feature b/lib/editor/atto/plugins/title/tests/behat/title.feature
index 896a1249c08..32eba6f105d 100644
--- a/lib/editor/atto/plugins/title/tests/behat/title.feature
+++ b/lib/editor/atto/plugins/title/tests/behat/title.feature
@@ -5,8 +5,7 @@ Feature: Atto title
   @javascript
   Scenario: Create a heading
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Text editor" to "Plain text area"
     And I set the field "Description" to "How The Rock Has Made the WWE World Heavyweight Title More Important Than Ever"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/underline/tests/behat/underline.feature b/lib/editor/atto/plugins/underline/tests/behat/underline.feature
index a16913e356c..e354f46019a 100644
--- a/lib/editor/atto/plugins/underline/tests/behat/underline.feature
+++ b/lib/editor/atto/plugins/underline/tests/behat/underline.feature
@@ -5,8 +5,7 @@ Feature: Atto underline button
   @javascript
   Scenario: Underline some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "Deprecated HTML Tag"
     And I set the field "Text editor" to "Plain text area"
     And I select the text in the "Description" Atto editor
diff --git a/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature b/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature
index 38211117c9d..64d4f23eede 100644
--- a/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature
+++ b/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature
@@ -5,8 +5,7 @@ Feature: Atto unordered list button
   @javascript
   Scenario: Make a list from some text
     Given I log in as "admin"
-    And I follow "Admin User"
-    And I follow "Edit profile"
+    And I navigate to "Edit profile" node in "My profile settings"
     And I set the field "Description" to "Things, dogs, clogs, they're awesome<br/> Rocks, clocks, and socks, they're awesome<br/> Figs, and wigs, and twigs, that's awesome<br/> Everything you see or think or say is awesome"
     And I set the field "Text editor" to "Plain text area"
     And I select the text in the "Description" Atto editor