diff --git a/.github/workflows/moodle-plugin-ci.yml b/.github/workflows/moodle-plugin-ci.yml
index 36587a391..edaa4878c 100644
--- a/.github/workflows/moodle-plugin-ci.yml
+++ b/.github/workflows/moodle-plugin-ci.yml
@@ -30,9 +30,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4']
-        moodle-branch: ['MOODLE_39_STABLE']
-        database: [pgsql, mariadb]
+        include:
+          - php: '7.4'
+            moodle-branch: 'MOODLE_39_STABLE'
+            database: 'pgsql'
+          - php: '7.4'
+            moodle-branch: 'MOODLE_39_STABLE'
+            database: 'mariadb'
+          - php: '7.4'
+            moodle-branch: 'MOODLE_311_STABLE'
+            database: 'pgsql'
+          - php: '7.4'
+            moodle-branch: 'MOODLE_311_STABLE'
+            database: 'mariadb'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_311_STABLE'
+            database: 'pgsql'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_311_STABLE'
+            database: 'mariadb'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_400_STABLE'
+            database: 'pgsql'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_400_STABLE'
+            database: 'mariadb'
 
     steps:
       - name: Check out repository code
@@ -63,10 +85,19 @@ jobs:
           cd plugin
           composer install
 
-      - name: Install moodle-plugin-ci
+      - name: Install additional supported plugins (Moodle 3.9-3.11)
+        if: ${{ matrix.moodle-branch == 'MOODLE_39_STABLE' || matrix.moodle-branch == 'MOODLE_310_STABLE' || matrix.moodle-branch == 'MOODLE_311_STABLE' }}
         run: |
           moodle-plugin-ci add-plugin --branch MOODLE_34_STABLE catalyst/moodle-mod_facetoface
           moodle-plugin-ci add-plugin --branch v3.0-stable blindsidenetworks/moodle-mod_bigbluebuttonbn
+
+      - name: Install additional supported plugins (Moodle 4.0)
+        if: ${{ matrix.moodle-branch == 'MOODLE_400_STABLE' }}
+        run: |
+          moodle-plugin-ci add-plugin --branch MOODLE_400_STABLE catalyst/moodle-mod_facetoface
+
+      - name: Install the plugin.
+        run: |
           moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
         env:
           DB: ${{ matrix.database }}
