diff --git a/classes/local/store/s3/client.php b/classes/local/store/s3/client.php
index 31288859..12ae1de0 100644
--- a/classes/local/store/s3/client.php
+++ b/classes/local/store/s3/client.php
@@ -48,6 +48,9 @@ class client extends object_client_base {
     protected $bucket;
     private $signingmethod;
 
+    /** @var string Prefix for bucket keys */
+    protected $bucketkeyprefix;
+
     public function __construct($config) {
         global $CFG;
         $this->autoloader = $CFG->dirroot . '/local/aws/sdk/aws-autoloader.php';
diff --git a/classes/tests/testcase.php b/classes/tests/testcase.php
index 4b39f5a6..0d553dbb 100644
--- a/classes/tests/testcase.php
+++ b/classes/tests/testcase.php
@@ -27,6 +27,12 @@
 
 abstract class testcase extends \advanced_testcase {
 
+    /** @var test_file_system Filesystem */
+    public $filesystem;
+
+    /** @var \tool_objectfs\log\objectfs_logger Logger */
+    public $logger;
+
     protected function setUp(): void {
         global $CFG;
         $CFG->alternative_file_system_class = '\\tool_objectfs\\tests\\test_file_system';
diff --git a/tests/local/object_manipulator/checker_test.php b/tests/local/object_manipulator/checker_test.php
index 64f7866a..32385996 100644
--- a/tests/local/object_manipulator/checker_test.php
+++ b/tests/local/object_manipulator/checker_test.php
@@ -28,6 +28,9 @@ class checker_test extends \tool_objectfs\tests\testcase {
     /** @var string $manipulator */
     protected $manipulator = checker::class;
 
+    /** @var checker Checker */
+    protected $checker;
+
     protected function setUp(): void {
         parent::setUp();
         $config = manager::get_objectfs_config();
diff --git a/tests/local/object_manipulator/deleter_test.php b/tests/local/object_manipulator/deleter_test.php
index 2e1726f9..2588d999 100644
--- a/tests/local/object_manipulator/deleter_test.php
+++ b/tests/local/object_manipulator/deleter_test.php
@@ -28,6 +28,9 @@ class deleter_test extends \tool_objectfs\tests\testcase {
     /** @var string $manipulator */
     protected $manipulator = deleter::class;
 
+    /** @var deleter Deleter object */
+    protected $deleter;
+
     protected function setUp(): void {
         parent::setUp();
         $config = manager::get_objectfs_config();
diff --git a/tests/local/object_manipulator/orphaner_test.php b/tests/local/object_manipulator/orphaner_test.php
index a692eac9..e5f7a04b 100644
--- a/tests/local/object_manipulator/orphaner_test.php
+++ b/tests/local/object_manipulator/orphaner_test.php
@@ -29,6 +29,9 @@ class orphaner_test extends \tool_objectfs\tests\testcase {
     /** @var string $manipulator */
     protected $manipulator = orphaner::class;
 
+    /** @var orphaner Orphaner object */
+    protected $orphaner;
+
     protected function setUp(): void {
         parent::setUp();
         $config = manager::get_objectfs_config();
diff --git a/tests/local/object_manipulator/puller_test.php b/tests/local/object_manipulator/puller_test.php
index bf5986c4..04b6e5da 100644
--- a/tests/local/object_manipulator/puller_test.php
+++ b/tests/local/object_manipulator/puller_test.php
@@ -28,6 +28,9 @@ class puller_test extends \tool_objectfs\tests\testcase {
     /** @var string $manipulator */
     protected $manipulator = puller::class;
 
+    /** @var puller Puller object */
+    protected $puller;
+
     protected function setUp(): void {
         parent::setUp();
         $config = manager::get_objectfs_config();
diff --git a/tests/local/object_manipulator/pusher_test.php b/tests/local/object_manipulator/pusher_test.php
index d306f79a..e7c1f3db 100644
--- a/tests/local/object_manipulator/pusher_test.php
+++ b/tests/local/object_manipulator/pusher_test.php
@@ -29,6 +29,9 @@ class pusher_test extends \tool_objectfs\tests\testcase {
     /** @var string $manipulator */
     protected $manipulator = pusher::class;
 
+    /** @var pusher Pusher object */
+    protected $pusher;
+
     protected function setUp(): void {
         parent::setUp();
         $config = manager::get_objectfs_config();
diff --git a/tests/local/object_manipulator/recoverer_test.php b/tests/local/object_manipulator/recoverer_test.php
index 43f68526..8a4ec5ba 100644
--- a/tests/local/object_manipulator/recoverer_test.php
+++ b/tests/local/object_manipulator/recoverer_test.php
@@ -26,6 +26,12 @@
  */
 class recoverer_test extends \tool_objectfs\tests\testcase {
 
+    /** @var candidates_finder Candidates finder object */
+    protected $candidatesfinder;
+
+    /** @var recoverer Recoverer object */
+    protected $recoverer;
+
     protected function setUp(): void {
         parent::setUp();
         $config = manager::get_objectfs_config();