diff --git a/src/core/features/course/tests/behat/basic_usage-311.feature b/src/core/features/course/tests/behat/basic_usage-311.feature
index 99b642baf..32644ce60 100755
--- a/src/core/features/course/tests/behat/basic_usage-311.feature
+++ b/src/core/features/course/tests/behat/basic_usage-311.feature
@@ -85,20 +85,20 @@ Feature: Test basic usage of one course in app
     And I press "OK" in the app
     And I wait loading to finish in the app
     Then the header should be "Course 1" in the app
+    And I should find "Test forum name" in the app
+    And I should find "Test wiki name" in the app
     And I should find "Choice course 1" in the app
     And I should find "assignment" in the app
-    And I should find "Test forum name" in the app
-    And I should find "Test chat name" in the app
-    And I should find "Web links" in the app
     And I should find "Test external name" in the app
-    And I should find "Test feedback name" in the app
-    And I should find "Test glossary" in the app
-    And I should find "Quiz 1" in the app
     And I should find "Test survey name" in the app
-    And I should find "Test wiki name" in the app
-    And I should find "Test lesson name" in the app
+    And I should find "Test chat name" in the app
+    And I should find "Quiz 1" in the app
     And I should find "Test scorm name" in the app
+    And I should find "Test feedback name" in the app
+    And I should find "Test lesson name" in the app
     And I should find "Test workshop name" in the app
+    And I should not find "Web links" in the app
+    And I should not find "Test glossary" in the app
 
   Scenario: Guest access
     Given I entered the course "Course 1" as "teacher1" in the app
@@ -122,16 +122,16 @@ Feature: Test basic usage of one course in app
 
     When I press "View course" "ion-button" in the app
     Then the header should be "Course 1" in the app
+    And I should find "Test forum name" in the app
+    And I should find "Test wiki name" in the app
     And I should find "Choice course 1" in the app
     And I should find "assignment" in the app
-    And I should find "Test forum name" in the app
-    And I should find "Test chat name" in the app
-    And I should find "Web links" in the app
-    And I should find "Test feedback name" in the app
-    And I should find "Test glossary" in the app
-    And I should find "Quiz 1" in the app
     And I should find "Test survey name" in the app
-    And I should find "Test wiki name" in the app
-    And I should find "Test lesson name" in the app
+    And I should find "Test chat name" in the app
+    And I should find "Quiz 1" in the app
     And I should find "Test scorm name" in the app
+    And I should find "Test feedback name" in the app
+    And I should find "Test lesson name" in the app
     And I should find "Test workshop name" in the app
+    And I should not find "Web links" in the app
+    And I should not find "Test glossary" in the app
diff --git a/src/core/features/course/tests/behat/basic_usage.feature b/src/core/features/course/tests/behat/basic_usage.feature
index 8cb9e184d..c1e9904cd 100755
--- a/src/core/features/course/tests/behat/basic_usage.feature
+++ b/src/core/features/course/tests/behat/basic_usage.feature
@@ -83,25 +83,33 @@ Feature: Test basic usage of one course in app
   Scenario: View course contents
     When I entered the course "Course 1" as "student1" in the app
     Then the header should be "Course 1" in the app
+    And I should find "Test forum name" in the app
+    And I should find "Test wiki name" in the app
     And I should find "Choice course 1" in the app
     And I should find "assignment" in the app
-    And I should find "Test forum name" in the app
-    And I should find "Test chat name" in the app
-    And I should find "Web links" in the app
     And I should find "Test external name" in the app
-    And I should find "Test feedback name" in the app
-    And I should find "Test glossary" in the app
-    And I should find "Quiz 1" in the app
     And I should find "Test survey name" in the app
-    And I should find "Test wiki name" in the app
-    And I should find "Test lesson name" in the app
+    And I should find "Test chat name" in the app
+    And I should find "Quiz 1" in the app
     And I should find "Test scorm name" in the app
+    And I should find "Test feedback name" in the app
+    And I should find "Test lesson name" in the app
     And I should find "Test workshop name" in the app
+    And I should not find "Web links" in the app
+    And I should not find "Test glossary" in the app
 
     When I set "page-core-course-index .core-course-thumb" styles to "background" "lightblue"
     And I set "page-core-course-index .core-course-thumb img" styles to "display" "none"
     Then the UI should match the snapshot
 
+    # Test infinite scroll on course
+    When I scroll to "Test workshop name" in the app
+    Then I should find "Web links" in the app
+    And I should find "Test glossary" in the app
+
+    # Test Collapsible header
+    And the UI should match the snapshot
+
     When I press "Choice course 1" in the app
     Then the header should be "Choice course 1" in the app
 
@@ -161,20 +169,20 @@ Feature: Test basic usage of one course in app
   Scenario: View section contents
     When I entered the course "Course 1" as "student1" in the app
     Then the header should be "Course 1" in the app
+    And I should find "Test forum name" in the app
+    And I should find "Test wiki name" in the app
     And I should find "Choice course 1" in the app
     And I should find "assignment" in the app
