diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
index 43b1ecc..14229a0 100644
--- a/.github/workflows/moodle-ci.yml
+++ b/.github/workflows/moodle-ci.yml
@@ -8,7 +8,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:14
+        image: postgres:16
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -31,23 +31,23 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php: '8.2'
+          - php: '8.3'
             moodle-branch: 'main'
             database: 'mariadb'
-          - php: '8.2'
+          - php: '8.3'
             moodle-branch: 'main'
             database: 'pgsql'
-          - php: '8.1'
-            moodle-branch: 'MOODLE_405_STABLE'
-            database: 'mariadb'
-          - php: '8.1'
-            moodle-branch: 'MOODLE_404_STABLE'
+          - php: '8.3'
+            moodle-branch: 'MOODLE_501_STABLE'
+            database: 'pgsql'
+          - php: '8.2'
+            moodle-branch: 'MOODLE_501_STABLE'
             database: 'mariadb'
+          - php: '8.2'
+            moodle-branch: 'MOODLE_405_STABLE'
+            database: 'pgsql'
           - php: '8.1'
-            moodle-branch: 'MOODLE_403_STABLE'
-            database: 'mariadb'
-          - php: '8.0'
-            moodle-branch: 'MOODLE_401_STABLE'
+            moodle-branch: 'MOODLE_405_STABLE'
             database: 'mariadb'
 
     steps:
diff --git a/tests/freezecontext_test.php b/tests/freezecontext_test.php
index 29382a6..37dfc57 100644
--- a/tests/freezecontext_test.php
+++ b/tests/freezecontext_test.php
@@ -18,6 +18,8 @@
 
 use block_lifecycle\task\freezecontext;
 use context_course;
+use core_customfield\field_controller;
+use stdClass;
 
 /**
  * Unit tests for block_lifecycle's freezecontext class.
@@ -28,6 +30,12 @@
  * @author     Alex Yeung <k.yeung@ucl.ac.uk>
  */
 final class freezecontext_test extends \advanced_testcase {
+    /** @var field_controller field1 */
+    private field_controller $field1;
+
+    /** @var stdClass course */
+    private stdClass $course;
+
     protected function setUp(): void {
         parent::setUp();
         $this->resetAfterTest();
diff --git a/tests/manager_test.php b/tests/manager_test.php
index b44bc0c..aec3a82 100644
--- a/tests/manager_test.php
+++ b/tests/manager_test.php
@@ -20,6 +20,7 @@
 use context_course;
 use core_customfield\field_controller;
 use moodle_exception;
+use stdClass;
 
 /**
  * Unit tests for block_lifecycle's manager class.
@@ -31,12 +32,57 @@
  */
 final class manager_test extends \advanced_testcase {
 
+    /** @var field_controller field1 */
+    private field_controller $field1;
+
     /** @var field_controller field2 */
     private field_controller $field2;
 
     /** @var array years - Contains the year strings of past year, current year and future year */
     private array $years;
 
+    /** @var stdClass course1 */
+    private stdClass $course1;
+
+    /** @var stdClass course1 */
+    private stdClass $course2;
+
+    /** @var stdClass course1 */
+    private stdClass $course3;
+
+    /** @var stdClass course1 */
+    private stdClass $course4;
+
+    /** @var stdClass course1 */
+    private stdClass $courseshouldbefrozen;
+
+    /** @var stdClass course1 */
+    private stdClass $coursewithoutacademicyear;
+
+    /** @var stdClass course1 */
+    private stdClass $coursewithfutureenddate;
+
+    /** @var stdClass course1 */
+    private stdClass $coursewithoutenddate;
+
+    /** @var int teacherroleid */
+    private int $teacherroleid;
+
+    /** @var int studentroleid */
+    private int $studentroleid;
+
+    /** @var stdClass user1 */
+    private stdClass $user1;
+
+    /** @var stdClass user2 */
+    private stdClass $user2;
+
+    /** @var stdClass preferences */
+    public stdClass $preferences;
+
+    /** @var int preferencesrecordid */
+    public int $preferencesrecordid;
+
     protected function setUp(): void {
         global $DB;
         parent::setUp();
@@ -93,7 +139,7 @@ protected function setUp(): void {
         $this->user2 = $dg->create_user();
 
         // Create block_lifecyce record for $this->courseshouldbefrozen.
-        $this->preferences = new \stdClass();
+        $this->preferences = new stdClass();
         $this->preferences->courseid = $this->courseshouldbefrozen->id;
         $this->preferences->freezeexcluded = 0;
         $this->preferences->freezedate = strtotime(date('Y-m-d') . ' -1 day');