diff --git a/admin/presets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php b/admin/presets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php
index a040691bb44..f2aea66d24c 100644
--- a/admin/presets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php
+++ b/admin/presets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php
@@ -75,15 +75,15 @@ final class adminpresets_admin_setting_bloglevel_test extends \advanced_testcase
     public static function save_value_provider(): array {
         return [
             'Save the bloglevel and set blog_menu block visibility to true' => [
-                'setttingvalue' => BLOG_USER_LEVEL,
+                'settingvalue' => BLOG_USER_LEVEL,
                 'expectedsaved' => true,
             ],
             'Same value to bloglevel, so it will not be saved' => [
-                'setttingvalue' => BLOG_SITE_LEVEL,
+                'settingvalue' => BLOG_SITE_LEVEL,
                 'expectedsaved' => false,
             ],
             'Save the bloglevel and set blog_menu block visibility to false' => [
-                'setttingvalue' => 0,
+                'settingvalue' => 0,
                 'expectedsaved' => true,
             ],
         ];
diff --git a/admin/presets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php b/admin/presets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php
index ba0c9f8b460..0fa19435d83 100644
--- a/admin/presets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php
+++ b/admin/presets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php
@@ -70,22 +70,22 @@ final class adminpresets_admin_setting_sitesettext_test extends \advanced_testca
         return [
             'Fullname: different value' => [
                 'settingname' => 'fullname',
-                'setttingvalue' => 'New site fullname',
+                'settingvalue' => 'New site fullname',
                 'expectedsaved' => true,
             ],
             'Fullname: same value' => [
                 'settingname' => 'fullname',
-                'setttingvalue' => 'PHPUnit test site',
+                'settingvalue' => 'PHPUnit test site',
                 'expectedsaved' => false,
             ],
             'Summary: different value' => [
                 'settingname' => 'summary',
-                'setttingvalue' => 'This is a new site summary.',
+                'settingvalue' => 'This is a new site summary.',
                 'expectedsaved' => true,
             ],
             'Summary: same value' => [
                 'settingname' => 'summary',
-                'setttingvalue' => '',
+                'settingvalue' => '',
                 'expectedsaved' => false,
             ],
         ];
diff --git a/admin/presets/tests/local/setting/adminpresets_setting_test.php b/admin/presets/tests/local/setting/adminpresets_setting_test.php
index b44e7f4f3e0..f140dd53531 100644
--- a/admin/presets/tests/local/setting/adminpresets_setting_test.php
+++ b/admin/presets/tests/local/setting/adminpresets_setting_test.php
@@ -83,28 +83,28 @@ final class adminpresets_setting_test extends \advanced_testcase {
                 'category' => 'optionalsubsystems',
                 'settingplugin' => 'core',
                 'settingname' => 'enablebadges',
-                'setttingvalue' => '1',
+                'settingvalue' => '1',
                 'expectedsaved' => false,
             ],
             'Core setting with a different value is saved' => [
                 'category' => 'optionalsubsystems',
                 'settingplugin' => 'core',
                 'settingname' => 'enablebadges',
-                'setttingvalue' => '0',
+                'settingvalue' => '0',
                 'expectedsaved' => true,
             ],
             'Plugin setting with the same value is not saved' => [
                 'category' => 'modsettinglesson',
                 'settingplugin' => 'mod_lesson',
                 'settingname' => 'mediawidth',
-                'setttingvalue' => '640',
+                'settingvalue' => '640',
                 'expectedsaved' => false,
             ],
             'Plugin setting with different value is saved' => [
                 'category' => 'modsettinglesson',
                 'settingplugin' => 'mod_lesson',
                 'settingname' => 'mediawidth',
-                'setttingvalue' => '900',
+                'settingvalue' => '900',
                 'expectedsaved' => true,
             ],
         ];
@@ -174,7 +174,7 @@ final class adminpresets_setting_test extends \advanced_testcase {
                 'settingplugin' => 'mod_lesson',
                 'settingname' => 'maxanswers',
                 'advsettingname' => 'maxanswers_adv',
-                'advsetttingvalue' => '1',
+                'advsettingvalue' => '1',
                 'expectedsaved' => false,
             ],
             'Plugin setting with different value is saved' => [
@@ -182,7 +182,7 @@ final class adminpresets_setting_test extends \advanced_testcase {
                 'settingplugin' => 'mod_lesson',
                 'settingname' => 'maxanswers',
                 'advsettingname' => 'maxanswers_adv',
-                'advsetttingvalue' => '0',
+                'advsettingvalue' => '0',
                 'expectedsaved' => true,
             ],
             'Plugin setting without advanced attributes are not saved' => [
@@ -190,7 +190,7 @@ final class adminpresets_setting_test extends \advanced_testcase {
                 'settingplugin' => 'mod_lesson',
                 'settingname' => 'maxanswers',
                 'advsettingname' => null,
-                'advsetttingvalue' => '0',
+                'advsettingvalue' => '0',
                 'expectedsaved' => false,
             ],
         ];
diff --git a/admin/tests/external/set_plugin_order_test.php b/admin/tests/external/set_plugin_order_test.php
index e43414eafc6..e0cba9901b9 100644
--- a/admin/tests/external/set_plugin_order_test.php
+++ b/admin/tests/external/set_plugin_order_test.php
@@ -86,45 +86,45 @@ final class set_plugin_order_test extends \externallib_advanced_testcase {
         return [
             [
                 'initialstate' => 'textarea,tiny',
-                'pluginname' => 'editor_textarea',
+                'plugin' => 'editor_textarea',
                 'direction' => 1, // DOWN.
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'tiny',
                     'textarea',
                 ]),
-                'newtexteditors' => 'tiny,textarea',
+                'newstate' => 'tiny,textarea',
             ],
             [
                 'initialstate' => 'textarea,tiny',
-                'pluginname' => 'editor_textarea',
+                'plugin' => 'editor_textarea',
                 'direction' => -1, // UP.
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'textarea',
                     'tiny',
                 ]),
-                'newtexteditors' => 'textarea,tiny',
+                'newstate' => 'textarea,tiny',
             ],
             [
                 'initialstate' => 'textarea,tiny',
-                'pluginname' => 'editor_tiny',
+                'plugin' => 'editor_tiny',
                 'direction' => 1, // DOWN.
                 // Tiny is already at the bottom of the list of enabled plugins.
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'textarea',
                     'tiny',
                 ]),
-                'newtexteditors' => 'textarea,tiny',
+                'newstate' => 'textarea,tiny',
             ],
             [
                 'initialstate' => 'textarea,tiny',
-                'pluginname' => 'editor_atto',
+                'plugin' => 'editor_atto',
                 'direction' => 1, // DOWN.
                 // Atto is not enabled. Disabled editors are listed lexically after enabled editors.
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'textarea',
                     'tiny',
                 ]),
-                'newtexteditors' => 'textarea,tiny',
+                'newstate' => 'textarea,tiny',
             ],
         ];
     }