-    And I should find "Test forum name" in the app
-    And I should find "Test chat name" in the app
-    And I should find "Web links" in the app
     And I should find "Test external name" in the app
-    And I should find "Test feedback name" in the app
-    And I should find "Test glossary" in the app
-    And I should find "Quiz 1" in the app
     And I should find "Test survey name" in the app
-    And I should find "Test wiki name" in the app
-    And I should find "Test lesson name" in the app
+    And I should find "Test chat name" in the app
+    And I should find "Quiz 1" in the app
     And I should find "Test scorm name" in the app
+    And I should find "Test feedback name" in the app
+    And I should find "Test lesson name" in the app
     And I should find "Test workshop name" in the app
+    And I should not find "Web links" in the app
+    And I should not find "Test glossary" in the app
 
     When I press "Course index" in the app
     And I press "General" in the app
@@ -337,20 +345,20 @@ Feature: Test basic usage of one course in app
   Scenario: Navigation between sections using the bottom arrows
     When I entered the course "Course 1" as "student1" in the app
     Then the header should be "Course 1" in the app
+   And I should find "Test forum name" in the app
+    And I should find "Test wiki name" in the app
     And I should find "Choice course 1" in the app
     And I should find "assignment" in the app
-    And I should find "Test forum name" in the app
-    And I should find "Test chat name" in the app
-    And I should find "Web links" in the app
     And I should find "Test external name" in the app
-    And I should find "Test feedback name" in the app
-    And I should find "Test glossary" in the app
-    And I should find "Quiz 1" in the app
     And I should find "Test survey name" in the app
-    And I should find "Test wiki name" in the app
-    And I should find "Test lesson name" in the app
+    And I should find "Test chat name" in the app
+    And I should find "Quiz 1" in the app
     And I should find "Test scorm name" in the app
+    And I should find "Test feedback name" in the app
+    And I should find "Test lesson name" in the app
     And I should find "Test workshop name" in the app
+    And I should not find "Web links" in the app
+    And I should not find "Test glossary" in the app
 
     When I press "Course index" in the app
     And I press "General" in the app
@@ -425,20 +433,20 @@ Feature: Test basic usage of one course in app
     And I press "OK" in the app
     And I wait loading to finish in the app
     Then the header should be "Course 1" in the app
+    And I should find "Test forum name" in the app
+    And I should find "Test wiki name" in the app
     And I should find "Choice course 1" in the app
     And I should find "assignment" in the app
-    And I should find "Test forum name" in the app
-    And I should find "Test chat name" in the app
-    And I should find "Web links" in the app
     And I should find "Test external name" in the app
-    And I should find "Test feedback name" in the app
-    And I should find "Test glossary" in the app
-    And I should find "Quiz 1" in the app
     And I should find "Test survey name" in the app
-    And I should find "Test wiki name" in the app
-    And I should find "Test lesson name" in the app
+    And I should find "Test chat name" in the app
+    And I should find "Quiz 1" in the app
     And I should find "Test scorm name" in the app
+    And I should find "Test feedback name" in the app
+    And I should find "Test lesson name" in the app
     And I should find "Test workshop name" in the app
+    And I should not find "Web links" in the app
+    And I should not find "Test glossary" in the app
 
   Scenario: View blocks on drawer
     Given the following "blocks" exist:
@@ -447,20 +455,20 @@ Feature: Test basic usage of one course in app
       | activity_modules | Course       | C1        | course-view-*   | site-pre      |                                                                                                              |
     And I entered the course "Course 1" as "student1" in the app
     Then the header should be "Course 1" in the app
+    And I should find "Test forum name" in the app
+    And I should find "Test wiki name" in the app
     And I should find "Choice course 1" in the app
     And I should find "assignment" in the app
-    And I should find "Test forum name" in the app
-    And I should find "Test chat name" in the app
-    And I should find "Web links" in the app
     And I should find "Test external name" in the app
-    And I should find "Test feedback name" in the app
-    And I should find "Test glossary" in the app
-    And I should find "Quiz 1" in the app
     And I should find "Test survey name" in the app
-    And I should find "Test wiki name" in the app
-    And I should find "Test lesson name" in the app
+    And I should find "Test chat name" in the app
+    And I should find "Quiz 1" in the app
     And I should find "Test scorm name" in the app
+    And I should find "Test feedback name" in the app
+    And I should find "Test lesson name" in the app
     And I should find "Test workshop name" in the app
+    And I should not find "Web links" in the app
+    And I should not find "Test glossary" in the app
     Then I press "Open block drawer" in the app
     And I should find "HTML title test" in the app
     And I should find "body test" in the app
diff --git a/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_46.png b/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_46.png
index 431c0a806..12ebfcb86 100644
Binary files a/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_46.png and b/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_46.png differ
diff --git a/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_50.png b/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_50.png
new file mode 100644
index 000000000..ddc6ce75b
Binary files /dev/null and b/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_50.png differ