diff --git a/classes/log/store.php b/classes/log/store.php
index 8b1a2cf10..a03ee4b4e 100755
--- a/classes/log/store.php
+++ b/classes/log/store.php
@@ -154,7 +154,7 @@ protected function get_event_id($event) {
      * Insert events in bulk to the database. Overrides helper_writer.
      * @param array $events raw event data
      */
-    protected function insert_event_entries(array $events) {
+    protected function insert_event_entries($events) {
         global $DB;
 
         // If in background mode, just save them in the database.
diff --git a/tests/core/course_completed/completing_existing_course/completing_existing_course_test.php b/tests/core/course_completed/completing_existing_course/completing_existing_course_test.php
index 0488cd129..ac52aeed0 100644
--- a/tests/core/course_completed/completing_existing_course/completing_existing_course_test.php
+++ b/tests/core/course_completed/completing_existing_course/completing_existing_course_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_completed
      * @return void
      */
     public function test_init() {
diff --git a/tests/core/course_completed/send_jisc_data/send_jisc_data_test.php b/tests/core/course_completed/send_jisc_data/send_jisc_data_test.php
index a6c4d431e..ca019ae74 100644
--- a/tests/core/course_completed/send_jisc_data/send_jisc_data_test.php
+++ b/tests/core/course_completed/send_jisc_data/send_jisc_data_test.php
@@ -58,6 +58,7 @@ protected function get_transformer_config() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_completed
      * @return void
      */
     public function test_init() {
diff --git a/tests/core/course_module_completion_update/completing_existing_module/completing_existing_module_test.php b/tests/core/course_module_completion_update/completing_existing_module/completing_existing_module_test.php
index 4d80a512c..19f1946ba 100644
--- a/tests/core/course_module_completion_update/completing_existing_module/completing_existing_module_test.php
+++ b/tests/core/course_module_completion_update/completing_existing_module/completing_existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_completion_updated
      * @return void
      */
     public function test_init() {
diff --git a/tests/core/course_viewed/viewing_existing_course/viewing_existing_course_test.php b/tests/core/course_viewed/viewing_existing_course/viewing_existing_course_test.php
index cbb934d47..a269f61b2 100644
--- a/tests/core/course_viewed/viewing_existing_course/viewing_existing_course_test.php
+++ b/tests/core/course_viewed/viewing_existing_course/viewing_existing_course_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/core/unknown_event/data.json b/tests/core/unknown_event/data.json
deleted file mode 100644
index 9e26dfeeb..000000000
--- a/tests/core/unknown_event/data.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/tests/core/unknown_event/event.json b/tests/core/unknown_event/event.json
deleted file mode 100644
index 142c28c88..000000000
--- a/tests/core/unknown_event/event.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "id": 1,
-    "eventname": "unknown_event"
-}
\ No newline at end of file
diff --git a/tests/core/unknown_event/statements.json b/tests/core/unknown_event/statements.json
deleted file mode 100644
index 0637a088a..000000000
--- a/tests/core/unknown_event/statements.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/tests/core/unknown_event/unknown_event_test.php b/tests/core/unknown_event/unknown_event_test.php
deleted file mode 100644
index fda246f01..000000000
--- a/tests/core/unknown_event/unknown_event_test.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-namespace logstore_xapi\core\unknown_event;
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-
-require_once($CFG->dirroot . '/admin/tool/log/store/xapi/tests/xapi_test_case.php');
-
-/**
- * Unit test for unknown event.
- *
- * @package   logstore_xapi
- * @copyright Jerret Fowler <jerrett.fowler@gmail.com>
- *            Ryan Smith <https://www.linkedin.com/in/ryan-smith-uk/>
- *            David Pesce <david.pesce@exputo.com>
- * @license   https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class unknown_event_test extends \logstore_xapi\xapi_test_case {
-
-    /**
-     * Retrieve the directory of the unit test.
-     *
-     * @return string
-     */
-    protected function get_test_dir() {
-        return __DIR__;
-    }
-
-    /**
-     * Appease auto-detecting of test cases. xapi_test_case has default test cases.
-     *
-     * @return void
-     */
-    public function test_init() {
-
-    }
-}
diff --git a/tests/core/user_created/existing_user_created/existing_user_created_test.php b/tests/core/user_created/existing_user_created/existing_user_created_test.php
index 209ea6404..cd7dd877b 100644
--- a/tests/core/user_created/existing_user_created/existing_user_created_test.php
+++ b/tests/core/user_created/existing_user_created/existing_user_created_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_created
      * @return void
      */
     public function test_init() {
diff --git a/tests/core/user_created/send_jisc_data/send_jisc_data_test.php b/tests/core/user_created/send_jisc_data/send_jisc_data_test.php
index 25125cdd8..d4444c9b7 100644
--- a/tests/core/user_created/send_jisc_data/send_jisc_data_test.php
+++ b/tests/core/user_created/send_jisc_data/send_jisc_data_test.php
@@ -58,6 +58,7 @@ protected function get_transformer_config() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_created
      * @return void
      */
     public function test_init() {
diff --git a/tests/core/user_enrolment_created/existing_user_enrolled/existing_user_enrolled_test.php b/tests/core/user_enrolment_created/existing_user_enrolled/existing_user_enrolled_test.php
index 29744645b..749656f77 100644
--- a/tests/core/user_enrolment_created/existing_user_enrolled/existing_user_enrolled_test.php
+++ b/tests/core/user_enrolment_created/existing_user_enrolled/existing_user_enrolled_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_enrolment_created
      * @return void
      */
     public function test_init() {
diff --git a/tests/core/user_loggedin/existing_user_loggedin/existing_user_loggedin_test.php b/tests/core/user_loggedin/existing_user_loggedin/existing_user_loggedin_test.php
index 795c11e58..c56fab258 100644
--- a/tests/core/user_loggedin/existing_user_loggedin/existing_user_loggedin_test.php
+++ b/tests/core/user_loggedin/existing_user_loggedin/existing_user_loggedin_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_loggedin
      * @return void
      */
     public function test_init() {
diff --git a/tests/core/user_loggedout/existing_user_loggedout/existing_user_loggedout_test.php b/tests/core/user_loggedout/existing_user_loggedout/existing_user_loggedout_test.php
index ef1397a18..ccc4e20a5 100644
--- a/tests/core/user_loggedout/existing_user_loggedout/existing_user_loggedout_test.php
+++ b/tests/core/user_loggedout/existing_user_loggedout/existing_user_loggedout_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_loggedout
      * @return void
      */
     public function test_init() {
diff --git a/tests/failed_report_test.php b/tests/failed_report_test.php
index 46b5ccd0c..92bd531c6 100644
--- a/tests/failed_report_test.php
+++ b/tests/failed_report_test.php
@@ -71,6 +71,8 @@ protected function get_validated_form() {
     /**
      * Creating minimum a single course view event to xapi logstore.
      * Submit form and validate form data.
+     *
+     * @covers \form\tool_logstore_xapi_reportfilter_form
      */
     public function test_single_element() {
         global $DB;
@@ -90,6 +92,8 @@ public function test_single_element() {
      * Creating multiple course view events to xapi logstore.
      * Record number depends on $multipletestnumber.
      * Submit form and validate form data.
+     *
+     * @covers \form\tool_logstore_xapi_reportfilter_form
      */
     public function test_multiple_elements() {
         global $DB;
diff --git a/tests/history_report_test.php b/tests/history_report_test.php
index 6f7dfeb8b..5a53e4115 100644
--- a/tests/history_report_test.php
+++ b/tests/history_report_test.php
@@ -69,6 +69,8 @@ protected function get_validated_form() {
     /**
      * Creating minimum a single course view event to xapi logstore.
      * Submit form and validate form data.
+     *
+     * @covers \form\tool_logstore_xapi_reportfilter_form
      */
     public function test_single_element() {
         global $DB;
@@ -88,6 +90,8 @@ public function test_single_element() {
      * Creating multiple course view events to xapi logstore.
      * Record number depends on $multipletestnumber.
      * Submit form and validate form data.
+     *
+     * @covers \form\tool_logstore_xapi_reportfilter_form
      */
     public function test_multiple_elements() {
         global $DB;
diff --git a/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/existing_assignment_graded_comment_test.php b/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/existing_assignment_graded_comment_test.php
index 639976dc3..506b93c7f 100644
--- a/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/existing_assignment_graded_comment_test.php
+++ b/tests/mod_assign/assignment_graded/existing_assignment_graded_comment/existing_assignment_graded_comment_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::assignment_graded
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/existing_assignment_graded_nocomment_test.php b/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/existing_assignment_graded_nocomment_test.php
index c6be3c19f..4703a27b1 100644
--- a/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/existing_assignment_graded_nocomment_test.php
+++ b/tests/mod_assign/assignment_graded/existing_assignment_graded_nocomment/existing_assignment_graded_nocomment_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::assignment_graded
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/existing_assignment_submitted_test.php b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/existing_assignment_submitted_test.php
index 1bc54e478..b70a552f3 100644
--- a/tests/mod_assign/assignment_submitted/existing_assignment_submitted/existing_assignment_submitted_test.php
+++ b/tests/mod_assign/assignment_submitted/existing_assignment_submitted/existing_assignment_submitted_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::assignment_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/activity_management_viewed/activity_management_viewed_test.php b/tests/mod_bigbluebuttonbn/activity_management_viewed/activity_management_viewed_test.php
index abe83cc7d..70a9a6139 100644
--- a/tests/mod_bigbluebuttonbn/activity_management_viewed/activity_management_viewed_test.php
+++ b/tests/mod_bigbluebuttonbn/activity_management_viewed/activity_management_viewed_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::activity_management_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/live_session/live_session_test.php b/tests/mod_bigbluebuttonbn/live_session/live_session_test.php
index 011affdb7..701c2a8c7 100644
--- a/tests/mod_bigbluebuttonbn/live_session/live_session_test.php
+++ b/tests/mod_bigbluebuttonbn/live_session/live_session_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::live_session
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/meeting_created/meeting_created_test.php b/tests/mod_bigbluebuttonbn/meeting_created/meeting_created_test.php
index 1722d1571..5d8c9c29f 100644
--- a/tests/mod_bigbluebuttonbn/meeting_created/meeting_created_test.php
+++ b/tests/mod_bigbluebuttonbn/meeting_created/meeting_created_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::meeting_created
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/meeting_ended/meeting_ended_test.php b/tests/mod_bigbluebuttonbn/meeting_ended/meeting_ended_test.php
index 893f51831..669af2878 100644
--- a/tests/mod_bigbluebuttonbn/meeting_ended/meeting_ended_test.php
+++ b/tests/mod_bigbluebuttonbn/meeting_ended/meeting_ended_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::meeting_ended
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/meeting_joined/meeting_joined_test.php b/tests/mod_bigbluebuttonbn/meeting_joined/meeting_joined_test.php
index 6c8f522eb..f8b150c8b 100644
--- a/tests/mod_bigbluebuttonbn/meeting_joined/meeting_joined_test.php
+++ b/tests/mod_bigbluebuttonbn/meeting_joined/meeting_joined_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::meeting_joined
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/meeting_left/meeting_left_test.php b/tests/mod_bigbluebuttonbn/meeting_left/meeting_left_test.php
index 6fe3b82a8..d271f24ae 100644
--- a/tests/mod_bigbluebuttonbn/meeting_left/meeting_left_test.php
+++ b/tests/mod_bigbluebuttonbn/meeting_left/meeting_left_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::meeting_left
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/recording_deleted/recording_deleted_test.php b/tests/mod_bigbluebuttonbn/recording_deleted/recording_deleted_test.php
index f68faaeec..df5dbf285 100644
--- a/tests/mod_bigbluebuttonbn/recording_deleted/recording_deleted_test.php
+++ b/tests/mod_bigbluebuttonbn/recording_deleted/recording_deleted_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_deleted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/recording_edited/recording_edited_test.php b/tests/mod_bigbluebuttonbn/recording_edited/recording_edited_test.php
index 556b46954..1f79ca1aa 100644
--- a/tests/mod_bigbluebuttonbn/recording_edited/recording_edited_test.php
+++ b/tests/mod_bigbluebuttonbn/recording_edited/recording_edited_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_edited
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/recording_imported/recording_imported_test.php b/tests/mod_bigbluebuttonbn/recording_imported/recording_imported_test.php
index 51705c230..ebd58bec2 100644
--- a/tests/mod_bigbluebuttonbn/recording_imported/recording_imported_test.php
+++ b/tests/mod_bigbluebuttonbn/recording_imported/recording_imported_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_imported
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/recording_protected/recording_protected_test.php b/tests/mod_bigbluebuttonbn/recording_protected/recording_protected_test.php
index 93931db28..d55118f9b 100644
--- a/tests/mod_bigbluebuttonbn/recording_protected/recording_protected_test.php
+++ b/tests/mod_bigbluebuttonbn/recording_protected/recording_protected_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_protected
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/recording_published/recording_published_test.php b/tests/mod_bigbluebuttonbn/recording_published/recording_published_test.php
index 16d4b01b9..cb991a762 100644
--- a/tests/mod_bigbluebuttonbn/recording_published/recording_published_test.php
+++ b/tests/mod_bigbluebuttonbn/recording_published/recording_published_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_published
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/recording_unprotected/recording_unprotected_test.php b/tests/mod_bigbluebuttonbn/recording_unprotected/recording_unprotected_test.php
index 8dfdf31fc..9129267b9 100644
--- a/tests/mod_bigbluebuttonbn/recording_unprotected/recording_unprotected_test.php
+++ b/tests/mod_bigbluebuttonbn/recording_unprotected/recording_unprotected_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_unprotected
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/recording_unpublished/recording_unpublished_test.php b/tests/mod_bigbluebuttonbn/recording_unpublished/recording_unpublished_test.php
index 9a8da5f70..869f483c6 100644
--- a/tests/mod_bigbluebuttonbn/recording_unpublished/recording_unpublished_test.php
+++ b/tests/mod_bigbluebuttonbn/recording_unpublished/recording_unpublished_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_unpublished
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_bigbluebuttonbn/recording_viewed/recording_viewed_test.php b/tests/mod_bigbluebuttonbn/recording_viewed/recording_viewed_test.php
index bca3218c7..941f0173a 100644
--- a/tests/mod_bigbluebuttonbn/recording_viewed/recording_viewed_test.php
+++ b/tests/mod_bigbluebuttonbn/recording_viewed/recording_viewed_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::recording_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/existing_chapter_viewed_with_parent_test.php b/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/existing_chapter_viewed_with_parent_test.php
index 688aaa446..9150dc1e5 100644
--- a/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/existing_chapter_viewed_with_parent_test.php
+++ b/tests/mod_book/chapter_viewed/existing_chapter_viewed_with_parent/existing_chapter_viewed_with_parent_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::chapter_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/existing_chapter_viewed_without_parent_test.php b/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/existing_chapter_viewed_without_parent_test.php
index 31ad78b2c..90d44f648 100644
--- a/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/existing_chapter_viewed_without_parent_test.php
+++ b/tests/mod_book/chapter_viewed/existing_chapter_viewed_without_parent/existing_chapter_viewed_without_parent_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::chapter_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_book/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_book/course_module_viewed/existing_module/existing_module_test.php
index a782a0bf2..db00ea5d4 100644
--- a/tests/mod_book/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_book/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_chat/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_chat/course_module_viewed/existing_module/existing_module_test.php
index 7ce54c4bb..e90ad9c36 100644
--- a/tests/mod_chat/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_chat/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_choice/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_choice/course_module_viewed/existing_module/existing_module_test.php
index 693c9eaad..f67a126e6 100644
--- a/tests/mod_choice/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_choice/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_data/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_data/course_module_viewed/existing_module/existing_module_test.php
index 9b63ab79f..2568376d2 100644
--- a/tests/mod_data/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_data/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/existing_booking_canceled.php b/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/existing_booking_canceled_test.php
similarity index 98%
rename from tests/mod_facetoface/cancel_booking/existing_booking_cancelled/existing_booking_canceled.php
rename to tests/mod_facetoface/cancel_booking/existing_booking_cancelled/existing_booking_canceled_test.php
index 3ee2c064d..2f35cfaf0 100644
--- a/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/existing_booking_canceled.php
+++ b/tests/mod_facetoface/cancel_booking/existing_booking_cancelled/existing_booking_canceled_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::cancel_booking
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_facetoface/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_facetoface/course_module_viewed/existing_module/existing_module_test.php
index 40cc2fcca..0adacc67f 100644
--- a/tests/mod_facetoface/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_facetoface/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_facetoface/signup_success/existing_signup_success/existing_signup_success_test.php b/tests/mod_facetoface/signup_success/existing_signup_success/existing_signup_success_test.php
index b240a2888..76b073b6e 100644
--- a/tests/mod_facetoface/signup_success/existing_signup_success/existing_signup_success_test.php
+++ b/tests/mod_facetoface/signup_success/existing_signup_success/existing_signup_success_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::signup_success
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_facetoface/take_attendance/existing_attendance_taken/existing_attendance_taken_test.php b/tests/mod_facetoface/take_attendance/existing_attendance_taken/existing_attendance_taken_test.php
index 1626607f1..5541ca2e2 100644
--- a/tests/mod_facetoface/take_attendance/existing_attendance_taken/existing_attendance_taken_test.php
+++ b/tests/mod_facetoface/take_attendance/existing_attendance_taken/existing_attendance_taken_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::take_attendance
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_feedback/course_module_viewed/viewing_feedback/viewing_feedback_test.php b/tests/mod_feedback/course_module_viewed/viewing_feedback/viewing_feedback_test.php
index 7ce80cbb3..17085c4ca 100644
--- a/tests/mod_feedback/course_module_viewed/viewing_feedback/viewing_feedback_test.php
+++ b/tests/mod_feedback/course_module_viewed/viewing_feedback/viewing_feedback_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_feedback/response_submitted/multichoice/multichoice_test.php b/tests/mod_feedback/response_submitted/multichoice/multichoice_test.php
index fb8902cb9..ca5b66c9c 100644
--- a/tests/mod_feedback/response_submitted/multichoice/multichoice_test.php
+++ b/tests/mod_feedback/response_submitted/multichoice/multichoice_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::response_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_feedback/response_submitted/multichoicerated/multichoicerated_test.php b/tests/mod_feedback/response_submitted/multichoicerated/multichoicerated_test.php
index 415f80808..06b99a7b2 100644
--- a/tests/mod_feedback/response_submitted/multichoicerated/multichoicerated_test.php
+++ b/tests/mod_feedback/response_submitted/multichoicerated/multichoicerated_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::response_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_feedback/response_submitted/no_items/no_items_test.php b/tests/mod_feedback/response_submitted/no_items/no_items_test.php
index 94e492e02..c8279417a 100644
--- a/tests/mod_feedback/response_submitted/no_items/no_items_test.php
+++ b/tests/mod_feedback/response_submitted/no_items/no_items_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::response_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_feedback/response_submitted/numerical/numerical_test.php b/tests/mod_feedback/response_submitted/numerical/numerical_test.php
index 5392dbe6c..d431e858f 100644
--- a/tests/mod_feedback/response_submitted/numerical/numerical_test.php
+++ b/tests/mod_feedback/response_submitted/numerical/numerical_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::response_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_feedback/response_submitted/textarea/textarea_test.php b/tests/mod_feedback/response_submitted/textarea/textarea_test.php
index 607d5be0c..177faec96 100644
--- a/tests/mod_feedback/response_submitted/textarea/textarea_test.php
+++ b/tests/mod_feedback/response_submitted/textarea/textarea_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::response_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_feedback/response_submitted/textfield/textfield_test.php b/tests/mod_feedback/response_submitted/textfield/textfield_test.php
index 9fc9cfa0f..738e16f2c 100644
--- a/tests/mod_feedback/response_submitted/textfield/textfield_test.php
+++ b/tests/mod_feedback/response_submitted/textfield/textfield_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::response_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_feedback/response_submitted/unknown_typ/unknown_typ_test.php b/tests/mod_feedback/response_submitted/unknown_typ/unknown_typ_test.php
index 283295ee5..9dccd8b4a 100644
--- a/tests/mod_feedback/response_submitted/unknown_typ/unknown_typ_test.php
+++ b/tests/mod_feedback/response_submitted/unknown_typ/unknown_typ_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::response_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_folder/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_folder/course_module_viewed/existing_module/existing_module_test.php
index 961b9e73f..6385a6373 100644
--- a/tests/mod_folder/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_folder/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_forum/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_forum/course_module_viewed/existing_module/existing_module_test.php
index 4d833334a..013d6d486 100644
--- a/tests/mod_forum/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_forum/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_forum/discussion_created/existing_module_test.php b/tests/mod_forum/discussion_created/existing_module_test.php
index 597b9e1e7..6eea90ff2 100644
--- a/tests/mod_forum/discussion_created/existing_module_test.php
+++ b/tests/mod_forum/discussion_created/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::discussion_created
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_forum/discussion_viewed/existing_discussion_viewed/existing_discussion_viewed_test.php b/tests/mod_forum/discussion_viewed/existing_discussion_viewed/existing_discussion_viewed_test.php
index 02fd1179d..5b6eef4f4 100644
--- a/tests/mod_forum/discussion_viewed/existing_discussion_viewed/existing_discussion_viewed_test.php
+++ b/tests/mod_forum/discussion_viewed/existing_discussion_viewed/existing_discussion_viewed_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::discussion_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_forum/post_created/post_created_test.php b/tests/mod_forum/post_created/post_created_test.php
index f21b9fdda..f773d2c12 100644
--- a/tests/mod_forum/post_created/post_created_test.php
+++ b/tests/mod_forum/post_created/post_created_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::post_created
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_forum/user_report_viewed/existing_report_viewed/existing_report_viewed_test.php b/tests/mod_forum/user_report_viewed/existing_report_viewed/existing_report_viewed_test.php
index 76ca0d79f..af21f7a18 100644
--- a/tests/mod_forum/user_report_viewed/existing_report_viewed/existing_report_viewed_test.php
+++ b/tests/mod_forum/user_report_viewed/existing_report_viewed/existing_report_viewed_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_report_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/existing_report_viewed_all_courses_test.php b/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/existing_report_viewed_all_courses_test.php
index 06d6e3ea2..d8cdd1e93 100644
--- a/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/existing_report_viewed_all_courses_test.php
+++ b/tests/mod_forum/user_report_viewed/existing_report_viewed_all_courses/existing_report_viewed_all_courses_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::user_report_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_glossary/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_glossary/course_module_viewed/existing_module/existing_module_test.php
index ee1e51a89..5736b5cbc 100644
--- a/tests/mod_glossary/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_glossary/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_imscp/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_imscp/course_module_viewed/existing_module/existing_module_test.php
index 0d34dea7c..ba26e36db 100644
--- a/tests/mod_imscp/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_imscp/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_lesson/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_lesson/course_module_viewed/existing_module/existing_module_test.php
index 9a127ea5b..fa2e3e7b7 100644
--- a/tests/mod_lesson/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_lesson/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_lti/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_lti/course_module_viewed/existing_module/existing_module_test.php
index c32b66c73..c2be60da7 100644
--- a/tests/mod_lti/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_lti/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_page/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_page/course_module_viewed/existing_module/existing_module_test.php
index 6bc1bd04b..707cd305c 100644
--- a/tests/mod_page/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_page/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/existing_attempt_reviewed_test.php b/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/existing_attempt_reviewed_test.php
index 0d8b0bca8..0a3840c01 100644
--- a/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/existing_attempt_reviewed_test.php
+++ b/tests/mod_quiz/attempt_reviewed/existing_attempt_reviewed/existing_attempt_reviewed_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_reviewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_started/existing_attempt_started/existing_attempt_started_test.php b/tests/mod_quiz/attempt_started/existing_attempt_started/existing_attempt_started_test.php
index f7c48f91b..a77a2cd8b 100644
--- a/tests/mod_quiz/attempt_started/existing_attempt_started/existing_attempt_started_test.php
+++ b/tests/mod_quiz/attempt_started/existing_attempt_started/existing_attempt_started_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_started
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/essay/essay_test.php b/tests/mod_quiz/attempt_submitted/essay/essay_test.php
index e5a22be83..572a6301b 100644
--- a/tests/mod_quiz/attempt_submitted/essay/essay_test.php
+++ b/tests/mod_quiz/attempt_submitted/essay/essay_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/essay_null_response/essay_null_response_test.php b/tests/mod_quiz/attempt_submitted/essay_null_response/essay_null_response_test.php
index 75f686f28..4d0980ca2 100644
--- a/tests/mod_quiz/attempt_submitted/essay_null_response/essay_null_response_test.php
+++ b/tests/mod_quiz/attempt_submitted/essay_null_response/essay_null_response_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/gapselect/gapselect_test.php b/tests/mod_quiz/attempt_submitted/gapselect/gapselect_test.php
index cf4fbde82..04a795b3f 100644
--- a/tests/mod_quiz/attempt_submitted/gapselect/gapselect_test.php
+++ b/tests/mod_quiz/attempt_submitted/gapselect/gapselect_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/match/match_test.php b/tests/mod_quiz/attempt_submitted/match/match_test.php
index 06f8be171..d5fe41f92 100644
--- a/tests/mod_quiz/attempt_submitted/match/match_test.php
+++ b/tests/mod_quiz/attempt_submitted/match/match_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/multichoice/multichoice_test.php b/tests/mod_quiz/attempt_submitted/multichoice/multichoice_test.php
index ba274e3e8..70aff7926 100644
--- a/tests/mod_quiz/attempt_submitted/multichoice/multichoice_test.php
+++ b/tests/mod_quiz/attempt_submitted/multichoice/multichoice_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/multichoice_withchoices/multichoice_withchoices_test.php b/tests/mod_quiz/attempt_submitted/multichoice_withchoices/multichoice_withchoices_test.php
index 4a7cf7038..76dddc4f0 100644
--- a/tests/mod_quiz/attempt_submitted/multichoice_withchoices/multichoice_withchoices_test.php
+++ b/tests/mod_quiz/attempt_submitted/multichoice_withchoices/multichoice_withchoices_test.php
@@ -69,6 +69,7 @@ protected function get_transformer_config() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/multichoiceset/multichoiceset_test.php b/tests/mod_quiz/attempt_submitted/multichoiceset/multichoiceset_test.php
index 2d5de442d..09b16c487 100644
--- a/tests/mod_quiz/attempt_submitted/multichoiceset/multichoiceset_test.php
+++ b/tests/mod_quiz/attempt_submitted/multichoiceset/multichoiceset_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/multichoiceset_withchoices_test.php b/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/multichoiceset_withchoices_test.php
index 6ae818631..60bdd98af 100644
--- a/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/multichoiceset_withchoices_test.php
+++ b/tests/mod_quiz/attempt_submitted/multichoiceset_withchoices/multichoiceset_withchoices_test.php
@@ -69,6 +69,7 @@ protected function get_transformer_config() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/no_questions/no_questions_test.php b/tests/mod_quiz/attempt_submitted/no_questions/no_questions_test.php
index 293866210..007fa835a 100644
--- a/tests/mod_quiz/attempt_submitted/no_questions/no_questions_test.php
+++ b/tests/mod_quiz/attempt_submitted/no_questions/no_questions_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/numerical/numerical_test.php b/tests/mod_quiz/attempt_submitted/numerical/numerical_test.php
index df652f6a5..c8ba1730f 100644
--- a/tests/mod_quiz/attempt_submitted/numerical/numerical_test.php
+++ b/tests/mod_quiz/attempt_submitted/numerical/numerical_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/randomsamatch/randomsamatch_test.php b/tests/mod_quiz/attempt_submitted/randomsamatch/randomsamatch_test.php
index 1a24038e1..aed829e62 100644
--- a/tests/mod_quiz/attempt_submitted/randomsamatch/randomsamatch_test.php
+++ b/tests/mod_quiz/attempt_submitted/randomsamatch/randomsamatch_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/shortanswer/shortanswer_test.php b/tests/mod_quiz/attempt_submitted/shortanswer/shortanswer_test.php
index 516f612af..0188b386f 100644
--- a/tests/mod_quiz/attempt_submitted/shortanswer/shortanswer_test.php
+++ b/tests/mod_quiz/attempt_submitted/shortanswer/shortanswer_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/truefalse/truefalse_test.php b/tests/mod_quiz/attempt_submitted/truefalse/truefalse_test.php
index 5b4a49285..87ce2d913 100644
--- a/tests/mod_quiz/attempt_submitted/truefalse/truefalse_test.php
+++ b/tests/mod_quiz/attempt_submitted/truefalse/truefalse_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_submitted/unknown_qtype/unknown_qtype_test.php b/tests/mod_quiz/attempt_submitted/unknown_qtype/unknown_qtype_test.php
index b066dd04f..08b9b5394 100644
--- a/tests/mod_quiz/attempt_submitted/unknown_qtype/unknown_qtype_test.php
+++ b/tests/mod_quiz/attempt_submitted/unknown_qtype/unknown_qtype_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/attempt_viewed/existing_module/existing_module_test.php b/tests/mod_quiz/attempt_viewed/existing_module/existing_module_test.php
index 954c46ecf..766238c57 100644
--- a/tests/mod_quiz/attempt_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_quiz/attempt_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::attempt_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_quiz/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_quiz/course_module_viewed/existing_module/existing_module_test.php
index 73d88f223..1833825c5 100644
--- a/tests/mod_quiz/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_quiz/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_resource/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_resource/course_module_viewed/existing_module/existing_module_test.php
index 28a59294d..193945e13 100644
--- a/tests/mod_resource/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_resource/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_scorm/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_scorm/course_module_viewed/existing_module/existing_module_test.php
index bcd31a9bd..e610e8434 100644
--- a/tests/mod_scorm/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_scorm/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_scorm/sco_launched/existing_sco_launched/existing_sco_launched_test.php b/tests/mod_scorm/sco_launched/existing_sco_launched/existing_sco_launched_test.php
index a20c35c30..fc0a9ac76 100644
--- a/tests/mod_scorm/sco_launched/existing_sco_launched/existing_sco_launched_test.php
+++ b/tests/mod_scorm/sco_launched/existing_sco_launched/existing_sco_launched_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::sco_launched
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/existing_scoreraw_submitted_test.php b/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/existing_scoreraw_submitted_test.php
index e85b6e9a7..c2c93d341 100644
--- a/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/existing_scoreraw_submitted_test.php
+++ b/tests/mod_scorm/scoreraw_submitted/existing_scoreraw_submitted/existing_scoreraw_submitted_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::scoreraw_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_scorm/status_submitted/existing_status_submitted/existing_status_submitted_test.php b/tests/mod_scorm/status_submitted/existing_status_submitted/existing_status_submitted_test.php
index b8624ef13..62fdf28bf 100644
--- a/tests/mod_scorm/status_submitted/existing_status_submitted/existing_status_submitted_test.php
+++ b/tests/mod_scorm/status_submitted/existing_status_submitted/existing_status_submitted_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::status_submitted
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_survey/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_survey/course_module_viewed/existing_module/existing_module_test.php
index a5f251cc3..fe01fa784 100644
--- a/tests/mod_survey/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_survey/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_url/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_url/course_module_viewed/existing_module/existing_module_test.php
index baed5d4b4..763afe2cf 100644
--- a/tests/mod_url/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_url/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_wiki/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_wiki/course_module_viewed/existing_module/existing_module_test.php
index 2b8ab6fca..c9e2f83ff 100644
--- a/tests/mod_wiki/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_wiki/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/mod_workshop/course_module_viewed/existing_module/existing_module_test.php b/tests/mod_workshop/course_module_viewed/existing_module/existing_module_test.php
index 4fc68ef97..4049696f1 100644
--- a/tests/mod_workshop/course_module_viewed/existing_module/existing_module_test.php
+++ b/tests/mod_workshop/course_module_viewed/existing_module/existing_module_test.php
@@ -45,6 +45,7 @@ protected function get_test_dir() {
     /**
      * Appease auto-detecting of test cases. xapi_test_case has default test cases.
      *
+     * @covers ::course_module_viewed
      * @return void
      */
     public function test_init() {
diff --git a/tests/moveback_failed_statements_test.php b/tests/moveback_failed_statements_test.php
index e6a3202ba..4af22f37b 100644
--- a/tests/moveback_failed_statements_test.php
+++ b/tests/moveback_failed_statements_test.php
@@ -37,6 +37,8 @@ class moveback_failed_statements_test extends enchancement_jisc_skeleton {
     /**
      * Creating minimum a single course view event to xapi logstore.
      * Using moveback script for moving a single element
+     *
+     * @covers \log\moveback
      */
     public function test_single_element() {
         global $DB;
@@ -62,6 +64,8 @@ public function test_single_element() {
      * Creating multiple course view events to xapi logstore.
      * Record number depends on $multipletestnumber.
      * Using moveback script for moving multiple elements.
+     *
+     * @covers \log\moveback
      */
     public function test_multiple_elements() {
         global $DB;
diff --git a/version.php b/version.php
index 8463c0b68..a497353e9 100644
--- a/version.php
+++ b/version.php
@@ -26,10 +26,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin = isset($plugin) && is_object($plugin) ? $plugin : new \stdClass();
 $plugin->component = 'logstore_xapi';
-$plugin->version = 2020100700;
-
-$plugin->release = '';
-$plugin->requires = 2018051700;
+$plugin->version = 2022101800;
+$plugin->requires = 2020061500;
 $plugin->maturity = MATURITY_STABLE;
+$plugin->release = '';