diff --git a/analytics/tests/prediction_test.php b/analytics/tests/prediction_test.php
index ff80e303cbd..04f1ee38431 100644
--- a/analytics/tests/prediction_test.php
+++ b/analytics/tests/prediction_test.php
@@ -783,7 +783,7 @@ final class prediction_test extends \advanced_testcase {
             'bad' => array(
                 'modelquality' => 'random',
                 'ncourses' => 50,
-                'expectedresults' => array(
+                'expected' => array(
                     '\core\analytics\time_splitting\single_range' => \core_analytics\model::LOW_SCORE,
                     '\core\analytics\time_splitting\quarters' => \core_analytics\model::LOW_SCORE,
                 )
@@ -791,7 +791,7 @@ final class prediction_test extends \advanced_testcase {
             'good' => array(
                 'modelquality' => 'perfect',
                 'ncourses' => 50,
-                'expectedresults' => array(
+                'expected' => array(
                     '\core\analytics\time_splitting\single_range' => \core_analytics\model::OK,
                     '\core\analytics\time_splitting\quarters' => \core_analytics\model::OK,
                 )
@@ -969,7 +969,7 @@ final class prediction_test extends \advanced_testcase {
             foreach ($cases as $key => $case) {
 
                 if (!$predictionsprocessor instanceof \mlbackend_python\processor || empty($testpythonserver)) {
-                    $extraparams = ['predictionsprocessor' => $classfullname, 'forcedconfig' => null];
+                    $extraparams = ['predictionsprocessorclass' => $classfullname, 'forcedconfig' => null];
                     $return[$key . '-' . $classfullname] = $case + $extraparams;
                 } else {
 
@@ -979,7 +979,7 @@ final class prediction_test extends \advanced_testcase {
                         'port' => TEST_MLBACKEND_PYTHON_PORT, 'secure' => false, 'username' => TEST_MLBACKEND_PYTHON_USERNAME,
                         'password' => TEST_MLBACKEND_PYTHON_PASSWORD]];
                     $casekey = $key . '-' . $classfullname . '-server';
-                    $return[$casekey] = $case + ['predictionsprocessor' => $classfullname, 'forcedconfig' => $forcedconfig];
+                    $return[$casekey] = $case + ['predictionsprocessorclass' => $classfullname, 'forcedconfig' => $forcedconfig];
                 }
             }
         }
diff --git a/auth/lti/tests/auth_test.php b/auth/lti/tests/auth_test.php
index 8a6b6f80fa8..edae502f02c 100644
--- a/auth/lti/tests/auth_test.php
+++ b/auth/lti/tests/auth_test.php
@@ -211,7 +211,7 @@ final class auth_test extends \advanced_testcase {
     /**
      * Test which verifies a user account can be created/found using the find_or_create_user_from_launch() method.
      *
-     * @dataProvider launch_data_provider
+     * @dataProvider launchdata_provider
      * @param array|null $legacydata legacy user and tool data, if testing migration cases.
      * @param array $launchdata data describing the launch, including user data and migration claim data.
      * @param array $expected the test case expectations.
@@ -289,11 +289,11 @@ final class auth_test extends \advanced_testcase {
      *
      * @return array the test case data.
      */
-    public static function launch_data_provider(): array {
+    public static function launchdata_provider(): array {
         return [
             'New (unlinked) platform learner including PII, no legacy user, no migration claim' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -302,8 +302,8 @@ final class auth_test extends \advanced_testcase {
                 ],
             ],
             'New (unlinked) platform learner excluding names, no legacy user, no migration claim' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -313,8 +313,8 @@ final class auth_test extends \advanced_testcase {
                 ],
             ],
             'New (unlinked) platform learner excluding emails, no legacy user, no migration claim' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -325,8 +325,8 @@ final class auth_test extends \advanced_testcase {
                 ],
             ],
             'New (unlinked) platform learner excluding all PII, no legacy user, no migration claim' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -337,7 +337,7 @@ final class auth_test extends \advanced_testcase {
                 ],
             ],
             'New (unlinked) platform learner including PII, existing legacy user, valid migration claim' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
@@ -347,7 +347,7 @@ final class auth_test extends \advanced_testcase {
                         ['secret' => 'toolsecret2'],
                     ]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -366,7 +366,7 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'New (unlinked) platform learner including PII, existing legacy user, no migration claim' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
@@ -376,7 +376,7 @@ final class auth_test extends \advanced_testcase {
                         ['secret' => 'toolsecret2'],
                     ]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -388,7 +388,7 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'New (unlinked) platform learner including PII, existing legacy user, migration missing consumer_key' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
@@ -398,7 +398,7 @@ final class auth_test extends \advanced_testcase {
                         ['secret' => 'toolsecret2'],
                     ]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -417,7 +417,7 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'New (unlinked) platform learner including PII, existing legacy user, migration bad consumer_key' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
@@ -427,7 +427,7 @@ final class auth_test extends \advanced_testcase {
                         ['secret' => 'toolsecret2'],
                     ]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -446,7 +446,7 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'New (unlinked) platform learner including PII, existing legacy user, migration user not matched' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
@@ -456,7 +456,7 @@ final class auth_test extends \advanced_testcase {
                         ['secret' => 'toolsecret2'],
                     ]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -475,7 +475,7 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'New (unlinked) platform learner including PII, existing legacy user, valid migration claim secret2' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
@@ -485,7 +485,7 @@ final class auth_test extends \advanced_testcase {
                         ['secret' => 'toolsecret2'],
                     ]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -504,7 +504,7 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'New (unlinked) platform learner including PII, existing legacy user, migration claim bad secret' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
@@ -514,7 +514,7 @@ final class auth_test extends \advanced_testcase {
                         ['secret' => 'toolsecret2'],
                     ]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -534,7 +534,7 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'New (unlinked) platform learner including PII, no legacy user, valid migration claim' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [],
                     'consumer_key' => 'CONSUMER_1',
                     'tools' => [
@@ -542,7 +542,7 @@ final class auth_test extends \advanced_testcase {
                         ['secret' => 'toolsecret2'],
                     ]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -561,7 +561,7 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'New (unlinked) platform learner excluding PII, existing legacy user, valid migration claim' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
@@ -571,7 +571,7 @@ final class auth_test extends \advanced_testcase {
                         ['secret' => 'toolsecret2'],
                     ]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -592,8 +592,8 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'New (unlinked) platform instructor including PII, no legacy user, no migration claim' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Instructor'
@@ -602,8 +602,8 @@ final class auth_test extends \advanced_testcase {
                 ],
             ],
             'New (unlinked) platform instructor excluding PII, no legacy user, no migration claim' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Instructor',
@@ -614,7 +614,7 @@ final class auth_test extends \advanced_testcase {
                 ],
             ],
             'New (unlinked) platform instructor including PII, existing legacy user, valid migration claim' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
@@ -624,7 +624,7 @@ final class auth_test extends \advanced_testcase {
                         ['secret' => 'toolsecret2'],
                     ]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Instructor'
@@ -643,8 +643,8 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'Existing (linked) platform learner including PII, no legacy user, no migration claim' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'launchdata' => [
                     'has_authenticated_before' => true,
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
@@ -654,8 +654,8 @@ final class auth_test extends \advanced_testcase {
                 ],
             ],
             'Existing (linked) platform learner excluding PII, no legacy user, no migration claim' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'launchdata' => [
                     'has_authenticated_before' => true,
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
@@ -667,8 +667,8 @@ final class auth_test extends \advanced_testcase {
                 ],
             ],
             'Existing (linked) platform instructor including PII, no legacy user, no migration claim' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'launchdata' => [
                     'has_authenticated_before' => true,
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
@@ -678,8 +678,8 @@ final class auth_test extends \advanced_testcase {
                 ],
             ],
             'Existing (linked) platform instructor excluding PII, no legacy user, no migration claim' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'launchdata' => [
                     'has_authenticated_before' => true,
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
@@ -691,8 +691,8 @@ final class auth_test extends \advanced_testcase {
                 ],
             ],
             'New (unlinked) platform instructor excluding PII, picture included' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'launchdata' => [
                     'has_authenticated_before' => false,
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
@@ -816,23 +816,23 @@ final class auth_test extends \advanced_testcase {
     public static function membership_data_provider(): array {
         return [
             'New (unlinked) platform learner including PII, no legacy data, no consumer key bound, no legacy id' => [
-                'legacy_data' => null,
-                'membership_data' => [
+                'legacydata' => null,
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
                     )[0],
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => null,
+                'legacyconsumerkey' => null,
                 'expected' => [
                     'PII' => self::PII_ALL,
                     'migrated' => false
                 ]
             ],
             'New (unlinked) platform learner excluding PII, no legacy data, no consumer key bound, no legacy id' => [
-                'legacy_data' => null,
-                'membership_data' => [
+                'legacydata' => null,
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -841,15 +841,15 @@ final class auth_test extends \advanced_testcase {
                     )[0],
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => null,
+                'legacyconsumerkey' => null,
                 'expected' => [
                     'PII' => self::PII_NONE,
                     'migrated' => false
                 ]
             ],
             'New (unlinked) platform learner excluding names, no legacy data, no consumer key bound, no legacy id' => [
-                'legacy_data' => null,
-                'membership_data' => [
+                'legacydata' => null,
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -857,15 +857,15 @@ final class auth_test extends \advanced_testcase {
                     )[0],
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => null,
+                'legacyconsumerkey' => null,
                 'expected' => [
                     'PII' => self::PII_EMAILS_ONLY,
                     'migrated' => false
                 ]
             ],
             'New (unlinked) platform learner excluding email, no legacy data, no consumer key bound, no legacy id' => [
-                'legacy_data' => null,
-                'membership_data' => [
+                'legacydata' => null,
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -874,20 +874,20 @@ final class auth_test extends \advanced_testcase {
                     )[0],
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => null,
+                'legacyconsumerkey' => null,
                 'expected' => [
                     'PII' => self::PII_NAMES_ONLY,
                     'migrated' => false
                 ]
             ],
             'New (unlinked) platform learner including PII, legacy user, consumer key bound, legacy user id sent' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
                     'consumer_key' => 'CONSUMER_1',
                 ],
-                'membership_data' => [
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -895,80 +895,80 @@ final class auth_test extends \advanced_testcase {
                     'legacy_user_id' => '123-abc'
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => 'CONSUMER_1',
+                'legacyconsumerkey' => 'CONSUMER_1',
                 'expected' => [
                     'PII' => self::PII_ALL,
                     'migrated' => true
                 ]
             ],
             'New (unlinked) platform learner including PII, legacy user, consumer key bound, legacy user id omitted' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
                     'consumer_key' => 'CONSUMER_1',
                 ],
-                'membership_data' => [
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
                     )[0],
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => 'CONSUMER_1',
+                'legacyconsumerkey' => 'CONSUMER_1',
                 'expected' => [
                     'PII' => self::PII_ALL,
                     'migrated' => false,
                 ]
             ],
             'New (unlinked) platform learner including PII, legacy user, consumer key bound, no change in user id' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
                     'consumer_key' => 'CONSUMER_1',
                 ],
-                'membership_data' => [
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['123-abc'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
                     )[0],
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => 'CONSUMER_1',
+                'legacyconsumerkey' => 'CONSUMER_1',
                 'expected' => [
                     'PII' => self::PII_ALL,
                     'migrated' => true
                 ]
             ],
             'New (unlinked) platform learner including PII, legacy user, unexpected consumer key bound, no change in user id' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
                     'consumer_key' => 'CONSUMER_1',
                 ],
-                'membership_data' => [
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['123-abc'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
                     )[0],
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => 'CONSUMER_ABCDEF',
+                'legacyconsumerkey' => 'CONSUMER_ABCDEF',
                 'expected' => [
                     'PII' => self::PII_ALL,
                     'migrated' => false,
                 ]
             ],
             'New (unlinked) platform learner including PII, legacy user, consumer key not bound, legacy user id sent' => [
-                'legacy_data' => [
+                'legacydata' => [
                     'users' => [
                         ['user_id' => '123-abc'],
                     ],
                     'consumer_key' => 'CONSUMER_1',
                 ],
-                'membership_data' => [
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -976,15 +976,15 @@ final class auth_test extends \advanced_testcase {
                     'legacy_user_id' => '123-abc'
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => null,
+                'legacyconsumerkey' => null,
                 'expected' => [
                     'PII' => self::PII_ALL,
                     'migrated' => false
                 ]
             ],
             'New (unlinked) platform learner including PII, no legacy data, consumer key bound, legacy user id sent' => [
-                'legacy_data' => null,
-                'membership_data' => [
+                'legacydata' => null,
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -992,30 +992,30 @@ final class auth_test extends \advanced_testcase {
                     'legacy_user_id' => '123-abc'
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => 'CONSUMER_1',
+                'legacyconsumerkey' => 'CONSUMER_1',
                 'expected' => [
                     'PII' => self::PII_ALL,
                     'migrated' => false
                 ]
             ],
             'New (unlinked) platform instructor including PII, no legacy data, no consumer key bound, no legacy id' => [
-                'legacy_data' => null,
-                'membership_data' => [
+                'legacydata' => null,
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Instructor'
                     )[0],
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => null,
+                'legacyconsumerkey' => null,
                 'expected' => [
                     'PII' => self::PII_ALL,
                     'migrated' => false
                 ]
             ],
             'New (unlinked) platform instructor excluding PII, no legacy data, no consumer key bound, no legacy id' => [
-                'legacy_data' => null,
-                'membership_data' => [
+                'legacydata' => null,
+                'memberdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Instructor',
@@ -1024,15 +1024,15 @@ final class auth_test extends \advanced_testcase {
                     )[0],
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => null,
+                'legacyconsumerkey' => null,
                 'expected' => [
                     'PII' => self::PII_NONE,
                     'migrated' => false
                 ]
             ],
             'Existing (linked) platform learner including PII, no legacy data, no consumer key bound, no legacy id' => [
-                'legacy_data' => null,
-                'launch_data' => [
+                'legacydata' => null,
+                'memberdata' => [
                     'has_authenticated_before' => true,
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
@@ -1040,7 +1040,7 @@ final class auth_test extends \advanced_testcase {
                     )[0],
                 ],
                 'iss' => self::$issuer,
-                'legacy_consumer_key' => null,
+                'legacyconsumerkey' => null,
                 'expected' => [
                     'PII' => self::PII_ALL,
                     'migrated' => false
@@ -1154,13 +1154,13 @@ final class auth_test extends \advanced_testcase {
     public static function update_user_account_provider(): array {
         return [
             'Full PII included in both auths, no picture in either' => [
-                'first_launch_data' => [
+                'firstlaunchdata' => [
                      'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
                     )[0]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -1173,7 +1173,7 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'No PII included in both auths, no picture in either' => [
-                'first_launch_data' => [
+                'firstlaunchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -1181,7 +1181,7 @@ final class auth_test extends \advanced_testcase {
                         false
                     )[0]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -1196,7 +1196,7 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'First auth no PII, second auth including PII, no picture in either' => [
-                'first_launch_data' => [
+                'firstlaunchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -1204,7 +1204,7 @@ final class auth_test extends \advanced_testcase {
                         false
                     )[0]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
@@ -1217,13 +1217,13 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'First auth full PII, second auth no PII, no picture in either' => [
-                'first_launch_data' => [
+                'firstlaunchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
                     )[0]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -1238,13 +1238,13 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'First auth full PII, second auth emails only, no picture in either' => [
-                'first_launch_data' => [
+                'firstlaunchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
                     )[0]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -1258,13 +1258,13 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'First auth full PII, second auth names only, no picture in either' => [
-                'first_launch_data' => [
+                'firstlaunchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
                     )[0]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
@@ -1279,13 +1279,13 @@ final class auth_test extends \advanced_testcase {
                 ]
             ],
             'Full PII included in both auths, picture included in the second auth' => [
-                'first_launch_data' => [
+                'firstlaunchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
                     )[0]
                 ],
-                'launch_data' => [
+                'launchdata' => [
                     'user' => self::get_mock_users_with_ids(
                         ['1'],
                         'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
diff --git a/communication/provider/matrix/tests/local/command_test.php b/communication/provider/matrix/tests/local/command_test.php
index 796a32866f9..5afa5b99c13 100644
--- a/communication/provider/matrix/tests/local/command_test.php
+++ b/communication/provider/matrix/tests/local/command_test.php
@@ -352,7 +352,7 @@ final class command_test extends \advanced_testcase {
     public static function sendasjson_provider(): array {
         return [
             'As JSON' => [
-                'sendasjon' => true,
+                'sendasjson' => true,
                 'endpoint' => 'example/:id/endpoint',
                 'params' => [
                     ':id' => 12345,
diff --git a/course/format/tests/local/sectionactions_test.php b/course/format/tests/local/sectionactions_test.php
index 00a57a66854..9d159c577db 100644
--- a/course/format/tests/local/sectionactions_test.php
+++ b/course/format/tests/local/sectionactions_test.php
@@ -268,27 +268,27 @@ final class sectionactions_test extends \advanced_testcase {
     public static function create_if_missing_provider(): array {
         return [
             'existing section' => [
-                'sectionnum' => [1],
+                'sectionnums' => [1],
                 'expected' => false,
             ],
             'unexisting section' => [
-                'sectionnum' => [3],
+                'sectionnums' => [3],
                 'expected' => true,
             ],
             'several existing sections' => [
-                'sectionnum' => [1, 2],
+                'sectionnums' => [1, 2],
                 'expected' => false,
             ],
             'several unexisting sections' => [
-                'sectionnum' => [3, 4],
+                'sectionnums' => [3, 4],
                 'expected' => true,
             ],
             'empty array' => [
-                'sectionnum' => [],
+                'sectionnums' => [],
                 'expected' => false,
             ],
             'existent and unexistent sections' => [
-                'sectionnum' => [1, 2, 3, 4],
+                'sectionnums' => [1, 2, 3, 4],
                 'expected' => true,
             ],
         ];
diff --git a/course/format/tests/stateactions_test.php b/course/format/tests/stateactions_test.php
index d0919ffc49d..bfdc7926450 100644
--- a/course/format/tests/stateactions_test.php
+++ b/course/format/tests/stateactions_test.php
@@ -1560,7 +1560,7 @@ final class stateactions_test extends \advanced_testcase {
                 'cmtomove' => ['subsection1'], // When moving a subsection we actually move the delegated module.
                 'targetsection' => 'subsection2',
                 'expectedcoursetree' => [],
-                'exception' => 'error/subsectionmoveerror',
+                'expectedexception' => 'error/subsectionmoveerror',
             ],
             'Move module into subsection' => [
                 'cmtomove' => ['cm1'],
diff --git a/course/tests/targets_test.php b/course/tests/targets_test.php
index e97717d496d..56521dfad29 100644
--- a/course/tests/targets_test.php
+++ b/course/tests/targets_test.php
@@ -48,14 +48,14 @@ final class targets_test extends \advanced_testcase {
 
         return [
             'coursenotyetstarted' => [
-                'params' => [
+                'courseparams' => [
                     'enablecompletion' => 1,
                     'startdate' => mktime(0, 0, 0, 10, 24, $year + 1)
                 ],
                 'isvalid' => get_string('coursenotyetstarted', 'course')
             ],
             'coursenostudents' => [
-                'params' => [
+                'courseparams' => [
                     'enablecompletion' => 1,
                     'startdate' => mktime(0, 0, 0, 10, 24, $year - 2),
                     'enddate' => mktime(0, 0, 0, 10, 24, $year - 1)
@@ -63,7 +63,7 @@ final class targets_test extends \advanced_testcase {
                 'isvalid' => get_string('nocoursestudents', 'course')
             ],
             'coursenosections' => [
-                'params' => [
+                'courseparams' => [
                     'enablecompletion' => 1,
                     'format' => 'singleactivity',
                     'students' => true
@@ -71,7 +71,7 @@ final class targets_test extends \advanced_testcase {
                 'isvalid' => get_string('nocoursesections', 'course')
             ],
             'coursenoendtime' => [
-                'params' => [
+                'courseparams' => [
                     'enablecompletion' => 1,
                     'format' => 'topics',
                     'enddate' => 0,
@@ -80,7 +80,7 @@ final class targets_test extends \advanced_testcase {
                 'isvalid' => get_string('nocourseendtime', 'course')
             ],
             'courseendbeforestart' => [
-                'params' => [
+                'courseparams' => [
                     'enablecompletion' => 1,
                     'enddate' => mktime(0, 0, 0, 10, 23, $year - 2),
                     'students' => true
@@ -88,7 +88,7 @@ final class targets_test extends \advanced_testcase {
                 'isvalid' => get_string('errorendbeforestart', 'course')
             ],
             'coursetoolong' => [
-                'params' => [
+                'courseparams' => [
                     'enablecompletion' => 1,
                     'startdate' => mktime(0, 0, 0, 10, 24, $year - 2),
                     'enddate' => mktime(0, 0, 0, 10, 23, $year),
@@ -97,7 +97,7 @@ final class targets_test extends \advanced_testcase {
                 'isvalid' => get_string('coursetoolong', 'course')
             ],
             'coursealreadyfinished' => [
-                'params' => [
+                'courseparams' => [
                     'enablecompletion' => 1,
                     'startdate' => mktime(0, 0, 0, 10, 24, $year - 2),
                     'enddate' => mktime(0, 0, 0, 10, 23, $year - 1),
@@ -107,7 +107,7 @@ final class targets_test extends \advanced_testcase {
                 'fortraining' => false
             ],
             'coursenotyetfinished' => [
-                'params' => [
+                'courseparams' => [
                     'enablecompletion' => 1,
                     'startdate' => mktime(0, 0, 0, $month - 1, 24, $year),
                     'enddate' => mktime(0, 0, 0, $month + 2, 23, $year),
@@ -116,7 +116,7 @@ final class targets_test extends \advanced_testcase {
                 'isvalid' => get_string('coursenotyetfinished', 'course')
             ],
             'coursenocompletion' => [
-                'params' => [
+                'courseparams' => [
                     'enablecompletion' => 0,
                     'startdate' => mktime(0, 0, 0, $month - 2, 24, $year),
                     'enddate' => mktime(0, 0, 0, $month - 1, 23, $year),
@@ -125,7 +125,7 @@ final class targets_test extends \advanced_testcase {
                 'isvalid' => get_string('completionnotenabledforcourse', 'completion')
             ],
             'coursehiddentraining' => [
-                'params' => [
+                'courseparams' => [
                     'enablecompletion' => 1,
                     'startdate' => mktime(0, 0, 0, $month - 1, 24, $year - 1),
                     'enddate' => mktime(0, 0, 0, $month - 1, 23, $year),
@@ -135,7 +135,7 @@ final class targets_test extends \advanced_testcase {
                 'isvalid' => true,
             ],
             'coursehiddenprediction' => [
-                'params' => [
+                'courseparams' => [
                     'enablecompletion' => 1,
                     'startdate' => mktime(0, 0, 0, $month - 1, 24, $year),
                     'enddate' => mktime(0, 0, 0, $month - 1, 23, $year + 1),
diff --git a/enrol/tests/enrollib_test.php b/enrol/tests/enrollib_test.php
index ef5e48ee725..c7c39af7a41 100644
--- a/enrol/tests/enrollib_test.php
+++ b/enrol/tests/enrollib_test.php
@@ -386,7 +386,7 @@ final class enrollib_test extends advanced_testcase {
             'The teacher can un-enrol users in a course' =>
                 [
                     'excludedcapabilities' => [],
-                    'results' => [
+                    'expected' => [
                         // Whether certain enrolment related data still exists in the course after the deletion.
                         // When the user has the capabilities to un-enrol users and the enrolment plugins allow manual
                         // unenerolment than all course enrolment data should be removed.
@@ -406,7 +406,7 @@ final class enrollib_test extends advanced_testcase {
                         // Exclude the following capabilities for the editing teacher.
                         'enrol/self:unenrol'
                     ],
-                    'results' => [
+                    'expected' => [
                         // When the user does not have the capabilities to un-enrol self enrolled users, the data
                         // related to this enrolment method should not be removed. Everything else should be removed.
                         'Manual course enrolment instance exists' => false,
@@ -426,7 +426,7 @@ final class enrollib_test extends advanced_testcase {
                         'enrol/manual:unenrol',
                         'enrol/self:unenrol'
                     ],
-                    'results' => [
+                    'expected' => [
                         // When the user does not have the capabilities to un-enrol self and manually enrolled users,
                         // the data related to these enrolment methods should not be removed.
                         'Manual course enrolment instance exists' => true,
diff --git a/grade/tests/grades/grader/gradingpanel/point/external/store_test.php b/grade/tests/grades/grader/gradingpanel/point/external/store_test.php
index eb9fdea8446..61774cd099a 100644
--- a/grade/tests/grades/grader/gradingpanel/point/external/store_test.php
+++ b/grade/tests/grades/grader/gradingpanel/point/external/store_test.php
@@ -296,20 +296,20 @@ final class store_test extends advanced_testcase {
     public static function execute_out_of_range_provider(): array {
         return [
             'above' => [
-                'max' => 100,
-                'supplied' => 101,
+                'maxvalue' => 100,
+                'suppliedvalue' => 101,
             ],
             'above just' => [
-                'max' => 100,
-                'supplied' => 101.001,
+                'maxvalue' => 100,
+                'suppliedvalue' => 101.001,
             ],
             'below' => [
-                'max' => 100,
-                'supplied' => -100,
+                'maxvalue' => 100,
+                'suppliedvalue' => -100,
             ],
             '-1' => [
-                'max' => 100,
-                'supplied' => -1,
+                'maxvalue' => 100,
+                'suppliedvalue' => -1,
             ],
         ];
     }
diff --git a/grade/tests/grades/grader/gradingpanel/scale/external/store_test.php b/grade/tests/grades/grader/gradingpanel/scale/external/store_test.php
index b7c1677cedf..3cf195727dd 100644
--- a/grade/tests/grades/grader/gradingpanel/scale/external/store_test.php
+++ b/grade/tests/grades/grader/gradingpanel/scale/external/store_test.php
@@ -401,16 +401,16 @@ final class store_test extends advanced_testcase {
     public static function execute_out_of_range_provider(): array {
         return [
             'above' => [
-                'supplied' => 500,
+                'suppliedvalue' => 500,
             ],
             'above just' => [
-                'supplied' => 4,
+                'suppliedvalue' => 4,
             ],
             'below' => [
-                'supplied' => -100,
+                'suppliedvalue' => -100,
             ],
             '-10' => [
-                'supplied' => -10,
+                'suppliedvalue' => -10,
             ],
         ];
     }
diff --git a/grade/tests/lib_test.php b/grade/tests/lib_test.php
index 1933f9a942a..9a9378f4561 100644
--- a/grade/tests/lib_test.php
+++ b/grade/tests/lib_test.php
@@ -461,13 +461,13 @@ final class lib_test extends \advanced_testcase {
         return [
             'nohidden' => [
                 'hidden' => false,
-                'count' => ['course' => 1, 'Grade item1' => 1],
-                'sumarray' => ['course' => 6.00000, 'Grade item1' => 3.00000],
+                'expectedcount' => ['course' => 1, 'Grade item1' => 1],
+                'expectedsumarray' => ['course' => 6.00000, 'Grade item1' => 3.00000],
             ],
             'includehidden' => [
                 'hidden' => true,
-                'count' => ['course' => 1, 'Grade item1' => 2],
-                'sumarray' => ['course' => 6.00000, 'Grade item1' => 6.00000],
+                'expectedcount' => ['course' => 1, 'Grade item1' => 2],
+                'expectedsumarray' => ['course' => 6.00000, 'Grade item1' => 6.00000],
             ],
         ];
     }
@@ -736,50 +736,50 @@ final class lib_test extends \advanced_testcase {
                 'onlyactive' => true,
                 'hascapability' => 1,
                 'showonlyactiveenrolpref' => null,
-                'count' => ['course' => 1, 'Grade item1' => 1],
-                'sumarray' => ['course' => 1, 'Grade item1' => 1.00000],
+                'expectedcount' => ['course' => 1, 'Grade item1' => 1],
+                'expectedsumarray' => ['course' => 1, 'Grade item1' => 1.00000],
             ],
             'Show only active and user preference set to true' => [
                 'onlyactive' => true,
                 'hascapability' => 1,
                 'showonlyactiveenrolpref' => true,
-                'count' => ['course' => 1, 'Grade item1' => 1],
-                'sumarray' => ['course' => 1, 'Grade item1' => 1.00000],
+                'expectedcount' => ['course' => 1, 'Grade item1' => 1],
+                'expectedsumarray' => ['course' => 1, 'Grade item1' => 1.00000],
             ],
             'Show only active and user preference set to false' => [
                 'onlyactive' => true,
                 'hascapability' => 1,
                 'showonlyactiveenrolpref' => false,
-                'count' => ['course' => 1, 'Grade item1' => 1],
-                'sumarray' => ['course' => 3.00000, 'Grade item1' => 3.00000],
+                'expectedcount' => ['course' => 1, 'Grade item1' => 1],
+                'expectedsumarray' => ['course' => 3.00000, 'Grade item1' => 3.00000],
             ],
             'Include suspended with capability and user preference set to true' => [
                 'onlyactive' => false,
                 'hascapability' => 1,
                 'showonlyactiveenrolpref' => true,
-                'count' => ['course' => 1, 'Grade item1' => 1],
-                'sumarray' => ['course' => 1.00000, 'Grade item1' => 1.00000],
+                'expectedcount' => ['course' => 1, 'Grade item1' => 1],
+                'expectedsumarray' => ['course' => 1.00000, 'Grade item1' => 1.00000],
             ],
             'Include suspended with capability and user preference set to false' => [
                 'onlyactive' => false,
                 'hascapability' => 1,
                 'showonlyactiveenrolpref' => false,
-                'count' => ['course' => 1, 'Grade item1' => 1],
-                'sumarray' => ['course' => 3.00000, 'Grade item1' => 3.00000],
+                'expectedcount' => ['course' => 1, 'Grade item1' => 1],
+                'expectedsumarray' => ['course' => 3.00000, 'Grade item1' => 3.00000],
             ],
             'Include suspended with capability and no user preference' => [
                 'onlyactive' => false,
                 'hascapability' => 1,
                 'showonlyactiveenrolpref' => null,
-                'count' => ['course' => 1, 'Grade item1' => 1],
-                'sumarray' => ['course' => 3.00000, 'Grade item1' => 3.00000],
+                'expectedcount' => ['course' => 1, 'Grade item1' => 1],
+                'expectedsumarray' => ['course' => 3.00000, 'Grade item1' => 3.00000],
             ],
             'Include suspended without capability' => [
                 'onlyactive' => false,
                 'hascapability' => -1,
                 'showonlyactiveenrolpref' => null,
-                'count' => ['course' => 1, 'Grade item1' => 1],
-                'sumarray' => ['course' => 1.00000, 'Grade item1' => 1.00000],
+                'expectedcount' => ['course' => 1, 'Grade item1' => 1],
+                'expectedsumarray' => ['course' => 1.00000, 'Grade item1' => 1.00000],
             ],
         ];
     }
diff --git a/h5p/tests/editor_framework_test.php b/h5p/tests/editor_framework_test.php
index 988d16b378d..0d02ebad500 100644
--- a/h5p/tests/editor_framework_test.php
+++ b/h5p/tests/editor_framework_test.php
@@ -136,7 +136,8 @@ final class editor_framework_test extends \advanced_testcase {
                 2,
             ],
             'One library created but getting translation from an unexisting one' => [
-                'Library1 1.2' => [
+                // Library1 1.2.
+                [
                     'machinename' => 'Library1',
                     'title' => 'Lib1',
                     'majorversion' => 1,
@@ -151,7 +152,8 @@ final class editor_framework_test extends \advanced_testcase {
                 'AnotherLibrary',
             ],
             'One library without any translation' => [
-                'Library1 1.2' => [
+                // Library1 1.2.
+                [
                     'machinename' => 'Library1',
                     'title' => 'Lib1',
                     'majorversion' => 1,
@@ -161,7 +163,8 @@ final class editor_framework_test extends \advanced_testcase {
                 true,
             ],
             'One library with 2 translations (es and fr) - es' => [
-                'Library1 1.2' => [
+                // Library1 1.2.
+                [
                     'machinename' => 'Library1',
                     'title' => 'Lib1',
                     'majorversion' => 1,
@@ -174,7 +177,8 @@ final class editor_framework_test extends \advanced_testcase {
                 'es',
             ],
             'One library with 2 translations (es and fr) - fr' => [
-                'Library1 1.2' => [
+                // Library1 1.2.
+                [
                     'machinename' => 'Library1',
                     'title' => 'Lib1',
                     'majorversion' => 1,
@@ -187,7 +191,8 @@ final class editor_framework_test extends \advanced_testcase {
                 'fr',
             ],
             'One library with 2 translations (es and fr) - unexisting translation (de)' => [
-                'Library1 1.2' => [
+                // Library1 1.2.
+                [
                     'machinename' => 'Library1',
                     'title' => 'Lib1',
                     'majorversion' => 1,
@@ -201,7 +206,8 @@ final class editor_framework_test extends \advanced_testcase {
                 true
             ],
             'One library with 3 translations (one of them English) - fr' => [
-                'Library1 1.2' => [
+                // Library1 1.2.
+                [
                     'machinename' => 'Library1',
                     'title' => 'Lib1',
                     'majorversion' => 1,
@@ -215,7 +221,8 @@ final class editor_framework_test extends \advanced_testcase {
                 'fr',
             ],
             'One library with 3 translations (one of them English) - en' => [
-                'Library1 1.2' => [
+                // Library1 1.2.
+                [
                     'machinename' => 'Library1',
                     'title' => 'Lib1',
                     'majorversion' => 1,
@@ -299,7 +306,8 @@ final class editor_framework_test extends \advanced_testcase {
                 2,
             ],
             'One library created but getting available from an unexisting one' => [
-                'Library1 1.2' => [
+                // Library1 1.2.
+                [
                     'machinename' => 'Library1',
                     'title' => 'Lib1',
                     'majorversion' => 1,
@@ -315,7 +323,8 @@ final class editor_framework_test extends \advanced_testcase {
                 2,
             ],
             'One library without any translation' => [
-                'Library1 1.2' => [
+                // Library1 1.2.
+                [
                     'machinename' => 'Library1',
                     'title' => 'Lib1',
                     'majorversion' => 1,
@@ -324,7 +333,8 @@ final class editor_framework_test extends \advanced_testcase {
                 ['en'],
             ],
             'One library with 2 translations (es and fr)' => [
-                'Library1 1.2' => [
+                // Library1 1.2.
+                [
                     'machinename' => 'Library1',
                     'title' => 'Lib1',
                     'majorversion' => 1,
@@ -337,7 +347,8 @@ final class editor_framework_test extends \advanced_testcase {
                 ['en', 'es', 'fr'],
             ],
             'One library with 3 translations (one of them English)' => [
-                'Library1 1.2' => [
+                // Library1 1.2.
+                [
                     'machinename' => 'Library1',
                     'title' => 'Lib1',
                     'majorversion' => 1,
diff --git a/lib/dml/tests/dml_table_test.php b/lib/dml/tests/dml_table_test.php
index 432db425fbe..6a3e4c647e6 100644
--- a/lib/dml/tests/dml_table_test.php
+++ b/lib/dml/tests/dml_table_test.php
@@ -111,13 +111,13 @@ final class dml_table_test extends \database_driver_testcase {
                     'flag' => ['flag', XMLDB_TYPE_CHAR, '255', null, null, null, 'lala'],
                 ],
                 'primarykey' => 'id',
-                'prefix' => 's',
+                'fieldprefix' => 's',
                 'result' => (object) [
                     'sid' => 1,
                     'scourse' => 42,
                     'sflag' => 'foo',
                 ],
-                'expectedrecord' => (object) [
+                'expected' => (object) [
                     'id' => 1,
                     'course' => 42,
                     'flag' => 'foo',
@@ -130,7 +130,7 @@ final class dml_table_test extends \database_driver_testcase {
                     'flag' => ['flag', XMLDB_TYPE_CHAR, '255', null, null, null, 'lala'],
                 ],
                 'primarykey' => 'id',
-                'prefix' => 's',
+                'fieldprefix' => 's',
                 'result' => (object) [
                     'sid' => 1,
                     'scourse' => 42,
@@ -139,7 +139,7 @@ final class dml_table_test extends \database_driver_testcase {
                     'ocourse' => 'course',
                     'oflag' => 'flag',
                 ],
-                'expectedrecord' => (object) [
+                'expected' => (object) [
                     'id' => 1,
                     'course' => 42,
                     'flag' => 'foo',
diff --git a/lib/filestorage/tests/file_system_filedir_test.php b/lib/filestorage/tests/file_system_filedir_test.php
index c03725c68d9..17f44190602 100644
--- a/lib/filestorage/tests/file_system_filedir_test.php
+++ b/lib/filestorage/tests/file_system_filedir_test.php
@@ -1098,12 +1098,12 @@ final class file_system_filedir_test extends \advanced_testcase {
     public static function contenthash_dataprovider(): array {
         return array(
             array(
-                'contenthash'   => 'eee4943847a35a4b6942c6f96daafde06bcfdfab',
-                'contentdir'    => 'ee/e4',
+                'hash'   => 'eee4943847a35a4b6942c6f96daafde06bcfdfab',
+                'hashdir'    => 'ee/e4',
             ),
             array(
-                'contenthash'   => 'aef05a62ae81ca0005d2569447779af062b7cda0',
-                'contentdir'    => 'ae/f0',
+                'hash'   => 'aef05a62ae81ca0005d2569447779af062b7cda0',
+                'hashdir'    => 'ae/f0',
             ),
         );
     }
diff --git a/lib/phpunit/tests/phpunit_dataset_test.php b/lib/phpunit/tests/phpunit_dataset_test.php
index 0fe7f845ce0..68fc6ee3855 100644
--- a/lib/phpunit/tests/phpunit_dataset_test.php
+++ b/lib/phpunit/tests/phpunit_dataset_test.php
@@ -199,7 +199,7 @@ final class phpunit_dataset_test extends advanced_testcase {
                 'rows' => [],
             ],
             'csv loads ok' => [
-                'fullpath' => file_get_contents(__DIR__ . '/fixtures/sample_dataset.csv'),
+                'content' => file_get_contents(__DIR__ . '/fixtures/sample_dataset.csv'),
                 'type' => 'csv',
                 'tablename' => 'user',
                 'exception' => null,
@@ -215,7 +215,7 @@ final class phpunit_dataset_test extends advanced_testcase {
                 ],
             ],
             'xml loads ok' => [
-                'fullpath' => file_get_contents(__DIR__ . '/fixtures/sample_dataset.xml'),
+                'content' => file_get_contents(__DIR__ . '/fixtures/sample_dataset.xml'),
                 'type' => 'xml',
                 'tablename' => 'user',
                 'exception' => null,
diff --git a/lib/tests/accesslib_has_capability_test.php b/lib/tests/accesslib_has_capability_test.php
index e88c4355657..deb94111e3f 100644
--- a/lib/tests/accesslib_has_capability_test.php
+++ b/lib/tests/accesslib_has_capability_test.php
@@ -367,32 +367,32 @@ final class accesslib_has_capability_test extends \advanced_testcase {
     public static function locked_context_provider(): array {
         return [
             'All unlocked' => [
-                'locked' => [
+                'lockedcontexts' => [
                 ],
-                'blockedwrites' => [
+                'blocked' => [
                 ],
             ],
             'User is locked (yes, this is weird)' => [
-                'locked' => [
+                'lockedcontexts' => [
                     'adminuser' => true,
                 ],
-                'blockedwrites' => [
+                'blocked' => [
                     'adminuser',
                 ],
             ],
             'Cat1/Block locked' => [
-                'locked' => [
+                'lockedcontexts' => [
                     'cat1block' => true,
                 ],
-                'blockedwrites' => [
+                'blocked' => [
                     'cat1block',
                 ],
             ],
             'Cat1' => [
-                'locked' => [
+                'lockedcontexts' => [
                     'cat1' => true,
                 ],
-                'blockedwrites' => [
+                'blocked' => [
                     'cat1',
                     'cat1block',
                     'cat1a',
@@ -414,11 +414,11 @@ final class accesslib_has_capability_test extends \advanced_testcase {
                 ],
             ],
             'Cat1 locked and a child explicitly unlocked' => [
-                'locked' => [
+                'lockedcontexts' => [
                     'cat1' => true,
                     'cat1a' => false,
                 ],
-                'blockedwrites' => [
+                'blocked' => [
                     'cat1',
                     'cat1block',
                     'cat1a',
diff --git a/lib/tests/classes/courses_tasks_testcase.php b/lib/tests/classes/courses_tasks_testcase.php
index 10ee6357f92..2bf8fb990bc 100644
--- a/lib/tests/classes/courses_tasks_testcase.php
+++ b/lib/tests/classes/courses_tasks_testcase.php
@@ -32,46 +32,46 @@ abstract class courses_tasks_testcase extends \advanced_testcase {
     public static function get_courses_provider(): array {
         return [
             'No hidden courses' => [
-                'lastweek' => 0,
-                'yesterday' => 0,
-                'tomorrow' => 0,
+                'lastweekcount' => 0,
+                'yesterdaycount' => 0,
+                'tomorrowcount' => 0,
             ],
             'No hidden courses (without visible courses)' => [
-                'lastweek' => 0,
-                'yesterday' => 0,
-                'tomorrow' => 0,
+                'lastweekcount' => 0,
+                'yesterdaycount' => 0,
+                'tomorrowcount' => 0,
                 'createvisible' => false,
             ],
             'Hidden courses with last week or tomorrow dates' => [
-                'lastweek' => 2,
-                'yesterday' => 0,
-                'tomorrow' => 2,
+                'lastweekcount' => 2,
+                'yesterdaycount' => 0,
+                'tomorrowcount' => 2,
             ],
             'One hidden course of each type (last week, yesterday and tomorrow)' => [
-                'lastweek' => 1,
-                'yesterday' => 1,
-                'tomorrow' => 1,
+                'lastweekcount' => 1,
+                'yesterdaycount' => 1,
+                'tomorrowcount' => 1,
             ],
             'Different hidden courses of each type' => [
-                'lastweek' => 2,
-                'yesterday' => 3,
-                'tomorrow' => 4,
+                'lastweekcount' => 2,
+                'yesterdaycount' => 3,
+                'tomorrowcount' => 4,
             ],
             'A couple of hidden courses of each type (without visible courses)' => [
-                'lastweek' => 2,
-                'yesterday' => 2,
-                'tomorrow' => 2,
+                'lastweekcount' => 2,
+                'yesterdaycount' => 2,
+                'tomorrowcount' => 2,
                 'createvisible' => false,
             ],
-            'Only a few hidden courses for yesterday' => [
-                'lastweek' => 0,
-                'yesterday' => 5,
-                'tomorrow' => 0,
+            'Only a few hidden courses for yesterdaycount' => [
+                'lastweekcount' => 0,
+                'yesterdaycount' => 5,
+                'tomorrowcount' => 0,
             ],
             'Only a few hidden courses for yesterday (without visible courses)' => [
-                'lastweek' => 0,
-                'yesterday' => 5,
-                'tomorrow' => 0,
+                'lastweekcount' => 0,
+                'yesterdaycount' => 5,
+                'tomorrowcount' => 0,
                 'createvisible' => false,
             ],
         ];
diff --git a/lib/tests/component_test.php b/lib/tests/component_test.php
index 7be2c638868..917d2ad450b 100644
--- a/lib/tests/component_test.php
+++ b/lib/tests/component_test.php
@@ -921,7 +921,7 @@ final class component_test extends \advanced_testcase {
                     ],
                 ],
                 'classname' => 'Psr\Http\Message\ServerRequestInterface',
-                'includedfiles' => "{$dirroot}/lib/psr/http-message/src/ServerRequestInterface.php",
+                'file' => "{$dirroot}/lib/psr/http-message/src/ServerRequestInterface.php",
             ],
             'PSR-4 namespaces can come from multiple sources - second source' => [
                 'psr0' => [],
@@ -932,7 +932,7 @@ final class component_test extends \advanced_testcase {
                     ],
                 ],
                 'classname' => 'Psr\Http\Message\ServerRequestFactoryInterface',
-                'includedfiles' => "{$dirroot}/lib/psr/http-factory/src/ServerRequestFactoryInterface.php",
+                'file' => "{$dirroot}/lib/psr/http-factory/src/ServerRequestFactoryInterface.php",
             ],
         ];
     }
diff --git a/lib/tests/moodle_page_test.php b/lib/tests/moodle_page_test.php
index 62af952a43a..60f13dc72ed 100644
--- a/lib/tests/moodle_page_test.php
+++ b/lib/tests/moodle_page_test.php
@@ -789,13 +789,13 @@ final class moodle_page_test extends \advanced_testcase {
             'User not a member of any cohort' => [
                 'usertheme' => '',
                 'sitetheme' => 'boost',
-                'cohorts' => [],
+                'cohortthemes' => [],
                 'expected' => 'boost',
             ],
             'User member of one cohort which has a theme set' => [
                 'usertheme' => '',
                 'sitetheme' => 'boost',
-                'cohorts' => [
+                'cohortthemes' => [
                     'classic',
                 ],
                 'expected' => 'classic',
@@ -803,7 +803,7 @@ final class moodle_page_test extends \advanced_testcase {
             'User member of one cohort which has a theme set, and one without a theme' => [
                 'usertheme' => '',
                 'sitetheme' => 'boost',
-                'cohorts' => [
+                'cohortthemes' => [
                     'classic',
                     '',
                 ],
@@ -812,7 +812,7 @@ final class moodle_page_test extends \advanced_testcase {
             'User member of one cohort which has a theme set, and one with a different theme' => [
                 'usertheme' => '',
                 'sitetheme' => 'boost',
-                'cohorts' => [
+                'cohortthemes' => [
                     'classic',
                     'someother',
                 ],
@@ -821,13 +821,13 @@ final class moodle_page_test extends \advanced_testcase {
             'User with a theme but not a member of any cohort' => [
                 'usertheme' => 'classic',
                 'sitetheme' => 'boost',
-                'cohorts' => [],
+                'cohortthemes' => [],
                 'expected' => 'classic',
             ],
             'User with a theme and member of one cohort which has a theme set' => [
                 'usertheme' => 'classic',
                 'sitetheme' => 'boost',
-                'cohorts' => [
+                'cohortthemes' => [
                     'boost',
                 ],
                 'expected' => 'classic',
diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php
index 9df9b3c5e62..fe1dc7e5d8e 100644
--- a/lib/tests/moodlelib_test.php
+++ b/lib/tests/moodlelib_test.php
@@ -3215,14 +3215,14 @@ EOF;
         return array(
             'nopath' => array(
                 'wwwroot' => 'http://www.example.com',
-                'ids' => array(
+                'msgids' => array(
                     'a-custom-id' => '<a-custom-id@www.example.com>',
                     'an-id-with-/-a-slash' => '<an-id-with-%2F-a-slash@www.example.com>',
                 ),
             ),
             'path' => array(
                 'wwwroot' => 'http://www.example.com/path/subdir',
-                'ids' => array(
+                'msgids' => array(
                     'a-custom-id' => '<a-custom-id/path/subdir@www.example.com>',
                     'an-id-with-/-a-slash' => '<an-id-with-%2F-a-slash/path/subdir@www.example.com>',
                 ),
diff --git a/lib/tests/moodlenet/activity_sender_test.php b/lib/tests/moodlenet/activity_sender_test.php
index 7dea40b07d5..13ec211433d 100644
--- a/lib/tests/moodlenet/activity_sender_test.php
+++ b/lib/tests/moodlenet/activity_sender_test.php
@@ -258,7 +258,7 @@ The last word of this sentence is in bold', $processeddescription);
     public static function share_resource_provider(): array {
         return [
             'Success' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     201,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -271,7 +271,7 @@ The last word of this sentence is in bold', $processeddescription);
                 ],
             ],
             'Fail with 200 status code' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -284,7 +284,7 @@ The last word of this sentence is in bold', $processeddescription);
                 ],
             ],
             'Fail with 401 status code' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     401,
                 ),
                 'expected' => [
@@ -296,7 +296,7 @@ The last word of this sentence is in bold', $processeddescription);
                 ],
             ],
             'Fail with 404 status code' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     404,
                 ),
                 'expected' => [
diff --git a/lib/tests/moodlenet/course_partial_sender_test.php b/lib/tests/moodlenet/course_partial_sender_test.php
index d3047d992b3..633b4c5b79a 100644
--- a/lib/tests/moodlenet/course_partial_sender_test.php
+++ b/lib/tests/moodlenet/course_partial_sender_test.php
@@ -258,7 +258,7 @@ The last word of this sentence is in bold', $processeddescription);
     public static function share_resource_provider(): array {
         return [
             'Success' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     201,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -271,7 +271,7 @@ The last word of this sentence is in bold', $processeddescription);
                 ],
             ],
             'Fail with 200 status code' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -284,7 +284,7 @@ The last word of this sentence is in bold', $processeddescription);
                 ],
             ],
             'Fail with 401 status code' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     401,
                 ),
                 'expected' => [
@@ -296,7 +296,7 @@ The last word of this sentence is in bold', $processeddescription);
                 ],
             ],
             'Fail with 404 status code' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     404,
                 ),
                 'expected' => [
diff --git a/lib/tests/moodlenet/course_sender_test.php b/lib/tests/moodlenet/course_sender_test.php
index b1d3e24caf0..f59bd85c1ed 100644
--- a/lib/tests/moodlenet/course_sender_test.php
+++ b/lib/tests/moodlenet/course_sender_test.php
@@ -262,7 +262,7 @@ The last word of this sentence is in bold', $processeddescription);
     public static function share_resource_provider(): array {
         return [
             'Success' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     201,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -275,7 +275,7 @@ The last word of this sentence is in bold', $processeddescription);
                 ],
             ],
             'Fail with 200 status code' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -288,7 +288,7 @@ The last word of this sentence is in bold', $processeddescription);
                 ],
             ],
             'Fail with 401 status code' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     401,
                 ),
                 'expected' => [
@@ -300,7 +300,7 @@ The last word of this sentence is in bold', $processeddescription);
                 ],
             ],
             'Fail with 404 status code' => [
-                'http_response' => new Response(
+                'httpresponse' => new Response(
                     404,
                 ),
                 'expected' => [
diff --git a/lib/tests/oauth2/discovery/auth_server_config_reader_test.php b/lib/tests/oauth2/discovery/auth_server_config_reader_test.php
index 711de18b809..55822a62b67 100644
--- a/lib/tests/oauth2/discovery/auth_server_config_reader_test.php
+++ b/lib/tests/oauth2/discovery/auth_server_config_reader_test.php
@@ -86,8 +86,8 @@ final class auth_server_config_reader_test extends \advanced_testcase {
     public static function config_provider(): array {
         return [
             'Valid, good issuer URL, good config' => [
-                'issuer_url' => 'https://app.example.com',
-                'http_response' => new Response(
+                'issuerurl' => 'https://app.example.com',
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -122,7 +122,7 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                         ]
                     ])
                 ),
-                'well_known_suffix' => null,
+                'altwellknownsuffix' => null,
                 'expected' => [
                     'request' => [
                         'url' => 'https://app.example.com/.well-known/oauth-authorization-server'
@@ -161,8 +161,8 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                 ]
             ],
             'Valid, issuer URL with path component confirming well known suffix placement' => [
-                'issuer_url' => 'https://app.example.com/some/path',
-                'http_response' => new Response(
+                'issuerurl' => 'https://app.example.com/some/path',
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -197,7 +197,7 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                         ]
                     ])
                 ),
-                'well_known_suffix' => null,
+                'altwellknownsuffix' => null,
                 'expected' => [
                     'request' => [
                         'url' => 'https://app.example.com/.well-known/oauth-authorization-server/some/path'
@@ -236,8 +236,8 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                 ]
             ],
             'Valid, single trailing / path only' => [
-                'issuer_url' => 'https://app.example.com/',
-                'http_response' => new Response(
+                'issuerurl' => 'https://app.example.com/',
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -272,7 +272,7 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                         ]
                     ])
                 ),
-                'well_known_suffix' => null,
+                'altwellknownsuffix' => null,
                 'expected' => [
                     'request' => [
                         'url' => 'https://app.example.com/.well-known/oauth-authorization-server'
@@ -311,8 +311,8 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                 ]
             ],
             'Invalid, non HTTPS issuer URL' => [
-                'issuer_url' => 'http://app.example.com',
-                'http_response' => new Response(
+                'issuerurl' => 'http://app.example.com',
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -347,14 +347,14 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                         ]
                     ])
                 ),
-                'well_known_suffix' => null,
+                'altwellknownsuffix' => null,
                 'expected' => [
                     'exception' => \moodle_exception::class
                 ]
             ],
             'Invalid, query string in issuer URL' => [
-                'issuer_url' => 'https://app.example.com?test=cat',
-                'http_response' => new Response(
+                'issuerurl' => 'https://app.example.com?test=cat',
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -389,14 +389,14 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                         ]
                     ])
                 ),
-                'well_known_suffix' => null,
+                'altwellknownsuffix' => null,
                 'expected' => [
                     'exception' => \moodle_exception::class
                 ]
             ],
             'Invalid, fragment in issuer URL' => [
-                'issuer_url' => 'https://app.example.com/#cat',
-                'http_response' => new Response(
+                'issuerurl' => 'https://app.example.com/#cat',
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -431,14 +431,14 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                         ]
                     ])
                 ),
-                'well_known_suffix' => null,
+                'altwellknownsuffix' => null,
                 'expected' => [
                     'exception' => \moodle_exception::class
                 ]
             ],
             'Valid, port in issuer URL' => [
-                'issuer_url' => 'https://app.example.com:8080/some/path',
-                'http_response' => new Response(
+                'issuerurl' => 'https://app.example.com:8080/some/path',
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -473,7 +473,7 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                         ]
                     ])
                 ),
-                'well_known_suffix' => null,
+                'altwellknownsuffix' => null,
                 'expected' => [
                     'request' => [
                         'url' => 'https://app.example.com:8080/.well-known/oauth-authorization-server/some/path'
@@ -512,8 +512,8 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                 ]
             ],
             'Valid, alternate well known suffix, no path' => [
-                'issuer_url' => 'https://app.example.com',
-                'http_response' => new Response(
+                'issuerurl' => 'https://app.example.com',
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -548,7 +548,7 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                         ]
                     ])
                 ),
-                'well_known_suffix' => 'openid-configuration', // An application using the openid well known, which is valid.
+                'altwellknownsuffix' => 'openid-configuration', // An application using the openid well known, which is valid.
                 'expected' => [
                     'request' => [
                         'url' => 'https://app.example.com/.well-known/openid-configuration'
@@ -587,8 +587,8 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                 ]
             ],
             'Valid, alternate well known suffix, with path' => [
-                'issuer_url' => 'https://app.example.com/some/path/',
-                'http_response' => new Response(
+                'issuerurl' => 'https://app.example.com/some/path/',
+                'httpresponse' => new Response(
                     200,
                     ['Content-Type' => 'application/json'],
                     json_encode([
@@ -623,7 +623,7 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                         ]
                     ])
                 ),
-                'well_known_suffix' => 'openid-configuration', // An application using the openid well known, which is valid.
+                'altwellknownsuffix' => 'openid-configuration', // An application using the openid well known, which is valid.
                 'expected' => [
                     'request' => [
                         'url' => 'https://app.example.com/.well-known/openid-configuration/some/path/'
@@ -662,9 +662,9 @@ final class auth_server_config_reader_test extends \advanced_testcase {
                 ]
             ],
             'Invalid, bad response' => [
-                'issuer_url' => 'https://app.example.com',
-                'http_response' => new Response(404),
-                'well_known_suffix' => null,
+                'issuerurl' => 'https://app.example.com',
+                'httpresponse' => new Response(404),
+                'altwellknownsuffix' => null,
                 'expected' => [
                     'exception' => ClientException::class
                 ]
diff --git a/lib/tests/plugininfo/editor_test.php b/lib/tests/plugininfo/editor_test.php
index 9459caf5387..1d644bbfc28 100644
--- a/lib/tests/plugininfo/editor_test.php
+++ b/lib/tests/plugininfo/editor_test.php
@@ -211,7 +211,7 @@ final class editor_test extends advanced_testcase {
                 'texteditors' => 'textarea,tiny',
                 'pluginname' => 'textarea',
                 'direction' => base::MOVE_DOWN,
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'tiny',
                     'textarea',
                 ]),
@@ -222,7 +222,7 @@ final class editor_test extends advanced_testcase {
                 'pluginname' => 'tiny',
                 'direction' => base::MOVE_DOWN,
                 // Tiny is already at the bottom of the enabled plugins.
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'textarea',
                     'tiny',
                 ]),
@@ -233,7 +233,7 @@ final class editor_test extends advanced_testcase {
                 'pluginname' => 'atto',
                 'direction' => base::MOVE_DOWN,
                 // Atto is not enabled. No change expected.
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'textarea',
                     'tiny',
                 ]),
@@ -243,7 +243,7 @@ final class editor_test extends advanced_testcase {
                 'texteditors' => 'textarea,tiny',
                 'pluginname' => 'tiny',
                 'direction' => base::MOVE_UP,
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'tiny',
                     'textarea',
                 ]),
@@ -254,7 +254,7 @@ final class editor_test extends advanced_testcase {
                 'pluginname' => 'tiny',
                 'direction' => base::MOVE_UP,
                 // Tiny is already at the top of the enabled plugins.
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'tiny',
                     'textarea',
                 ]),
@@ -265,7 +265,7 @@ final class editor_test extends advanced_testcase {
                 'pluginname' => 'atto',
                 'direction' => base::MOVE_UP,
                 // Atto is not enabled. No change expected.
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'textarea',
                     'tiny',
                 ]),
@@ -276,7 +276,7 @@ final class editor_test extends advanced_testcase {
                 'pluginname' => 'atto',
                 'direction' => base::MOVE_UP,
                 // Atto is not enabled. No change expected.
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'textarea',
                     'tiny',
                 ]),
@@ -287,7 +287,7 @@ final class editor_test extends advanced_testcase {
                 'pluginname' => 'fakeeditor',
                 'direction' => base::MOVE_UP,
                 // The fakeeditor plugin does not exist. No change expected.
-                'expected' => $getorder([
+                'neworder' => $getorder([
                     'textarea',
                     'tiny',
                 ]),
diff --git a/lib/tests/plugininfo/media_test.php b/lib/tests/plugininfo/media_test.php
index db2e39051f1..3da45b06ce3 100644
--- a/lib/tests/plugininfo/media_test.php
+++ b/lib/tests/plugininfo/media_test.php
@@ -83,13 +83,13 @@ final class media_test extends advanced_testcase {
      * @param string $initialorder
      * @param string $pluginname
      * @param int $direction
-     * @param array $neworder
+     * @param array $expected
      */
     public function test_change_plugin_order(
         array $initialorder,
         string $pluginname,
         int $direction,
-        array $neworder,
+        array $expected,
     ): void {
         $this->resetAfterTest(true);
 
@@ -97,7 +97,7 @@ final class media_test extends advanced_testcase {
         media::change_plugin_order($pluginname, $direction);
 
         $this->assertSame(
-            $neworder,
+            $expected,
             array_keys(media::get_sorted_plugins()),
         );
     }
diff --git a/lib/tests/questionlib_test.php b/lib/tests/questionlib_test.php
index 618b5ff0f0d..9dcd362524f 100644
--- a/lib/tests/questionlib_test.php
+++ b/lib/tests/questionlib_test.php
@@ -662,7 +662,7 @@ final class questionlib_test extends \advanced_testcase {
                 'capabilities' => [
                     'moodle/question:config' => CAP_ALLOW,
                 ],
-                'testcapability' => 'config',
+                'capability' => 'config',
                 'isowner' => true,
                 'expect' => true,
             ],
@@ -670,21 +670,21 @@ final class questionlib_test extends \advanced_testcase {
                 'capabilities' => [
                     'moodle/question:config' => CAP_ALLOW,
                 ],
-                'testcapability' => 'config',
+                'capability' => 'config',
                 'isowner' => false,
                 'expect' => true,
             ],
             'Unrelated capability which is not set' => [
                 'capabilities' => [
                 ],
-                'testcapability' => 'config',
+                'capability' => 'config',
                 'isowner' => true,
                 'expect' => false,
             ],
             'Unrelated capability which is not set (not owner)' => [
                 'capabilities' => [
                 ],
-                'testcapability' => 'config',
+                'capability' => 'config',
                 'isowner' => false,
                 'expect' => false,
             ],
@@ -692,7 +692,7 @@ final class questionlib_test extends \advanced_testcase {
                 'capabilities' => [
                     'moodle/question:config' => CAP_PREVENT,
                 ],
-                'testcapability' => 'config',
+                'capability' => 'config',
                 'isowner' => true,
                 'expect' => false,
             ],
@@ -700,21 +700,21 @@ final class questionlib_test extends \advanced_testcase {
                 'capabilities' => [
                     'moodle/question:config' => CAP_PREVENT,
                 ],
-                'testcapability' => 'config',
+                'capability' => 'config',
                 'isowner' => false,
                 'expect' => false,
             ],
             'Related capability which is not set' => [
                 'capabilities' => [
                 ],
-                'testcapability' => 'edit',
+                'capability' => 'edit',
                 'isowner' => true,
                 'expect' => false,
             ],
             'Related capability which is not set (not owner)' => [
                 'capabilities' => [
                 ],
-                'testcapability' => 'edit',
+                'capability' => 'edit',
                 'isowner' => false,
                 'expect' => false,
             ],
@@ -722,7 +722,7 @@ final class questionlib_test extends \advanced_testcase {
                 'capabilities' => [
                     'moodle/question:editall' => CAP_ALLOW,
                 ],
-                'testcapability' => 'edit',
+                'capability' => 'edit',
                 'isowner' => true,
                 'expect' => true,
             ],
@@ -730,7 +730,7 @@ final class questionlib_test extends \advanced_testcase {
                 'capabilities' => [
                     'moodle/question:editall' => CAP_ALLOW,
                 ],
-                'testcapability' => 'edit',
+                'capability' => 'edit',
                 'isowner' => false,
                 'expect' => true,
             ],
@@ -739,7 +739,7 @@ final class questionlib_test extends \advanced_testcase {
                     'moodle/question:editall' => CAP_ALLOW,
                     'moodle/question:editmine' => CAP_PREVENT,
                 ],
-                'testcapability' => 'edit',
+                'capability' => 'edit',
                 'isowner' => true,
                 'expect' => true,
             ],
@@ -748,7 +748,7 @@ final class questionlib_test extends \advanced_testcase {
                     'moodle/question:editall' => CAP_ALLOW,
                     'moodle/question:editmine' => CAP_PREVENT,
                 ],
-                'testcapability' => 'edit',
+                'capability' => 'edit',
                 'isowner' => false,
                 'expect' => true,
             ],
@@ -757,7 +757,7 @@ final class questionlib_test extends \advanced_testcase {
                     'moodle/question:editall' => CAP_PREVENT,
                     'moodle/question:editmine' => CAP_ALLOW,
                 ],
-                'testcapability' => 'edit',
+                'capability' => 'edit',
                 'isowner' => true,
                 'expect' => true,
             ],
@@ -766,7 +766,7 @@ final class questionlib_test extends \advanced_testcase {
                     'moodle/question:editall' => CAP_PREVENT,
                     'moodle/question:editmine' => CAP_ALLOW,
                 ],
-                'testcapability' => 'edit',
+                'capability' => 'edit',
                 'isowner' => false,
                 'expect' => false,
             ],
diff --git a/lib/tests/scss_test.php b/lib/tests/scss_test.php
index 2cf4c630051..54c603217f4 100644
--- a/lib/tests/scss_test.php
+++ b/lib/tests/scss_test.php
@@ -132,9 +132,9 @@ CSS
      *
      * @dataProvider scss_compilation_provider
      * @param string $scss The raw scss to compile.
-     * @param string $expectedcss The expected CSS output.
+     * @param string $expected The expected CSS output.
      */
-    public function test_scss_compilation_with_sassc($scss, $expectedcss): void {
+    public function test_scss_compilation_with_sassc($scss, $expected): void {
         if (!defined('PHPUNIT_PATH_TO_SASSC')) {
             $this->markTestSkipped('Path to SassC not provided');
         }
@@ -142,6 +142,6 @@ CSS
         $this->resetAfterTest();
         set_config('pathtosassc', PHPUNIT_PATH_TO_SASSC);
         $compiler = new core_scss();
-        $this->assertSame($compiler->compile($scss), $expectedcss);
+        $this->assertSame($compiler->compile($scss), $expected);
     }
 }
diff --git a/lib/tests/session/utility/cookie_helper_test.php b/lib/tests/session/utility/cookie_helper_test.php
index 7fe2a140f6c..86c49731c77 100644
--- a/lib/tests/session/utility/cookie_helper_test.php
+++ b/lib/tests/session/utility/cookie_helper_test.php
@@ -65,7 +65,7 @@ final class cookie_helper_test extends \advanced_testcase {
                     'Secure',
                 ],
                 'casesensitive' => false,
-                'output' => [
+                'expectedheaders' => [
                     'Set-Cookie: testcookie=value; path=/test/; HttpOnly; Partitioned; SameSite=None; Secure;',
                 ],
             ],
@@ -84,7 +84,7 @@ final class cookie_helper_test extends \advanced_testcase {
                     'Secure',
                 ],
                 'casesensitive' => false,
-                'output' => [
+                'expectedheaders' => [
                     'Set-Cookie: testcookie=value; path=/test/; HttpOnly; Partitioned; SameSite=None; Secure;',
                     'Set-Cookie: mytestcookie=value; path=/test/; HttpOnly; Partitioned; SameSite=None; Secure;',
                 ],
@@ -107,7 +107,7 @@ final class cookie_helper_test extends \advanced_testcase {
                     'Secure',
                 ],
                 'casesensitive' => false,
-                'output' => [
+                'expectedheaders' => [
                     'Set-Cookie: testcookie=value; path=/test/; HttpOnly; Partitioned; SameSite=None; Secure;',
                     'Set-Cookie: mytestcookie=value; path=/test/; HttpOnly; Partitioned; SameSite=None; Secure;',
                     'Set-Cookie: anothertestcookie=value; path=/test/; HttpOnly;',
@@ -129,7 +129,7 @@ final class cookie_helper_test extends \advanced_testcase {
                     'Secure',
                 ],
                 'casesensitive' => false,
-                'output' => [
+                'expectedheaders' => [
                     'Set-Cookie: testcookie=value; path=/test/; secure; HttpOnly; Partitioned; SameSite=None',
                     'Set-Cookie: mytestcookie=value; path=/test/; secure; HttpOnly; SameSite=None; Partitioned;',
                 ],
@@ -150,7 +150,7 @@ final class cookie_helper_test extends \advanced_testcase {
                     'Secure',
                 ],
                 'casesensitive' => true,
-                'output' => [
+                'expectedheaders' => [
                     'Set-Cookie: testcookie=value; path=/test/; secure; HttpOnly; SameSite=None; partitioned; Partitioned; Secure;',
                     'Set-Cookie: mytestcookie=value; path=/test/; secure; HttpOnly; SameSite=None; Partitioned; Secure;',
                 ],
@@ -167,7 +167,7 @@ final class cookie_helper_test extends \advanced_testcase {
                     'Secure',
                 ],
                 'casesensitive' => false,
-                'output' => [
+                'expectedheaders' => [
                     'Set-Cookie: testcookie=value; path=/test/; secure; HttpOnly; SameSite=None; partitioned',
                     'Set-Cookie: mytestcookie=value; path=/test/; secure; HttpOnly; SameSite=None',
                 ],
@@ -183,7 +183,7 @@ final class cookie_helper_test extends \advanced_testcase {
                 ],
                 'attributes' => [],
                 'casesensitive' => false,
-                'output' => [
+                'expectedheaders' => [
                     'Set-Cookie: testcookie=value; path=/test/; secure; HttpOnly; SameSite=None; partitioned',
                     'Set-Cookie: mytestcookie=value; path=/test/; secure; HttpOnly; SameSite=None',
                 ],
@@ -204,7 +204,7 @@ final class cookie_helper_test extends \advanced_testcase {
                     'Secure',
                 ],
                 'casesensitive' => false,
-                'output' => [
+                'expectedheaders' => [
                     'Authorization: blah',
                     'Set-Cookie: testcookie=value; path=/test/; secure; HttpOnly; SameSite=None; Partitioned',
                     'Set-Cookie: mytestcookie=value; path=/test/; secure; HttpOnly; SameSite=None; Partitioned;',
diff --git a/lib/tests/statslib_test.php b/lib/tests/statslib_test.php
index 958f0e5e96b..df0441f16b7 100644
--- a/lib/tests/statslib_test.php
+++ b/lib/tests/statslib_test.php
@@ -213,13 +213,13 @@ final class statslib_test extends \advanced_testcase {
             [
                 "startwday" => 0,
                 "timezone" => 'America/Chicago',
-                "date" => '25-03-2017 22:00',
+                "timestart" => '25-03-2017 22:00',
                 "expected" => '19-03-2017 00:00:00'
             ],
             [
                 "startwday" => 1,
                 "timezone" => 'Atlantic/Canary',
-                "date" => '06-08-2018 22:00',
+                "timestart" => '06-08-2018 22:00',
                 "expected" => '06-08-2018 00:00:00'
             ],
         ];
diff --git a/lib/tests/task/hide_ended_courses_task_test.php b/lib/tests/task/hide_ended_courses_task_test.php
index 81c91796826..29df3932cd8 100644
--- a/lib/tests/task/hide_ended_courses_task_test.php
+++ b/lib/tests/task/hide_ended_courses_task_test.php
@@ -32,7 +32,7 @@ final class hide_ended_courses_task_test extends courses_tasks_testcase {
     /**
      * Test hide_ended_courses cron task.
      *
-     * @dataProvider get_courses_provider
+     * @dataProvider hide_end_courses_provider
      * @covers ::execute
      *
      * @param int $nextweekvisible Number of courses with the end date set to next week to be created.
@@ -113,4 +113,23 @@ final class hide_ended_courses_task_test extends courses_tasks_testcase {
             $this->assertArrayHasKey($event->courseid, array_flip($expected));
         }
     }
+
+    /**
+     * Data provider for test_hide_ended_courses.
+     *
+     * @return array
+     */
+    public static function hide_end_courses_provider(): array {
+        return array_map(
+            function ($args): array {
+                return [
+                    'nextweekvisible' => $args['lastweekcount'],
+                    'yesterdayvisible' => $args['yesterdaycount'],
+                    'tomorrowvisible' => $args['tomorrowcount'],
+                    'createhidden' => $args['createvisible'] ?? true,
+                ];
+            },
+            self::get_courses_provider()
+        );
+    }
 }
diff --git a/lib/tests/task/scheduled_task_test.php b/lib/tests/task/scheduled_task_test.php
index a88842fa4b7..876c62c610b 100644
--- a/lib/tests/task/scheduled_task_test.php
+++ b/lib/tests/task/scheduled_task_test.php
@@ -709,7 +709,7 @@ final class scheduled_task_test extends \advanced_testcase {
     public static function provider_schedule_overrides(): array {
         return array(
             array(
-                'scheduled_tasks' => array(
+                'overrides' => array(
                     '\core\task\scheduled_test_task' => array(
                         'schedule' => '10 13 1 2 4',
                         'disabled' => 0,
@@ -719,7 +719,7 @@ final class scheduled_task_test extends \advanced_testcase {
                         'disabled' => 1,
                     ),
                 ),
-                'task_full_classnames' => array(
+                'tasks' => array(
                     '\core\task\scheduled_test_task',
                     '\core\task\scheduled_test2_task',
                 ),
@@ -743,13 +743,13 @@ final class scheduled_task_test extends \advanced_testcase {
                 )
             ),
             array(
-                'scheduled_tasks' => array(
+                'overrides' => array(
                     '\core\task\*' => array(
                         'schedule' => '1 2 3 4 5',
                         'disabled' => 0,
                     )
                 ),
-                'task_full_classnames' => array(
+                'tasks' => array(
                     '\core\task\scheduled_test_task',
                     '\core\task\scheduled_test2_task',
                 ),
diff --git a/lib/tests/task/show_started_courses_task_test.php b/lib/tests/task/show_started_courses_task_test.php
index 168e1772aeb..6723b86615a 100644
--- a/lib/tests/task/show_started_courses_task_test.php
+++ b/lib/tests/task/show_started_courses_task_test.php
@@ -35,15 +35,15 @@ final class show_started_courses_task_test extends courses_tasks_testcase {
      * @dataProvider get_courses_provider
      * @covers ::execute
      *
-     * @param int $lastweekhidden Number of courses with the start date set to last week to be created.
-     * @param int $yesterdayhidden Number of courses with the start date set to yesterday to be created.
-     * @param int $tomorrowhidden Number of courses with the start date set to tomorrow to be created.
+     * @param int $lastweek Number of courses with the start date set to last week to be created.
+     * @param int $yesterday Number of courses with the start date set to yesterday to be created.
+     * @param int $tomorrow Number of courses with the start date set to tomorrow to be created.
      * @param bool $createvisible Whether visible courses should be created or not.
      */
     public function test_show_started_courses(
-        int $lastweekhidden,
-        int $yesterdayhidden,
-        int $tomorrowhidden,
+        int $lastweekcount,
+        int $yesterdaycount,
+        int $tomorrowcount,
         bool $createvisible = true
     ): void {
         global $DB;
@@ -61,15 +61,15 @@ final class show_started_courses_task_test extends courses_tasks_testcase {
         $tomorrow = $now + DAYSECS;
 
         // Hidden course that started last week.
-        for ($i = 0; $i < $lastweekhidden; $i++) {
+        for ($i = 0; $i < $lastweekcount; $i++) {
              $generator->create_course(['visible' => false, 'startdate' => $lastweek]);
         }
         // Hidden course that started yesterday.
-        for ($i = 0; $i < $yesterdayhidden; $i++) {
+        for ($i = 0; $i < $yesterdaycount; $i++) {
             $hiddencourses[] = $generator->create_course(['visible' => false, 'startdate' => $yesterday])->id;
         }
         // Hidden course that hasn't started yet.
-        for ($i = 0; $i < $tomorrowhidden; $i++) {
+        for ($i = 0; $i < $tomorrowcount; $i++) {
             $generator->create_course(['visible' => false, 'startdate' => $tomorrow]);
         }
         if ($createvisible) {
@@ -79,7 +79,7 @@ final class show_started_courses_task_test extends courses_tasks_testcase {
             $visiblecourses[] = $generator->create_course(['visible' => true, 'startdate' => $tomorrow])->id;
         }
         $visibletotal = count($visiblecourses) + 1;
-        $coursetotal = $visibletotal + $lastweekhidden + $yesterdayhidden + $tomorrowhidden;
+        $coursetotal = $visibletotal + $lastweekcount + $yesterdaycount + $tomorrowcount;
 
         // Check current courses have been created correctly.
         $this->assertEquals($coursetotal, $DB->count_records('course'));
@@ -96,14 +96,14 @@ final class show_started_courses_task_test extends courses_tasks_testcase {
         // Confirm the courses with yesterday as starting date are visible too. The rest should remain hidden.
         $this->assertEquals($coursetotal, $DB->count_records('course'));
         $courses = $DB->get_records('course', ['visible' => 1], '', 'id');
-        $this->assertCount($visibletotal + $yesterdayhidden, $courses);
+        $this->assertCount($visibletotal + $yesterdaycount, $courses);
         $expected = array_merge($hiddencourses, $visiblecourses);
         $this->assertEquals(asort($expected), asort($courses));
 
         // Check the started course event has been raised.
         $events = $sink->get_events();
         $sink->close();
-        $this->assertCount($yesterdayhidden, $events);
+        $this->assertCount($yesterdaycount, $events);
         foreach ($events as $event) {
             $this->assertInstanceOf('\\core\\event\\course_started', $event);
             $this->assertArrayHasKey($event->courseid, array_flip($expected));
diff --git a/lib/tests/user_test.php b/lib/tests/user_test.php
index 5230bbfab6d..90d67747081 100644
--- a/lib/tests/user_test.php
+++ b/lib/tests/user_test.php
@@ -977,33 +977,33 @@ final class user_test extends \advanced_testcase {
     public static function user_name_provider(): array {
         return [
             'simple user' => [
-                'user' => ['firstname' => 'first', 'lastname' => 'last'],
-                'fullnamedisplay' => 'language',
+                'userdata' => ['firstname' => 'first', 'lastname' => 'last'],
+                'fullnameconfig' => 'language',
                 'expected' => 'fl',
             ],
             'simple user with lastname firstname in language settings' => [
-                'user' => ['firstname' => 'first', 'lastname' => 'last'],
-                'fullnamedisplay' => 'lastname firstname',
+                'userdata' => ['firstname' => 'first', 'lastname' => 'last'],
+                'fullnameconfig' => 'lastname firstname',
                 'expected' => 'lf',
             ],
             'simple user with no surname' => [
-                'user' => ['firstname' => '', 'lastname' => 'L'],
-                'fullnamedisplay' => 'language',
+                'userdata' => ['firstname' => '', 'lastname' => 'L'],
+                'fullnameconfig' => 'language',
                 'expected' => 'L',
             ],
             'simple user with a middle name' => [
-                'user' => ['firstname' => 'f', 'lastname' => 'l', 'middlename' => 'm'],
-                'fullnamedisplay' => 'middlename lastname',
+                'userdata' => ['firstname' => 'f', 'lastname' => 'l', 'middlename' => 'm'],
+                'fullnameconfig' => 'middlename lastname',
                 'expected' => 'ml',
             ],
             'user with a middle name & fullnamedisplay contains 3 names' => [
-                'user' => ['firstname' => 'first', 'lastname' => 'last', 'middlename' => 'middle'],
-                'fullnamedisplay' => 'firstname middlename lastname',
+                'userdata' => ['firstname' => 'first', 'lastname' => 'last', 'middlename' => 'middle'],
+                'fullnameconfig' => 'firstname middlename lastname',
                 'expected' => 'fl',
             ],
             'simple user with a namefield consisting of one element' => [
-                'user' => ['firstname' => 'first', 'lastname' => 'last'],
-                'fullnamedisplay' => 'lastname',
+                'userdata' => ['firstname' => 'first', 'lastname' => 'last'],
+                'fullnameconfig' => 'lastname',
                 'expected' => 'l',
             ],
         ];
diff --git a/lib/xapi/tests/external/delete_states_test.php b/lib/xapi/tests/external/delete_states_test.php
index 24f94d13e27..316c80c8c49 100644
--- a/lib/xapi/tests/external/delete_states_test.php
+++ b/lib/xapi/tests/external/delete_states_test.php
@@ -189,7 +189,8 @@ final class delete_states_test extends externallib_advanced_testcase {
      * @param array $expectedstates
      * @return void
      */
-    public function test_delete_states(string $testedusername,
+    public function test_delete_states(
+        string $testedusername,
         string $testedcomponent,
         string $testedactivityname,
         array $states,
@@ -267,9 +268,9 @@ final class delete_states_test extends externallib_advanced_testcase {
     public static function states_provider(): array {
         return [
             'Activities with different users and components' => [
-                'username' => 'user1',
-                'component' => 'mod_h5pactivity',
-                'activity' => 'Activity 1',
+                'testedusername' => 'user1',
+                'testedcomponent' => 'mod_h5pactivity',
+                'testedactivityname' => 'Activity 1',
                 'states' => [
                     [
                         'user' => 'user1',
@@ -293,15 +294,15 @@ final class delete_states_test extends externallib_advanced_testcase {
                         'component' => 'mod_h5pactivity'
                     ],
                 ],
-                'expectedstatesleft' => [
+                'expectedstates' => [
                     ['user' => 'user2', 'activity' => 'Activity 1'],
                     ['user' => 'user1', 'activity' => 'Activity 3']
                 ]
             ],
             'Activities with one single user' => [
-                'username' => 'user1',
-                'component' => 'mod_h5pactivity',
-                'activity' => 'Activity 1',
+                'testedusername' => 'user1',
+                'testedcomponent' => 'mod_h5pactivity',
+                'testedactivityname' => 'Activity 1',
                 'states' => [
                     [
                         'user' => 'user1',
@@ -319,7 +320,7 @@ final class delete_states_test extends externallib_advanced_testcase {
                         'component' => 'mod_h5pactivity'
                     ],
                 ],
-                'expectedstatesleft' => []
+                'expectedstates' => []
             ],
         ];
     }
diff --git a/message/tests/api_test.php b/message/tests/api_test.php
index d1d3bf80610..6a43096112f 100644
--- a/message/tests/api_test.php
+++ b/message/tests/api_test.php
@@ -1938,14 +1938,14 @@ final class api_test extends \advanced_testcase {
     public static function get_conversations_mixed_provider(): array {
         return [
             'Test that conversations with messages contacts is correctly ordered.' => [
-                'users' => [
+                'usersdata' => [
                     'user1',
                     'user2',
                     'user3',
                 ],
                 'contacts' => [
                 ],
-                'messages' => [
+                'messagesdata' => [
                     [
                         'from'          => 'user1',
                         'to'            => 'user2',
@@ -2025,13 +2025,13 @@ final class api_test extends \advanced_testcase {
                 ],
             ],
             'Test conversations with a single user, where some messages are read and some are not.' => [
-                'users' => [
+                'usersdata' => [
                     'user1',
                     'user2',
                 ],
                 'contacts' => [
                 ],
-                'messages' => [
+                'messagesdata' => [
                     [
                         'from'          => 'user1',
                         'to'            => 'user2',
@@ -2084,13 +2084,13 @@ final class api_test extends \advanced_testcase {
             'are out of order' => [
             // This can happen through a combination of factors including multi-master DB replication with messages
             // read somehow (e.g. API).
-                'users' => [
+                'usersdata' => [
                     'user1',
                     'user2',
                 ],
                 'contacts' => [
                 ],
-                'messages' => [
+                'messagesdata' => [
                     [
                         'from'          => 'user1',
                         'to'            => 'user2',
@@ -2139,13 +2139,13 @@ final class api_test extends \advanced_testcase {
                 ],
             ],
             'Test unread message count is correct for both users' => [
-                'users' => [
+                'usersdata' => [
                     'user1',
                     'user2',
                 ],
                 'contacts' => [
                 ],
-                'messages' => [
+                'messagesdata' => [
                     [
                         'from'          => 'user1',
                         'to'            => 'user2',
@@ -5807,7 +5807,7 @@ final class api_test extends \advanced_testcase {
 
         return [
             'No conversations' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user5],
@@ -5830,7 +5830,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'No individual conversations, 2 group conversations' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user4],
@@ -5853,7 +5853,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             '2 individual conversations (one favourited), 1 group conversation' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user1],
@@ -5876,7 +5876,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             '1 individual conversation, 2 group conversations' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user2],
@@ -5899,7 +5899,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             '2 group conversations only' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user4],
@@ -5922,7 +5922,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'All conversation types, delete a message from individual favourited, messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0],
                 'arguments' => [$user1],
@@ -5945,7 +5945,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'All conversation types, delete a message from individual non-favourited, messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3],
                 'arguments' => [$user1],
@@ -5968,7 +5968,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual favourited, no messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0, 1, 2],
                 'arguments' => [$user1],
@@ -5991,7 +5991,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual non-favourited, no messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3, 4, 5],
                 'arguments' => [$user1],
@@ -6014,7 +6014,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual favourited, no messages remaining, different user' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0, 1, 2],
                 'arguments' => [$user2],
@@ -6037,7 +6037,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual non-favourited, no messages remaining, different user' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3, 4, 5],
                 'arguments' => [$user3],
@@ -6060,7 +6060,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'All conversation types, delete some messages from group non-favourited, messages remaining,' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [6, 7],
                 'arguments' => [$user1],
@@ -6083,7 +6083,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'All conversation types, delete all messages from group non-favourited, no messages remaining,' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [6, 7, 8, 9],
                 'arguments' => [$user1],
@@ -6106,7 +6106,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'All conversation types, another user soft deleted' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user1],
@@ -6129,7 +6129,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [$user2],
             ],
             'All conversation types, all group users soft deleted' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user1],
@@ -6152,7 +6152,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [$user2, $user3, $user4],
             ],
             'Group conversation which is disabled, favourited' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user6],
@@ -6175,7 +6175,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'Group conversation which is disabled, non-favourited' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user7],
@@ -6198,7 +6198,7 @@ final class api_test extends \advanced_testcase {
                 'deletedusers' => [],
             ],
             'Conversation with self' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user8],
diff --git a/message/tests/externallib_test.php b/message/tests/externallib_test.php
index c4d61aaf1f5..e144549814c 100644
--- a/message/tests/externallib_test.php
+++ b/message/tests/externallib_test.php
@@ -5191,7 +5191,7 @@ final class externallib_test extends externallib_advanced_testcase {
 
         return [
             'No conversations' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user5],
@@ -5208,7 +5208,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'No individual conversations, 2 group conversations' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user4],
@@ -5225,7 +5225,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             '2 individual conversations (one favourited), 1 group conversation' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user1],
@@ -5242,7 +5242,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             '1 individual conversation, 2 group conversations' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user2],
@@ -5259,7 +5259,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             '2 group conversations only' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user4],
@@ -5276,7 +5276,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'All conversation types, delete a message from individual favourited, messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0],
                 'arguments' => [$user1],
@@ -5293,7 +5293,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'All conversation types, delete a message from individual non-favourited, messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3],
                 'arguments' => [$user1],
@@ -5310,7 +5310,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'All conversation types, delete all messages from individual favourited, no messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0, 1, 2],
                 'arguments' => [$user1],
@@ -5327,7 +5327,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'All conversation types, delete all messages from individual non-favourited, no messages remaining' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3, 4, 5],
                 'arguments' => [$user1],
@@ -5344,7 +5344,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'All conversation types, delete all messages from individual favourited, no messages remaining, different user' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0, 1, 2],
                 'arguments' => [$user2],
@@ -5361,7 +5361,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'All conversation types, delete all messages from individual non-favourited, no messages remaining, different user' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3, 4, 5],
                 'arguments' => [$user3],
@@ -5378,7 +5378,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'All conversation types, delete some messages from group non-favourited, messages remaining,' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [6, 7],
                 'arguments' => [$user1],
@@ -5395,7 +5395,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'All conversation types, delete all messages from group non-favourited, no messages remaining,' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [6, 7, 8, 9],
                 'arguments' => [$user1],
@@ -5412,7 +5412,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'All conversation types, another user soft deleted' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user1],
@@ -5429,7 +5429,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => [$user2]
             ],
             'All conversation types, all group users soft deleted' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user1],
@@ -5446,7 +5446,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => [$user2, $user3, $user4]
             ],
             'Group conversation which is disabled, favourited' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user6],
@@ -5463,7 +5463,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'Group conversation which is disabled, non-favourited' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user7],
@@ -5480,7 +5480,7 @@ final class externallib_test extends externallib_advanced_testcase {
                 'deletedusers' => []
             ],
             'Conversation with self' => [
-                'conversationConfigs' => $conversations,
+                'conversationconfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user8],
diff --git a/privacy/tests/privacy/provider_test.php b/privacy/tests/privacy/provider_test.php
index 5c25dfc0144..3e184aed58e 100644
--- a/privacy/tests/privacy/provider_test.php
+++ b/privacy/tests/privacy/provider_test.php
@@ -233,12 +233,15 @@ final class provider_test extends \advanced_testcase {
      * @return array
      */
     public static function is_user_data_provider(): array {
-        return array_filter(self::get_component_list(), function($component): bool {
-            return static::component_implements(
-                $component['classname'],
-                \core_privacy\local\request\core_user_data_provider::class
-            );
-        });
+        return array_map(
+            fn ($data) => ['component' => $data['component']],
+            array_filter(self::get_component_list(), function($component): bool {
+                return static::component_implements(
+                    $component['classname'],
+                    \core_privacy\local\request\core_user_data_provider::class
+                );
+            }),
+        );
     }
 
     /**
diff --git a/question/engine/tests/question_engine_test.php b/question/engine/tests/question_engine_test.php
index 89655479f69..6df1206083f 100644
--- a/question/engine/tests/question_engine_test.php
+++ b/question/engine/tests/question_engine_test.php
@@ -209,12 +209,12 @@ final class question_engine_test extends advanced_testcase {
      * @dataProvider is_manual_grade_in_range_provider
      * @covers \question_engine::is_manual_grade_in_range
      * @param array $post The values to add to $_POST
-     * @param array $params The params to pass to is_manual_grade_in_range
+     * @param array $range The params to pass to is_manual_grade_in_range
      * @param bool $expected
      */
-    public function test_is_manual_grade_in_range(array $post, array $params, bool $expected): void {
+    public function test_is_manual_grade_in_range(array $post, array $range, bool $expected): void {
         $_POST[] = $post;
-        $this->assertEquals($expected, question_engine::is_manual_grade_in_range(...$params));
+        $this->assertEquals($expected, question_engine::is_manual_grade_in_range(...$range));
     }
 
     /**
diff --git a/question/tests/local/statistics/statistics_bulk_loader_test.php b/question/tests/local/statistics/statistics_bulk_loader_test.php
index e71c09e312b..785400eac77 100644
--- a/question/tests/local/statistics/statistics_bulk_loader_test.php
+++ b/question/tests/local/statistics/statistics_bulk_loader_test.php
@@ -290,32 +290,42 @@ final class statistics_bulk_loader_test extends advanced_testcase {
      */
     public static function load_question_facility_provider(): Generator {
         yield 'Facility case 1' => [
-            'Quiz 1 attempts' => [
+            // Quiz 1 attempts.
+            [
                 self::generate_attempt_answers([1, 0, 0, 0]),
             ],
-            'Expected quiz 1 facilities' => [1.0, 0.0, 0.0, 0.0],
-            'Quiz 2 attempts' => [
+            // Expected quiz 1 facilities.
+            [1.0, 0.0, 0.0, 0.0],
+            // Quiz 2 attempts.
+            [
                 self::generate_attempt_answers([1, 0, 0, 0]),
                 self::generate_attempt_answers([1, 1, 0, 0]),
             ],
-            'Expected quiz 2 facilities' => [1.0, 0.5, 0.0, 0.0],
-            'Expected average facilities' => [1.0, 0.25, 0.0, 0.0],
+            // Expected quiz 2 facilities.
+            [1.0, 0.5, 0.0, 0.0],
+            // Expected average facilities.
+            [1.0, 0.25, 0.0, 0.0],
         ];
         yield 'Facility case 2' => [
-            'Quiz 1 attempts' => [
+            // Quiz 1 attempts.
+            [
                 self::generate_attempt_answers([1, 0, 0, 0]),
                 self::generate_attempt_answers([1, 1, 0, 0]),
                 self::generate_attempt_answers([1, 1, 1, 0]),
             ],
-            'Expected quiz 1 facilities' => [1.0, 0.6667, 0.3333, 0.0],
-            'Quiz 2 attempts' => [
+            // Expected quiz 1 facilities.
+            [1.0, 0.6667, 0.3333, 0.0],
+            // Quiz 2 attempts.
+            [
                 self::generate_attempt_answers([1, 0, 0, 0]),
                 self::generate_attempt_answers([1, 1, 0, 0]),
                 self::generate_attempt_answers([1, 1, 1, 0]),
                 self::generate_attempt_answers([1, 1, 1, 1]),
             ],
-            'Expected quiz 2 facilities' => [1.0, 0.75, 0.5, 0.25],
-            'Expected average facilities' => [1.0, 0.7083, 0.4167, 0.1250],
+            // Expected quiz 2 facilities.
+            [1.0, 0.75, 0.5, 0.25],
+            // Expected average facilities.
+            [1.0, 0.7083, 0.4167, 0.1250],
         ];
     }
 
@@ -399,21 +409,26 @@ final class statistics_bulk_loader_test extends advanced_testcase {
      */
     public static function load_question_discriminative_efficiency_provider(): Generator {
         yield 'Discriminative efficiency' => [
-            'Quiz 1 attempts' => [
+            // Quiz 1 attempts.
+            [
                 self::generate_attempt_answers([1, 0, 0, 0]),
                 self::generate_attempt_answers([1, 1, 0, 0]),
                 self::generate_attempt_answers([1, 0, 1, 0]),
                 self::generate_attempt_answers([1, 1, 1, 1]),
             ],
-            'Expected quiz 1 discriminative efficiency' => [null, 33.33, 33.33, 100.00],
-            'Quiz 2 attempts' => [
+            // Expected quiz 1 discriminative efficiency.
+            [null, 33.33, 33.33, 100.00],
+            // Quiz 2 attempts.
+            [
                 self::generate_attempt_answers([1, 1, 1, 1]),
                 self::generate_attempt_answers([0, 0, 0, 0]),
                 self::generate_attempt_answers([1, 0, 0, 1]),
                 self::generate_attempt_answers([0, 1, 1, 0]),
             ],
-            'Expected quiz 2 discriminative efficiency' => [50.00, 50.00, 50.00, 50.00],
-            'Expected average discriminative efficiency' => [50.00, 41.67, 41.67, 75.00],
+            // Expected quiz 2 discriminative efficiency.
+            [50.00, 50.00, 50.00, 50.00],
+            // Expected average discriminative efficiency.
+            [50.00, 41.67, 41.67, 75.00],
         ];
     }
 
@@ -529,21 +544,26 @@ final class statistics_bulk_loader_test extends advanced_testcase {
      */
     public static function load_question_discrimination_index_provider(): Generator {
         yield 'Discrimination Index' => [
-            'Quiz 1 attempts' => [
+            // Quiz 1 attempts.
+            [
                 self::generate_attempt_answers([1, 0, 0, 0]),
                 self::generate_attempt_answers([1, 1, 0, 0]),
                 self::generate_attempt_answers([1, 0, 1, 0]),
                 self::generate_attempt_answers([1, 1, 1, 1]),
             ],
-            'Expected quiz 1 Discrimination Index' => [null, 30.15, 30.15, 81.65],
-            'Quiz 2 attempts' => [
+            // Expected quiz 1 Discrimination Index.
+            [null, 30.15, 30.15, 81.65],
+            // Quiz 2 attempts.
+            [
                 self::generate_attempt_answers([1, 1, 1, 1]),
                 self::generate_attempt_answers([0, 0, 0, 0]),
                 self::generate_attempt_answers([1, 0, 0, 1]),
                 self::generate_attempt_answers([0, 1, 1, 0]),
             ],
-            'Expected quiz 2 discrimination Index' => [44.72, 44.72, 44.72, 44.72],
-            'Expected average discrimination Index' => [44.72, 37.44, 37.44, 63.19],
+            // Expected quiz 2 discrimination Index.
+            [44.72, 44.72, 44.72, 44.72],
+            // Expected average discrimination Index.
+            [44.72, 37.44, 37.44, 63.19],
         ];
     }
 
diff --git a/reportbuilder/tests/external/system_report_exporter_test.php b/reportbuilder/tests/external/system_report_exporter_test.php
index 29f08983398..ac15d7b902f 100644
--- a/reportbuilder/tests/external/system_report_exporter_test.php
+++ b/reportbuilder/tests/external/system_report_exporter_test.php
@@ -51,8 +51,8 @@ final class system_report_exporter_test extends advanced_testcase {
      */
     public static function export_provider(): array {
         return [
-            ['With filters' => true],
-            ['Without filters' => false],
+            'With filters' => [true],
+            'Without filters' => [false],
         ];
     }
 
diff --git a/user/tests/table/participants_search_test.php b/user/tests/table/participants_search_test.php
index b04b60c6667..98180bbabcb 100644
--- a/user/tests/table/participants_search_test.php
+++ b/user/tests/table/participants_search_test.php
@@ -191,7 +191,7 @@ final class participants_search_test extends advanced_testcase {
         $tests = [
             // Users who only have one role each.
             'Users in each role' => (object) [
-                'users' => [
+                'usersdata' => [
                     'a' => [
                         'courseroles' => [
                             'student',
@@ -248,7 +248,7 @@ final class participants_search_test extends advanced_testcase {
                 'expect' => [
                     // Tests for jointype: ANY.
                     'ANY: No role filter' => (object) [
-                        'roles' => [],
+                        'testroles' => [],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 8,
                         'expectedusers' => [
@@ -263,7 +263,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on student' => (object) [
-                        'roles' => ['student'],
+                        'testroles' => ['student'],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 2,
                         'expectedusers' => [
@@ -272,7 +272,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on student, teacher' => (object) [
-                        'roles' => ['student', 'teacher'],
+                        'testroles' => ['student', 'teacher'],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 4,
                         'expectedusers' => [
@@ -283,7 +283,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on student, manager (category level role)' => (object) [
-                        'roles' => ['student', 'manager'],
+                        'testroles' => ['student', 'manager'],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 3,
                         'expectedusers' => [
@@ -293,7 +293,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on student, coursecreator (not assigned)' => (object) [
-                        'roles' => ['student', 'coursecreator'],
+                        'testroles' => ['student', 'coursecreator'],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 2,
                         'expectedusers' => [
@@ -304,7 +304,7 @@ final class participants_search_test extends advanced_testcase {
 
                     // Tests for jointype: ALL.
                     'ALL: No role filter' => (object) [
-                        'roles' => [],
+                        'testroles' => [],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 8,
                         'expectedusers' => [
@@ -319,7 +319,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ALL: Filter on student' => (object) [
-                        'roles' => ['student'],
+                        'testroles' => ['student'],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 2,
                         'expectedusers' => [
@@ -328,19 +328,19 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ALL: Filter on student, teacher' => (object) [
-                        'roles' => ['student', 'teacher'],
+                        'testroles' => ['student', 'teacher'],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 0,
                         'expectedusers' => [],
                     ],
                     'ALL: Filter on student, manager (category level role))' => (object) [
-                        'roles' => ['student', 'manager'],
+                        'testroles' => ['student', 'manager'],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 0,
                         'expectedusers' => [],
                     ],
                     'ALL: Filter on student, coursecreator (not assigned))' => (object) [
-                        'roles' => ['student', 'coursecreator'],
+                        'testroles' => ['student', 'coursecreator'],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 0,
                         'expectedusers' => [],
@@ -348,7 +348,7 @@ final class participants_search_test extends advanced_testcase {
 
                     // Tests for jointype: NONE.
                     'NONE: No role filter' => (object) [
-                        'roles' => [],
+                        'testroles' => [],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 8,
                         'expectedusers' => [
@@ -363,7 +363,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on student' => (object) [
-                        'roles' => ['student'],
+                        'testroles' => ['student'],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 6,
                         'expectedusers' => [
@@ -376,7 +376,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on student, teacher' => (object) [
-                        'roles' => ['student', 'teacher'],
+                        'testroles' => ['student', 'teacher'],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 4,
                         'expectedusers' => [
@@ -387,7 +387,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on student, manager (category level role))' => (object) [
-                        'roles' => ['student', 'manager'],
+                        'testroles' => ['student', 'manager'],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 5,
                         'expectedusers' => [
@@ -399,7 +399,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on student, coursecreator (not assigned))' => (object) [
-                        'roles' => ['student', 'coursecreator'],
+                        'testroles' => ['student', 'coursecreator'],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 6,
                         'expectedusers' => [
@@ -414,7 +414,7 @@ final class participants_search_test extends advanced_testcase {
                 ],
             ],
             'Users with multiple roles' => (object) [
-                'users' => [
+                'usersdata' => [
                     'a' => [
                         'courseroles' => [
                             'student',
@@ -474,7 +474,7 @@ final class participants_search_test extends advanced_testcase {
                 'expect' => [
                     // Tests for jointype: ANY.
                     'ANY: No role filter' => (object) [
-                        'roles' => [],
+                        'testroles' => [],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 8,
                         'expectedusers' => [
@@ -489,7 +489,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on student' => (object) [
-                        'roles' => ['student'],
+                        'testroles' => ['student'],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 2,
                         'expectedusers' => [
@@ -498,7 +498,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on teacher' => (object) [
-                        'roles' => ['teacher'],
+                        'testroles' => ['teacher'],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 3,
                         'expectedusers' => [
@@ -508,7 +508,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on editingteacher' => (object) [
-                        'roles' => ['editingteacher'],
+                        'testroles' => ['editingteacher'],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 3,
                         'expectedusers' => [
@@ -518,7 +518,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on student, teacher' => (object) [
-                        'roles' => ['student', 'teacher'],
+                        'testroles' => ['student', 'teacher'],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 4,
                         'expectedusers' => [
@@ -529,7 +529,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on teacher, editingteacher' => (object) [
-                        'roles' => ['teacher', 'editingteacher'],
+                        'testroles' => ['teacher', 'editingteacher'],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 5,
                         'expectedusers' => [
@@ -541,7 +541,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on student, manager (category level role)' => (object) [
-                        'roles' => ['student', 'manager'],
+                        'testroles' => ['student', 'manager'],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 3,
                         'expectedusers' => [
@@ -551,7 +551,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on student, coursecreator (not assigned)' => (object) [
-                        'roles' => ['student', 'coursecreator'],
+                        'testroles' => ['student', 'coursecreator'],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 2,
                         'expectedusers' => [
@@ -562,7 +562,7 @@ final class participants_search_test extends advanced_testcase {
 
                     // Tests for jointype: ALL.
                     'ALL: No role filter' => (object) [
-                        'roles' => [],
+                        'testroles' => [],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 8,
                         'expectedusers' => [
@@ -577,7 +577,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ALL: Filter on student' => (object) [
-                        'roles' => ['student'],
+                        'testroles' => ['student'],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 2,
                         'expectedusers' => [
@@ -586,7 +586,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ALL: Filter on teacher' => (object) [
-                        'roles' => ['teacher'],
+                        'testroles' => ['teacher'],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 3,
                         'expectedusers' => [
@@ -596,7 +596,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ALL: Filter on editingteacher' => (object) [
-                        'roles' => ['editingteacher'],
+                        'testroles' => ['editingteacher'],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 3,
                         'expectedusers' => [
@@ -606,7 +606,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ALL: Filter on student, teacher' => (object) [
-                        'roles' => ['student', 'teacher'],
+                        'testroles' => ['student', 'teacher'],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 1,
                         'expectedusers' => [
@@ -614,7 +614,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ALL: Filter on teacher, editingteacher' => (object) [
-                        'roles' => ['teacher', 'editingteacher'],
+                        'testroles' => ['teacher', 'editingteacher'],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 1,
                         'expectedusers' => [
@@ -622,13 +622,13 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ALL: Filter on student, manager (category level role)' => (object) [
-                        'roles' => ['student', 'manager'],
+                        'testroles' => ['student', 'manager'],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 0,
                         'expectedusers' => [],
                     ],
                     'ALL: Filter on student, coursecreator (not assigned)' => (object) [
-                        'roles' => ['student', 'coursecreator'],
+                        'testroles' => ['student', 'coursecreator'],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 0,
                         'expectedusers' => [],
@@ -636,7 +636,7 @@ final class participants_search_test extends advanced_testcase {
 
                     // Tests for jointype: NONE.
                     'NONE: No role filter' => (object) [
-                        'roles' => [],
+                        'testroles' => [],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 8,
                         'expectedusers' => [
@@ -651,7 +651,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on student' => (object) [
-                        'roles' => ['student'],
+                        'testroles' => ['student'],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 6,
                         'expectedusers' => [
@@ -664,7 +664,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on teacher' => (object) [
-                        'roles' => ['teacher'],
+                        'testroles' => ['teacher'],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 5,
                         'expectedusers' => [
@@ -676,7 +676,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on editingteacher' => (object) [
-                        'roles' => ['editingteacher'],
+                        'testroles' => ['editingteacher'],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 5,
                         'expectedusers' => [
@@ -688,7 +688,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on student, teacher' => (object) [
-                        'roles' => ['student', 'teacher'],
+                        'testroles' => ['student', 'teacher'],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 4,
                         'expectedusers' => [
@@ -699,7 +699,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on teacher, editingteacher' => (object) [
-                        'roles' => ['teacher', 'editingteacher'],
+                        'testroles' => ['teacher', 'editingteacher'],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 3,
                         'expectedusers' => [
@@ -709,7 +709,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on student, manager (category level role)' => (object) [
-                        'roles' => ['student', 'manager'],
+                        'testroles' => ['student', 'manager'],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 5,
                         'expectedusers' => [
@@ -721,7 +721,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on student, coursecreator (not assigned)' => (object) [
-                        'roles' => ['student', 'coursecreator'],
+                        'testroles' => ['student', 'coursecreator'],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 6,
                         'expectedusers' => [
@@ -741,8 +741,8 @@ final class participants_search_test extends advanced_testcase {
         foreach ($tests as $testname => $testdata) {
             foreach ($testdata->expect as $expectname => $expectdata) {
                 $finaltests["{$testname} => {$expectname}"] = [
-                    'users' => $testdata->users,
-                    'roles' => $expectdata->roles,
+                    'usersdata' => $testdata->usersdata,
+                    'testroles' => $expectdata->testroles,
                     'jointype' => $expectdata->jointype,
                     'count' => $expectdata->count,
                     'expectedusers' => $expectdata->expectedusers,
@@ -803,7 +803,7 @@ final class participants_search_test extends advanced_testcase {
      */
     public static function country_provider(): array {
         $tests = [
-            'users' => [
+            'usersdata' => [
                 'user1' => 'DE',
                 'user2' => 'ES',
                 'user3' => 'ES',
@@ -910,7 +910,7 @@ final class participants_search_test extends advanced_testcase {
         $finaltests = [];
         foreach ($tests['expects'] as $testname => $test) {
             $finaltests[$testname] = [
-                'users' => $tests['users'],
+                'usersdata' => $tests['usersdata'],
                 'countries' => $test->countries,
                 'jointype' => $test->jointype,
                 'expectedusers' => $test->expectedusers,
@@ -1002,7 +1002,7 @@ final class participants_search_test extends advanced_testcase {
         $tests = [
             // Users where the keyword matches basic user fields such as names and email.
             'Users with basic names' => (object) [
-                'users' => [
+                'usersdata' => [
                     'adam.ant' => [
                         'firstname' => 'Adam',
                         'lastname' => 'Ant',
@@ -1458,7 +1458,7 @@ final class participants_search_test extends advanced_testcase {
         foreach ($tests as $testname => $testdata) {
             foreach ($testdata->expect as $expectname => $expectdata) {
                 $finaltests["{$testname} => {$expectname}"] = [
-                    'users' => $testdata->users,
+                    'usersdata' => $testdata->usersdata,
                     'keywords' => $expectdata->keywords,
                     'jointype' => $expectdata->jointype,
                     'count' => $expectdata->count,
@@ -1499,8 +1499,8 @@ final class participants_search_test extends advanced_testcase {
         foreach ($usersdata as $username => $userdata) {
             $user = $this->getDataGenerator()->create_user(['username' => $username]);
 
-            if (array_key_exists('status', $userdata)) {
-                foreach ($userdata['status'] as $enrolmethod => $status) {
+            if (array_key_exists('statuses', $userdata)) {
+                foreach ($userdata['statuses'] as $enrolmethod => $status) {
                     $this->getDataGenerator()->enrol_user($user->id, $course->id, 'student', $enrolmethod, 0, 0, $status);
                 }
             }
@@ -1550,29 +1550,29 @@ final class participants_search_test extends advanced_testcase {
         $tests = [
             // Users with different statuses and enrolment methods (so multiple statuses are possible for the same user).
             'Users with different enrolment statuses' => (object) [
-                'users' => [
+                'usersdata' => [
                     'a' => [
-                        'status' => [
+                        'statuses' => [
                             'manual' => ENROL_USER_ACTIVE,
                         ]
                     ],
                     'b' => [
-                        'status' => [
+                        'statuses' => [
                             'self' => ENROL_USER_ACTIVE,
                         ]
                     ],
                     'c' => [
-                        'status' => [
+                        'statuses' => [
                             'manual' => ENROL_USER_SUSPENDED,
                         ]
                     ],
                     'd' => [
-                        'status' => [
+                        'statuses' => [
                             'self' => ENROL_USER_SUSPENDED,
                         ]
                     ],
                     'e' => [
-                        'status' => [
+                        'statuses' => [
                             'manual' => ENROL_USER_ACTIVE,
                             'self' => ENROL_USER_SUSPENDED,
                         ]
@@ -1581,7 +1581,7 @@ final class participants_search_test extends advanced_testcase {
                 'expect' => [
                     // Tests for jointype: ANY.
                     'ANY: No filter' => (object) [
-                        'status' => [],
+                        'statuses' => [],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 5,
                         'expectedusers' => [
@@ -1593,7 +1593,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on active only' => (object) [
-                        'status' => [ENROL_USER_ACTIVE],
+                        'statuses' => [ENROL_USER_ACTIVE],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 3,
                         'expectedusers' => [
@@ -1603,7 +1603,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on suspended only' => (object) [
-                        'status' => [ENROL_USER_SUSPENDED],
+                        'statuses' => [ENROL_USER_SUSPENDED],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 3,
                         'expectedusers' => [
@@ -1613,7 +1613,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ANY: Filter on multiple statuses' => (object) [
-                        'status' => [ENROL_USER_ACTIVE, ENROL_USER_SUSPENDED],
+                        'statuses' => [ENROL_USER_ACTIVE, ENROL_USER_SUSPENDED],
                         'jointype' => filter::JOINTYPE_ANY,
                         'count' => 5,
                         'expectedusers' => [
@@ -1627,7 +1627,7 @@ final class participants_search_test extends advanced_testcase {
 
                     // Tests for jointype: ALL.
                     'ALL: No filter' => (object) [
-                       'status' => [],
+                       'statuses' => [],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 5,
                         'expectedusers' => [
@@ -1639,7 +1639,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ALL: Filter on active only' => (object) [
-                        'status' => [ENROL_USER_ACTIVE],
+                        'statuses' => [ENROL_USER_ACTIVE],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 3,
                         'expectedusers' => [
@@ -1649,7 +1649,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ALL: Filter on suspended only' => (object) [
-                        'status' => [ENROL_USER_SUSPENDED],
+                        'statuses' => [ENROL_USER_SUSPENDED],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 3,
                         'expectedusers' => [
@@ -1659,7 +1659,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'ALL: Filter on multiple statuses' => (object) [
-                        'status' => [ENROL_USER_ACTIVE, ENROL_USER_SUSPENDED],
+                        'statuses' => [ENROL_USER_ACTIVE, ENROL_USER_SUSPENDED],
                         'jointype' => filter::JOINTYPE_ALL,
                         'count' => 1,
                         'expectedusers' => [
@@ -1669,7 +1669,7 @@ final class participants_search_test extends advanced_testcase {
 
                     // Tests for jointype: NONE.
                     'NONE: No filter' => (object) [
-                       'status' => [],
+                       'statuses' => [],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 5,
                         'expectedusers' => [
@@ -1681,7 +1681,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on active only' => (object) [
-                        'status' => [ENROL_USER_ACTIVE],
+                        'statuses' => [ENROL_USER_ACTIVE],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 3,
                         'expectedusers' => [
@@ -1691,7 +1691,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on suspended only' => (object) [
-                        'status' => [ENROL_USER_SUSPENDED],
+                        'statuses' => [ENROL_USER_SUSPENDED],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 3,
                         'expectedusers' => [
@@ -1701,7 +1701,7 @@ final class participants_search_test extends advanced_testcase {
                         ],
                     ],
                     'NONE: Filter on multiple statuses' => (object) [
-                        'status' => [ENROL_USER_ACTIVE, ENROL_USER_SUSPENDED],
+                        'statuses' => [ENROL_USER_ACTIVE, ENROL_USER_SUSPENDED],
                         'jointype' => filter::JOINTYPE_NONE,
                         'count' => 0,
                         'expectedusers' => [],
@@ -1714,8 +1714,8 @@ final class participants_search_test extends advanced_testcase {
         foreach ($tests as $testname => $testdata) {
             foreach ($testdata->expect as $expectname => $expectdata) {
                 $finaltests["{$testname} => {$expectname}"] = [
-                    'users' => $testdata->users,
-                    'status' => $expectdata->status,
+                    'usersdata' => $testdata->usersdata,
+                    'statuses' => $expectdata->statuses,
                     'jointype' => $expectdata->jointype,
                     'count' => $expectdata->count,
                     'expectedusers' => $expectdata->expectedusers,
@@ -1807,7 +1807,7 @@ final class participants_search_test extends advanced_testcase {
         $tests = [
             // Users with different enrolment methods.
             'Users with different enrolment methods' => (object) [
-                'users' => [
+                'usersdata' => [
                     'a' => [
                         'enrolmethods' => [
                             'manual',
@@ -1928,7 +1928,7 @@ final class participants_search_test extends advanced_testcase {
         foreach ($tests as $testname => $testdata) {
             foreach ($testdata->expect as $expectname => $expectdata) {
                 $finaltests["{$testname} => {$expectname}"] = [
-                    'users' => $testdata->users,
+                    'usersdata' => $testdata->usersdata,
                     'enrolmethods' => $expectdata->enrolmethods,
                     'jointype' => $expectdata->jointype,
                     'count' => $expectdata->count,
@@ -2037,7 +2037,7 @@ final class participants_search_test extends advanced_testcase {
                     'groupb',
                     'groupc',
                 ],
-                'users' => [
+                'usersdata' => [
                     'a' => [
                         'groups' => ['groupa'],
                     ],
@@ -2247,7 +2247,7 @@ final class participants_search_test extends advanced_testcase {
         foreach ($tests as $testname => $testdata) {
             foreach ($testdata->expect as $expectname => $expectdata) {
                 $finaltests["{$testname} => {$expectname}"] = [
-                    'users' => $testdata->users,
+                    'usersdata' => $testdata->usersdata,
                     'groupsavailable' => $testdata->groupsavailable,
                     'filtergroups' => $expectdata->groups,
                     'jointype' => $expectdata->jointype,
@@ -2378,7 +2378,7 @@ final class participants_search_test extends advanced_testcase {
                     'groupb',
                     'groupc',
                 ],
-                'users' => [
+                'usersdata' => [
                     'a' => [
                         'groups' => ['groupa'],
                     ],
@@ -2648,7 +2648,7 @@ final class participants_search_test extends advanced_testcase {
         foreach ($tests as $testname => $testdata) {
             foreach ($testdata->expect as $expectname => $expectdata) {
                 $finaltests["{$testname} => {$expectname}"] = [
-                    'users' => $testdata->users,
+                    'usersdata' => $testdata->usersdata,
                     'groupsavailable' => $testdata->groupsavailable,
                     'filtergroups' => $expectdata->groups,
                     'jointype' => $expectdata->jointype,
@@ -2736,7 +2736,7 @@ final class participants_search_test extends advanced_testcase {
         $tests = [
             // Users with different last access times.
             'Users in different groups' => (object) [
-                'users' => [
+                'usersdata' => [
                     'a' => [
                         'lastlogin' => '-3 days',
                     ],
@@ -2948,7 +2948,7 @@ final class participants_search_test extends advanced_testcase {
         foreach ($tests as $testname => $testdata) {
             foreach ($testdata->expect as $expectname => $expectdata) {
                 $finaltests["{$testname} => {$expectname}"] = [
-                    'users' => $testdata->users,
+                    'usersdata' => $testdata->usersdata,
                     'accesssince' => $expectdata->accesssince,
                     'jointype' => $expectdata->jointype,
                     'count' => $expectdata->count,
@@ -3148,7 +3148,7 @@ final class participants_search_test extends advanced_testcase {
                     'groupb',
                     'groupc',
                 ],
-                'users' => [
+                'usersdata' => [
                     'adam.ant' => [
                         'firstname' => 'Adam',
                         'lastname' => 'Ant',
@@ -3498,7 +3498,7 @@ final class participants_search_test extends advanced_testcase {
         foreach ($tests as $testname => $testdata) {
             foreach ($testdata->expect as $expectname => $expectdata) {
                 $finaltests["{$testname} => {$expectname}"] = [
-                    'users' => $testdata->users,
+                    'usersdata' => $testdata->usersdata,
                     'filterdata' => $expectdata->filterdata,
                     'groupsavailable' => $testdata->groupsavailable,
                     'jointype' => $expectdata->jointype,