diff --git a/module/VuFind/src/VuFind/Auth/ILS.php b/module/VuFind/src/VuFind/Auth/ILS.php
index b20b21f78e9b7ee7f3bac9ffc7afc27fe317cbfa..f86c1c8ba4e330862420b491ad23b7f7e3c4441a 100644
--- a/module/VuFind/src/VuFind/Auth/ILS.php
+++ b/module/VuFind/src/VuFind/Auth/ILS.php
@@ -86,7 +86,7 @@ class ILS extends AbstractBase
      * Get the ILS driver associated with this object (or load the default from
      * the service manager.
      *
-     * @return \VuFind\ILS\Driver\DriverInterface
+     * @return \VuFind\ILS\Connection
      */
     public function getCatalog()
     {
diff --git a/module/VuFind/src/VuFind/Cart.php b/module/VuFind/src/VuFind/Cart.php
index a881d3cffb1851cc24b13238e48cd8621f6dd839..754eb072ca178f231a1a220966c966e990a96739 100644
--- a/module/VuFind/src/VuFind/Cart.php
+++ b/module/VuFind/src/VuFind/Cart.php
@@ -202,7 +202,7 @@ class Cart
     /**
      * Get cart size.
      *
-     * @return string The maximum cart size
+     * @return int The maximum cart size
      */
     public function getMaxSize()
     {
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/CssPreCompilerTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/CssPreCompilerTest.php
index 895aec147a8f22b4fe3d8129787e9a0e7a44b223..d500cd0d0f54ab1b7a6a750d76073ea280934861 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/CssPreCompilerTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/CssPreCompilerTest.php
@@ -58,7 +58,7 @@ class CssPreCompilerTest extends Unit\TestCase
     /**
      * Data Provider for extensions and classes
      *
-     * @return void
+     * @return array
      */
     public static function extClassProvider()
     {
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php
index 67a48c8f07c51b5b31b50213fffc8c21e5d6e010..faabc5051c12761cc97864c5badadb5dda18c5e2 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeCompilerTest.php
@@ -232,7 +232,7 @@ class ThemeCompilerTest extends Unit\TestCase
     /**
      * Get a test ThemeCompiler object
      *
-     * @return ThemeInfo
+     * @return ThemeCompiler
      */
     protected function getThemeCompiler()
     {
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/HeadThemeResourcesTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/HeadThemeResourcesTest.php
index b13e2aab33e886945757ecdfcd245b4b02a24410..718364dd1c4aae4c5e04d0bc1db0de3c160a15b6 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/HeadThemeResourcesTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/HeadThemeResourcesTest.php
@@ -108,7 +108,7 @@ class HeadThemeResourcesTest extends \VuFindTest\Unit\TestCase
     /**
      * Get a fake HeadMeta helper.
      *
-     * @return \Laminas\View\Helper\HeadMeta
+     * @return \PHPUnit\Framework\MockObject\MockObject&\VuFindTheme\View\Helper\HeadMeta
      */
     protected function getMockHeadMeta()
     {
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/ParentTemplateTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/ParentTemplateTest.php
index f29858f5f05e0756529d1ce80dbcade060230d0e..585aa6e25dfaebfb9d397bcb5fc6a15f29a6c154 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/ParentTemplateTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/ParentTemplateTest.php
@@ -27,7 +27,6 @@
  */
 namespace VuFindTest\View\Helper;
 
-use VuFindTheme\ResourceContainer;
 use VuFindTheme\View\Helper\ParentTemplate;
 
 /**
@@ -61,7 +60,7 @@ class ParentTemplateTest extends \VuFindTest\Unit\TestCase
     /**
      * Get a populated resource container for testing.
      *
-     * @return ResourceContainer
+     * @return ParentTemplate
      */
     protected function getHelper($stack)
     {
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/TemplatePathTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/TemplatePathTest.php
index 3c42173fe4d79f736f2f7f2b46e6e2b836ed40cd..869c97395bb05905d2ec8e34dba083f9a89910cd 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/TemplatePathTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/View/Helper/TemplatePathTest.php
@@ -27,7 +27,6 @@
  */
 namespace VuFindTest\View\Helper;
 
-use VuFindTheme\ResourceContainer;
 use VuFindTheme\View\Helper\TemplatePath;
 
 /**
@@ -61,7 +60,7 @@ class TemplatePathTest extends \VuFindTest\Unit\TestCase
     /**
      * Get a populated resource container for testing.
      *
-     * @return ResourceContainer
+     * @return TemplatePath
      */
     protected function getHelper()
     {