diff --git a/blocks/starredcourses/tests/behat/starred_courses.feature b/blocks/starredcourses/tests/behat/starred_courses.feature
new file mode 100644
index 00000000000..6bd79d414db
--- /dev/null
+++ b/blocks/starredcourses/tests/behat/starred_courses.feature
@@ -0,0 +1,42 @@
+@block_starredcourses
+Feature: Starred courses
+ In order for me to quickly navigate to my favourite courses
+ As a user
+ I must be able to add them to the Starred courses block
+
+ Background:
+ Given the following "users" exist:
+ | username | firstname | lastname | email |
+ | student1 | Student | 1 | student1@example.com |
+ And the following "courses" exist:
+ | shortname | fullname |
+ | C1 | Course 1 |
+ | C2 | Course 2 |
+ | C3 | Course 3 |
+ And the following "course enrolments" exist:
+ | user | course | role |
+ | student1 | C1 | student |
+ | student1 | C2 | student |
+ | student1 | C3 | student |
+ And the following "blocks" exist:
+ | blockname | contextlevel | reference | pagetypepattern | defaultregion |
+ | starredcourses | User | student1 | my-index | content |
+
+ @accessibility @javascript
+ Scenario: User has no starred courses
+ Given I log in as "student1"
+ Then I should see "No starred courses"
+ And the page should meet accessibility standards
+
+ @accessibility @javascript
+ Scenario: User has starred courses
+ Given I am on the "My courses" page logged in as "student1"
+ And I click on "Actions for course Course 1" "button"
+ And I click on "Star for Course 1" "link"
+ And I click on "Actions for course Course 3" "button"
+ And I click on "Star for Course 3" "link"
+ When I follow "Dashboard"
+ Then the page should meet accessibility standards
+ And I should see "Course 1" in the "Starred courses" "block"
+ And I should see "Course 3" in the "Starred courses" "block"
+ But I should not see "Course 2" in the "Starred courses" "block"
diff --git a/completion/tests/behat/bulk_edit_activity_completion.feature b/completion/tests/behat/bulk_edit_activity_completion.feature
index 41008a22efb..c9639c2e309 100644
--- a/completion/tests/behat/bulk_edit_activity_completion.feature
+++ b/completion/tests/behat/bulk_edit_activity_completion.feature
@@ -78,3 +78,10 @@ Feature: Allow teachers to bulk edit activity completion rules in a course.
And I should see "With conditions" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' row ')][.//*[text() = 'Test assignment two']]" "xpath_element"
And I should see "Passing grade" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' row ')][.//*[text() = 'Test assignment two']]" "xpath_element"
And I should not see "Completion expected on" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' row ')][.//*[text() = 'Test assignment two']]" "xpath_element"
+
+ @accessibility
+ Scenario: Evaluate the accessibility of the bulk edit activity completion page
+ Given I am on the "Course 1" course page logged in as "teacher1"
+ When I navigate to "Course completion" in current page administration
+ And I set the field "Course completion tertiary navigation" to "Bulk edit activity completion"
+ And the page should meet accessibility standards
diff --git a/completion/tests/behat/default_activity_completion.feature b/completion/tests/behat/default_activity_completion.feature
index 86790234873..1d203700168 100644
--- a/completion/tests/behat/default_activity_completion.feature
+++ b/completion/tests/behat/default_activity_completion.feature
@@ -228,3 +228,10 @@ Feature: Allow teachers to edit the default activity completion rules in a cours
When I navigate to "Course completion" in current page administration
And I set the field "Course completion tertiary navigation" to "Default activity completion"
Then "Quiz" "text" should appear before "Text and media area" "text"
+
+ @accessibility
+ Scenario: Evaluate the accessibility of the default activity completion page
+ Given I am on the "Course 1" course page logged in as "teacher1"
+ When I navigate to "Course completion" in current page administration
+ And I set the field "Course completion tertiary navigation" to "Default activity completion"
+ And the page should meet accessibility standards
diff --git a/course/renderer.php b/course/renderer.php
index 53567541b14..47992ebd192 100644
--- a/course/renderer.php
+++ b/course/renderer.php
@@ -378,7 +378,7 @@ class core_course_renderer extends plugin_renderer_base {
$altname = get_accesshide(' ' . $cm->modfullname);
$name = html_writer::empty_tag('img', array('src' => $cm->get_icon_url(),
- 'class' => 'iconlarge activityicon', 'alt' => ' ', 'role' => 'presentation')) .
+ 'class' => 'iconlarge activityicon', 'alt' => '')) .
html_writer::tag('span', ' '.$cm->get_formatted_name() . $altname, array('class' => 'instancename'));
$formattedinfo = \core_availability\info::format_info($cm->availableinfo, $cm->get_course());
return html_writer::div($name, 'activityinstance-error') .
diff --git a/course/templates/activityinstance.mustache b/course/templates/activityinstance.mustache
index 86a32a7384b..d1af70a3a4d 100644
--- a/course/templates/activityinstance.mustache
+++ b/course/templates/activityinstance.mustache
@@ -42,7 +42,7 @@
{{/canmanage}}
-
+ {{{modname}}}
diff --git a/course/templates/editdefaultcompletion.mustache b/course/templates/editdefaultcompletion.mustache
index 30f0c519619..22000de085a 100644
--- a/course/templates/editdefaultcompletion.mustache
+++ b/course/templates/editdefaultcompletion.mustache
@@ -38,7 +38,7 @@