diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ChoiceAuthTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ChoiceAuthTest.php
index 35507d0a140bdbf862ecc70b808c6fb4d2372fbe..2e1befc3650ea8a592c88a4fe93754fdbb9c1f09 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ChoiceAuthTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ChoiceAuthTest.php
@@ -45,6 +45,7 @@ class ChoiceAuthTest extends \VuFindTest\Unit\TestCase
      * Test config validation
      *
      * @return void
+     *
      * @expectedException \VuFind\Exception\Auth
      * @expectedExceptionMessage One or more ChoiceAuth parameters are missing.
      */
@@ -58,6 +59,7 @@ class ChoiceAuthTest extends \VuFindTest\Unit\TestCase
      * Test default getPluginManager behavior
      *
      * @return void
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Plugin manager missing.
      */
@@ -174,6 +176,7 @@ class ChoiceAuthTest extends \VuFindTest\Unit\TestCase
      * Test an illegal auth method
      *
      * @return void
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Illegal setting: foo
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/DatabaseUnitTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/DatabaseUnitTest.php
index 113d1a0b89b2d71ae14022e6ca406eff3540e459..634b239618fddac2ef4a20dd1ddfe0637d2b7115 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/DatabaseUnitTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/DatabaseUnitTest.php
@@ -43,6 +43,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase
      * Test validation of empty create request.
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Auth
      * @expectedExceptionMessage Username cannot be blank
      */
@@ -56,6 +57,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase
      * Test validation of create request w/blank password.
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Auth
      * @expectedExceptionMessage Password cannot be blank
      */
@@ -71,6 +73,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase
      * Test validation of create request w/mismatched passwords.
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Auth
      * @expectedExceptionMessage Passwords do not match
      */
@@ -86,6 +89,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase
      * Test missing table manager.
      *
      * @return void
+     *
      * @expectedException Exception
      * @expectedExceptionMessage DB table manager missing.
      */
@@ -99,6 +103,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase
      * Test creation w/duplicate email.
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Auth
      * @expectedExceptionMessage That email address is already used
      */
@@ -124,6 +129,7 @@ class DatabaseUnitTest extends \VuFindTest\Unit\DbTestCase
      * Test creation w/duplicate username.
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Auth
      * @expectedExceptionMessage That username is already taken
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ManagerTest.php
index 269c956f356db7052219e708b585c15ac23bbe12..605e60b4656419996c21c7c362e108b1e5502e46 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/ManagerTest.php
@@ -195,6 +195,7 @@ class ManagerTest extends \VuFindTest\Unit\TestCase
      * Test security features of switching between auth options (part 2).
      *
      * @return void
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Illegal authentication method: MultiILS
      */
@@ -332,6 +333,7 @@ class ManagerTest extends \VuFindTest\Unit\TestCase
      * Test unsuccessful login (\VuFind\Exception\PasswordSecurity)
      *
      * @return void
+     *
      * @expectedException \VuFind\Exception\PasswordSecurity
      * @expectedExceptionMessage Boom
      */
@@ -350,6 +352,7 @@ class ManagerTest extends \VuFindTest\Unit\TestCase
      * Test unsuccessful login (\VuFind\Exception\Auth)
      *
      * @return void
+     *
      * @expectedException \VuFind\Exception\Auth
      * @expectedExceptionMessage Blam
      */
@@ -368,6 +371,7 @@ class ManagerTest extends \VuFindTest\Unit\TestCase
      * Test that unexpected exceptions get mapped to technical errors.
      *
      * @return void
+     *
      * @expectedException \VuFind\Exception\Auth
      * @expectedExceptionMessage authentication_error_technical
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/PluginManagerTest.php
index 882b77f33ffb82b634cdaa154de70836d31bef13..5e713e201f7d1b685d36dae59d876500efb0ee45 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Auth\AbstractBase
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/PluginManagerTest.php
index 5fc05ce7145d2a71aa3ed015d65aad812a944e0a..d50e417cd54f56fe2aee88fab5db426ca76103ef 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Autocomplete\AutocompleteInterface
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/TagTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/TagTest.php
index 887a8e8faf2bb1d4eb95794dc58478de8756737c..34d71f2b346f77194f87660b156258b8a4b15237 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/TagTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Autocomplete/TagTest.php
@@ -43,6 +43,7 @@ class TagTest extends \VuFindTest\Unit\DbTestCase
      * Test that missing plugin manager causes exception.
      *
      * @return void
+     *
      * @expectedException Exception
      * @expectedExceptionMessage DB table manager missing.
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/AuthorNotes/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/AuthorNotes/PluginManagerTest.php
index e9eeb37364160d1bfe4150f0a40920fa263738cd..e04eddd576eff8a47fa73c5fdfad97f79353be72 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/AuthorNotes/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/AuthorNotes/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Content\AbstractBase
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/PluginManagerTest.php
index 7dd4b2a4e4e516522c3082981362319a1af96f0d..0ecd0db4e03c74d8695620e230c5491068fb27bd 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Covers/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Content\AbstractCover
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Excerpts/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Excerpts/PluginManagerTest.php
index 53d652434fb9e5c8b67c65dabcb1cdcb5de92062..06584f951bf04fae80a5e9e4cebe6d6c540f132b 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Excerpts/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Excerpts/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Content\AbstractBase
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/PluginManagerTest.php
index 2fee991c379181855b4f49989e77fb42403c84d2..d69ef24be5349b3d75fa6349162e0f55b454e480 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Content\Loader
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Reviews/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Reviews/PluginManagerTest.php
index 1cb4294d5cecb3c9a08547624d129e2fc8c2794a..8c091757d09ad4314fda7dc4487bb61a0568f5e7 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Reviews/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Content/Reviews/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Content\AbstractBase
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Cover/LoaderTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Cover/LoaderTest.php
index 61dcb4186f5e6175a945a2491a86238e95886c3f..0564f62138528869d0c6f3266b12db848518b341 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Cover/LoaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Cover/LoaderTest.php
@@ -53,6 +53,7 @@ class LoaderTest extends \VuFindTest\Unit\TestCase
      * Test that failure to load even the baseline image causes an exception.
      *
      * @return void
+     *
      * @expectedException Exception
      * @expectedExceptionMessage Could not load default fail image.
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Db/Table/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Db/Table/PluginManagerTest.php
index 646ef7e3b33dec8ed71fd40d43672a8ff94cd9d6..e52e2024201093a129e83de9ee97480a92736dbf 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Db/Table/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Db/Table/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Db\Table\Gateway
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php
index c3284103ce2eae3421d5027c6fcabae2840d00ab..4c8a2f80c8f478a572c54ab30bb2282c3f6c056f 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Harvester/OAITest.php
@@ -227,6 +227,7 @@ class OAITest extends \VuFindTest\Unit\TestCase
      * Test HTTP error detection.
      *
      * @return void
+     *
      * @expectedException Exception
      * @expectedExceptionMessage HTTP Error
      */
@@ -250,6 +251,7 @@ class OAITest extends \VuFindTest\Unit\TestCase
      * Test that a missing URL throws an exception.
      *
      * @return void
+     *
      * @expectedException Exception
      * @expectedExceptionMessage Missing base URL for test.
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/Driver/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/Driver/PluginManagerTest.php
index f52ed5e34439c3160fa05d7ccac0b2736477b0fa..9f25152fdf85b57f493b1f8a86b3acb46f780534 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/Driver/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/Driver/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Hierarchy\Driver\AbstractBase
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeDataSource/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeDataSource/PluginManagerTest.php
index 2208cf93110ee700736304dd0706de561bc2dd25..81a869accea834ab827caa20b859a11f63dfb448 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeDataSource/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeDataSource/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Hierarchy\TreeDataSource\AbstractBase
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeRenderer/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeRenderer/PluginManagerTest.php
index 09999d00666176467cc9273dd6aca148ce50f4f5..8ee9d2a435676f896d7a5bcfba483ddc4596ff58 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeRenderer/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Hierarchy/TreeRenderer/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Hierarchy\TreeRenderer\AbstractBase
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/I18n/Translator/Loader/ExtendedIniTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/I18n/Translator/Loader/ExtendedIniTest.php
index faf05c3e65c561da688f280936ee190462aa11cb..9afec31252fd6f2fca309a55ba7085a6ca4c8701 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/I18n/Translator/Loader/ExtendedIniTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/I18n/Translator/Loader/ExtendedIniTest.php
@@ -156,6 +156,7 @@ class ExtendedIniTest extends \VuFindTest\Unit\TestCase
      * Test missing path stack.
      *
      * @return void
+     *
      * @expectedException Zend\I18n\Exception\InvalidArgumentException
      * @expectedExceptionMessage Ini file 'en.ini' not found
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PluginManagerTest.php
index 685254d37878cb39d395c00ed4990247f2e5750d..6a14d84f459ef3c49c884e9b0cdce71b3d2d86f9 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\ILS\Driver\DriverInterface
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Mailer/MailerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Mailer/MailerTest.php
index 0da2c3a1b49e67251672f8aae8ead982579fac84..772f009adde350bbd2e738567e1d4e788a8f6306 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Mailer/MailerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Mailer/MailerTest.php
@@ -62,6 +62,7 @@ class MailerTest extends \VuFindTest\Unit\TestCase
      * Test bad to address.
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Mail
      * @expectedExceptionMessage Invalid Recipient Email Address
      */
@@ -76,6 +77,7 @@ class MailerTest extends \VuFindTest\Unit\TestCase
      * Test empty to address.
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Mail
      * @expectedExceptionMessage Invalid Recipient Email Address
      */
@@ -90,6 +92,7 @@ class MailerTest extends \VuFindTest\Unit\TestCase
      * Test that we only accept one recipient by default
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Mail
      * @expectedExceptionMessage Too Many Email Recipients
      */
@@ -104,6 +107,7 @@ class MailerTest extends \VuFindTest\Unit\TestCase
      * Test bad from address.
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Mail
      * @expectedExceptionMessage Invalid Sender Email Address
      */
@@ -118,6 +122,7 @@ class MailerTest extends \VuFindTest\Unit\TestCase
      * Test transport exception.
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Mail
      * @expectedExceptionMessage Boom
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/QRCode/LoaderTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/QRCode/LoaderTest.php
index 363b9acdf504953f2ec5dabbddcbffcff85af1d7..e8c846ff29200fde53cfac3f7c680f2031865e96 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/QRCode/LoaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/QRCode/LoaderTest.php
@@ -52,6 +52,7 @@ class LoaderTest extends \VuFindTest\Unit\TestCase
      * Test that failure to load even the baseline image causes an exception.
      *
      * @return void
+     *
      * @expectedException Exception
      * @expectedExceptionMessage Could not load default fail image.
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/PluginManagerTest.php
index 79a1a44858f9045f5818f0b07085f22c8c21e479..7a031823ffc79cfb28e4577483a5ce75b558ff53 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Recommend\RecommendInterface
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php
index 7947e3e32ba4ee66d79b5064d8fe7989c539f19e..231ff2a6f47da9fa11fe2f171eb6aacfb73f8b13 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Recommend/SideFacetsTest.php
@@ -75,6 +75,7 @@ class SideFacetsTest extends \VuFindTest\Unit\TestCase
      * Test missing hierarchical facet helper
      *
      * @return void
+     *
      * @expectedException Exception
      * @expectedExceptionMessage VuFind\Recommend\SideFacets: hierarchical facet helper unavailable
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Record/LoaderTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Record/LoaderTest.php
index 07e78f67dd54a7e76da852655a6ee2df814149e7..3478a91304d5ef867b4aa51054d7db224014e66f 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Record/LoaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Record/LoaderTest.php
@@ -50,6 +50,7 @@ class LoaderTest extends TestCase
      * Test exception for missing record.
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\RecordMissing
      * @expectedExceptionMessage Record VuFind:test does not exist.
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/RecordDriver/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/RecordDriver/PluginManagerTest.php
index 0e71fd8daa7c15a9aa072e363da05916cc4d07d6..c8a840fc4c1b1f1680df320cde5b7ec4b139597a 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/RecordDriver/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/RecordDriver/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\RecordDriver\AbstractBase
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/RecordTab/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/RecordTab/PluginManagerTest.php
index 8a4c85b19119d140564f1cffeb21c20c998c9cb7..f578c59e4248097753e11738c80ddcd75afa7e47 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/RecordTab/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/RecordTab/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\RecordTab\TabInterface
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Related/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Related/PluginManagerTest.php
index 1fd4b3e34ff09b57876c50e6b1aff040b8ba082a..ed598804f01e80f20e592b49efa15b299739e68c 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Related/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Related/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Related\RelatedInterface
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Reserves/CsvReaderTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Reserves/CsvReaderTest.php
index c2f46aa1eaded093af0153388a704308e735f10f..ce9640c5def73f1bc8e0ce112f195940c1fe2021 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Reserves/CsvReaderTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Reserves/CsvReaderTest.php
@@ -135,6 +135,7 @@ class CsvReaderTest extends \VuFindTest\Unit\TestCase
      * Test loading an empty file.
      *
      * @return void
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find valid data. Details:
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/PluginManagerTest.php
index 16ce53ad9d75f18138f1386d116c4ad9e98573c7..23659e16dfb8fad94ba95596008b1031c8af1689 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Resolver/Driver/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Resolver\Driver\DriverInterface
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/PluginManagerTest.php
index 7c5a2c16d64ea40aa5c64245b91dab37e5a46d60..093633390d454b7c47acb2b4ba1056dd459fbb4d 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Role/PermissionProvider/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Role\PermissionProvider\PermissionProviderInterface
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/SMS/ClickatellTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/SMS/ClickatellTest.php
index 524fdb5e9d6abdb25d8cda032c0b1a2fef18b660..d2dfe5a17c1a8e02bc03c7c7799399b4fe2dd6d1 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/SMS/ClickatellTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/SMS/ClickatellTest.php
@@ -91,6 +91,7 @@ class ClickatellTest extends \VuFindTest\Unit\TestCase
      * Test unexpected response
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Mail
      * @expectedExceptionMessage badbadbad
      */
@@ -112,6 +113,7 @@ class ClickatellTest extends \VuFindTest\Unit\TestCase
      * Test unsuccessful query
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Mail
      * @expectedExceptionMessage Problem sending text.
      */
@@ -132,6 +134,7 @@ class ClickatellTest extends \VuFindTest\Unit\TestCase
      * Test an exception in the mail client
      *
      * @return void
+     *
      * @expectedException VuFind\Exception\Mail
      * @expectedExceptionMessage Foo
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php
index e2dfa34a8538025819674715fa01342e13f5acb8..ad34a6d08375ceec1a18a238e22fdc84d01abd1e 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/BackendManagerTest.php
@@ -47,10 +47,10 @@ class BackendManagerTest extends TestCase
     /**
      * Test that get() throws on a non-object.
      *
+     * @return void
+     *
      * @expectedException UnexpectedValueException
      * @expectedExceptionMessage Expected backend registry to return object
-     *
-     * @return void
      */
     public function testGetThrowsOnNonObject()
     {
@@ -65,10 +65,10 @@ class BackendManagerTest extends TestCase
     /**
      * Test that get() throws on a non-backend.
      *
+     * @return void
+     *
      * @expectedException UnexpectedValueException
      * @expectedExceptionMessage does not implement the expected interface
-     *
-     * @return void
      */
     public function testGetThrowsOnNonBackend()
     {
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Options/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Options/PluginManagerTest.php
index 1be1d05a6e0d09fd24d032ece2efc76de7fa1b58..e2885ff0446dbadac588e559e54a83a12659c9f1 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Options/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Options/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Search\Base\Options
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Params/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Params/PluginManagerTest.php
index 58430033f88ffa530a099376643ad1a836f8ec24..24386016d94f9f8d74e663715131ed6fa0b732cc 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Params/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Params/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Search\Base\Params
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Results/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Results/PluginManagerTest.php
index b606e953b061d50ed211cd36a3b98ef6e467815f..cfafe8d6baf50782a01671f55e56bfd34aeb4352 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Results/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Results/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Search\Base\Results
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php
index 8100669944ad0815b793b2c00e07e858651ed92a..d584e3cdefa8041c9ef1e202501c8aad8ee30caa 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/SpellingProcessorTest.php
@@ -403,6 +403,7 @@ class SpellingProcessorTest extends TestCase
      * Test detection of bad Solr response format.
      *
      * @return void
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Unexpected suggestion format; spellcheck.extendedResults must be set to true.
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Session/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Session/PluginManagerTest.php
index fe1467c230cee2e13003000084c25807375eee53..5bb81dade21ac92e8fad8e6a1611dfb05a0818c8 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Session/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Session/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to Zend\Session\SaveHandler\SaveHandlerInterface
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Statistics/Driver/PluginManagerTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Statistics/Driver/PluginManagerTest.php
index c5ec8947d219e7095ac634843ee559a3374c63bc..582311a5c6245921e938450848e042843dc1ccb3 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Statistics/Driver/PluginManagerTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Statistics/Driver/PluginManagerTest.php
@@ -54,6 +54,7 @@ class PluginManagerTest extends \VuFindTest\Unit\TestCase
      * Test expected interface.
      *
      * @return void
+     *
      * @expectedException Zend\ServiceManager\Exception\RuntimeException
      * @expectedExceptionMessage Plugin ArrayObject does not belong to VuFind\Statistics\Driver\AbstractBase
      */
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php
index 0ab826e016ba2464b4b33fcba8c039b21b7112fa..0139536e0067a789ae42923e7390efecba77b3e7 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php
@@ -43,6 +43,7 @@ class RecordTest extends \PHPUnit_Framework_TestCase
      * Test attempting to display a template that does not exist.
      *
      * @return void
+     *
      * @expectedException Zend\View\Exception\RuntimeException
      * @expectedExceptionMessage Cannot find core.phtml template for record driver: VuFind\RecordDriver\SolrMarc
      */
@@ -449,6 +450,7 @@ class RecordTest extends \PHPUnit_Framework_TestCase
      * Test getLinkDetails with invalid details
      *
      * @return void
+     *
      * @expectedException Exception
      * @expectedExceptionMessage Invalid URL array.
      */
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/Response/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/Response/RecordCollectionFactoryTest.php
index 1ad5b45b588c3f46ba9642825e2fea29c30b6a68..b43e63d4ebee3af631faf6a29fecea0901478ebe 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/Response/RecordCollectionFactoryTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/Response/RecordCollectionFactoryTest.php
@@ -45,9 +45,10 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase
     /**
      * Test constructor exceptions.
      *
+     * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Record factory must be callable.
-     * @return void
      */
     public function testConstructorRequiresFactoryFunction()
     {
@@ -57,9 +58,10 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase
     /**
      * Test constructor exceptions.
      *
+     * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Unexpected type of value: Expected array, got string
-     * @return void
      */
     public function testFactoryRequiresArray()
     {
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/Response/XML/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/Response/XML/RecordCollectionFactoryTest.php
index 0a35b5b02233fadd0d614cf2b3dfdd86ae20fedc..93f8861dc60c1c4ca0479a1a4b8c7da80998541d 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/Response/XML/RecordCollectionFactoryTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/Response/XML/RecordCollectionFactoryTest.php
@@ -45,9 +45,10 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase
     /**
      * Test constructor exception.
      *
+     * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Record factory must be callable.
-     * @return void
      */
     public function testConstructorRequiresValidFactoryFunction()
     {
@@ -58,6 +59,7 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase
      * Test invalid input.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Unexpected type of value: Expected array, got string
      */
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php
index bec7138c4e9d978ba7c72bf3f4a5b88efeefb400..2466e8075e0c0fcb37e956289dfe518cb7ea6ea0 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php
@@ -53,6 +53,7 @@ class BackendTest extends \VuFindTest\Unit\TestCase
      * Test retrieving a record (not supported).
      *
      * @return void
+     *
      * @expectedException        \Exception
      * @expectedExceptionMessage retrieve() not supported by LibGuides.
      */
@@ -142,6 +143,7 @@ class BackendTest extends \VuFindTest\Unit\TestCase
      * Test search exception handling.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      */
     public function testSearchWrapsLibGuidesException()
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/QueryBuilderTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/QueryBuilderTest.php
index 5f0f660de94e80126472b2a679a30c3d5ead7f73..9c4ba456e0f890502ebf78190a6e85a22a05492f 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/QueryBuilderTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/QueryBuilderTest.php
@@ -62,6 +62,7 @@ class QueryBuilderTest extends PHPUnit_Framework_TestCase
      * Test advanced query parsing (not currently supported)
      *
      * @return void
+     *
      * @expectedException        \Exception
      * @expectedExceptionMessage Advanced search not supported.
      */
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/Response/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/Response/RecordCollectionFactoryTest.php
index 2c313e69790e1f45b0460b0f93eb863c2175e0de..8d8bf8c395ff85cb7ea49233d0ca9f8c1213f272 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/Response/RecordCollectionFactoryTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/Response/RecordCollectionFactoryTest.php
@@ -59,6 +59,7 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase
      * Test invalid input.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Unexpected type of value: Expected array, got string
      */
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php
index c6aa10e9ff049bf541c8e84ea4afd35ddfaa286e..4aa672c98bf42c8faca167d42a1291c9165670e6 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php
@@ -132,6 +132,7 @@ class BackendTest extends \VuFindTest\Unit\TestCase
      * Test search exception handling.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      */
     public function testSearchWrapsPrimoException()
@@ -148,6 +149,7 @@ class BackendTest extends \VuFindTest\Unit\TestCase
      * Test retrieve exception handling.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      */
     public function testRetrieveWrapsPrimoException()
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/ConnectorTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/ConnectorTest.php
index f0318683ed013931746f68fd53edfee5c9b7424e..316ca772b5d3919f70e28564371a54dc447100b3 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/ConnectorTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/ConnectorTest.php
@@ -124,6 +124,7 @@ class ConnectorTest extends PHPUnit_Framework_TestCase
      * status.
      *
      * @return void
+     *
      * @expectedException        \Exception
      * @expectedExceptionMessage Unauthorized access
      */
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/Response/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/Response/RecordCollectionFactoryTest.php
index fa4b94b7cf34802641e448dec2a09944703cf531..ef547f0995fcd3ba8f4bad0a03bf026f1c3d74e8 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/Response/RecordCollectionFactoryTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/Response/RecordCollectionFactoryTest.php
@@ -45,9 +45,10 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase
     /**
      * Test constructor exception.
      *
+     * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Record factory must be callable.
-     * @return void
      */
     public function testConstructorRequiresValidFactoryFunction()
     {
@@ -58,6 +59,7 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase
      * Test invalid input.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Unexpected type of value: Expected array, got string
      */
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/BackendTest.php
index 89f7cb76d7fb53f5dbe7a5778b387c694a168417..229fc629efc4aa33cd74410f2c600f1c32937b07 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/BackendTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/BackendTest.php
@@ -220,6 +220,7 @@ class BackendTest extends PHPUnit_Framework_TestCase
      * Test refining an alphabrowse exception (string 1).
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\RemoteErrorException
      * @expectedExceptionMessage Alphabetic Browse index missing.
      */
@@ -232,6 +233,7 @@ class BackendTest extends PHPUnit_Framework_TestCase
      * Test refining an alphabrowse exception (string 2).
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\RemoteErrorException
      * @expectedExceptionMessage Alphabetic Browse index missing.
      */
@@ -244,6 +246,7 @@ class BackendTest extends PHPUnit_Framework_TestCase
      * Test that we don't refine a non-alphabrowse-related exception.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\RemoteErrorException
      * @expectedExceptionMessage not a browse error
      */
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/ConnectorTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/ConnectorTest.php
index 6e8b832ecbbd97371f0cf3374a23c025ffdd0281..07e989a8f792c205e08a3573aceb0364c4f3a88f 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/ConnectorTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/ConnectorTest.php
@@ -84,6 +84,8 @@ class ConnectorTest extends PHPUnit_Framework_TestCase
     /**
      * Test RemoteErrorException is thrown on a remote 5xx error.
      *
+     * @return void
+     *
      * @expectedException     VuFindSearch\Backend\Exception\RemoteErrorException
      * @expectedExceptionCode 500
      */
@@ -96,6 +98,8 @@ class ConnectorTest extends PHPUnit_Framework_TestCase
     /**
      * Test RequestErrorException is thrown on a remote 4xx error.
      *
+     * @return void
+     *
      * @expectedException     VuFindSearch\Backend\Exception\RequestErrorException
      * @expectedExceptionCode 400
      */
@@ -108,6 +112,8 @@ class ConnectorTest extends PHPUnit_Framework_TestCase
     /**
      * Test InvalidArgumentException invalid adapter object.
      *
+     * @return void
+     *
      * @expectedException InvalidArgumentException
      * @expectedExceptionMessage AdapterInterface
      */
@@ -120,6 +126,8 @@ class ConnectorTest extends PHPUnit_Framework_TestCase
     /**
      * Test InvalidArgumentException unknown serialization format.
      *
+     * @return void
+     *
      * @expectedException        InvalidArgumentException
      * @expectedExceptionMessage Unable to serialize
      */
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/RecordCollectionFactoryTest.php
index 9fb24f03b87bb86da9e6ee20de77110b3bfa7e3b..79b67b0b4738256be2d5fdbd8d2f2452882c6ffc 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/RecordCollectionFactoryTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Solr/Response/Json/RecordCollectionFactoryTest.php
@@ -59,6 +59,7 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase
      * Test invalid input.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Unexpected type of value: Expected array, got string
      */
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/BackendTest.php
index bac4d299d2afb66dea9af352001e681733aeb2a3..10b0e0a31771618a9684142bfe3d13533ca5d83f 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/BackendTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/BackendTest.php
@@ -120,6 +120,7 @@ class BackendTest extends TestCase
      * Test retrieve exception handling.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      */
     public function testRetrieveWrapsSummonException()
@@ -171,6 +172,7 @@ class BackendTest extends TestCase
      * Test search exception handling.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      */
     public function testSearchWrapsSummonException()
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/Response/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/Response/RecordCollectionFactoryTest.php
index c58956ea404dea6321a70b4f4fccec9e0df8e4b6..36c64088628641cb8ee5e90ccdce942be66b489d 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/Response/RecordCollectionFactoryTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Summon/Response/RecordCollectionFactoryTest.php
@@ -45,9 +45,10 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase
     /**
      * Test constructor exceptions.
      *
+     * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Record factory must be callable.
-     * @return void
      */
     public function testConstructorRequiresFactoryFunction()
     {
@@ -57,9 +58,10 @@ class RecordCollectionFactoryTest extends PHPUnit_Framework_TestCase
     /**
      * Test constructor exceptions.
      *
+     * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Unexpected type of value: Expected array, got string
-     * @return void
      */
     public function testFactoryRequiresArray()
     {
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/ConnectorTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/ConnectorTest.php
index 205f6e762b6026c82993db3ed2da20ada4faf7a7..53e49ae053f57802a12b6a009fdf68a6b1d18650 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/ConnectorTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/ConnectorTest.php
@@ -72,6 +72,7 @@ class ConnectorTest extends \PHPUnit_Framework_TestCase
      * Test "get holdings" HTTP failure
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\RequestErrorException
      */
     public function testGetHoldingsHttpFailure()
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/Response/XML/RecordCollectionFactoryTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/Response/XML/RecordCollectionFactoryTest.php
index 04b926ae57c27926788b7d5592081cec46d01b8b..3a800e995d163a12b2828d121de364d5a04899d0 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/Response/XML/RecordCollectionFactoryTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/Response/XML/RecordCollectionFactoryTest.php
@@ -45,6 +45,7 @@ class RecordCollectionFactoryTest extends \PHPUnit_Framework_TestCase
      * Test bad callback.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Record factory must be callable.
      */
@@ -57,6 +58,7 @@ class RecordCollectionFactoryTest extends \PHPUnit_Framework_TestCase
      * Test bad factory input.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Unexpected type of value: Expected array, got string
      */
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Query/QueryGroupTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Query/QueryGroupTest.php
index 87ccae852b11c9886674491237dab17ac490e561..0d591f7c1bd2b6050955309524e91c1957835006 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Query/QueryGroupTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Query/QueryGroupTest.php
@@ -122,6 +122,7 @@ class QueryGroupTest extends PHPUnit_Framework_TestCase
      * Test setting an invalid operator.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Exception\InvalidArgumentException
      * @expectedExceptionMessage Unknown or invalid boolean operator: fizz
      */
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php
index 678eaf76a909dafb1a40beeee145c5f2a82224f0..ace86cb05bbafb7c1ca9e826d98a005aa3e84352 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/SearchServiceTest.php
@@ -84,6 +84,7 @@ class SearchServiceTest extends TestCase
      * Test exception-throwing retrieve action.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      * @expectedExceptionMessage test
      */
@@ -108,6 +109,7 @@ class SearchServiceTest extends TestCase
      * Test exception-throwing search action.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      * @expectedExceptionMessage test
      */
@@ -189,6 +191,7 @@ class SearchServiceTest extends TestCase
      * Test exception-throwing batch retrieve action (with RetrieveBatchInterface).
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      * @expectedExceptionMessage test
      */
@@ -221,6 +224,7 @@ class SearchServiceTest extends TestCase
      * RetrieveBatchInterface).
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      * @expectedExceptionMessage test
      */
@@ -279,6 +283,7 @@ class SearchServiceTest extends TestCase
      * Test random (with RandomInterface) exception.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      * @expectedExceptionMessage test
      */
@@ -449,6 +454,7 @@ class SearchServiceTest extends TestCase
      * Test random (without RandomInterface) exception.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      * @expectedExceptionMessage test
      */
@@ -475,6 +481,7 @@ class SearchServiceTest extends TestCase
      * Test random (without RandomInterface) exception at item retrieval search.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      * @expectedExceptionMessage test
      */
@@ -517,6 +524,7 @@ class SearchServiceTest extends TestCase
      * Test random (without RandomInterface) exception with less results than limit.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      * @expectedExceptionMessage test
      */
@@ -589,6 +597,7 @@ class SearchServiceTest extends TestCase
      * Test similar action on bad backend.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      * @expectedExceptionMessage foo does not support similar()
      */
@@ -603,6 +612,7 @@ class SearchServiceTest extends TestCase
      * Test exception-throwing similar action.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Backend\Exception\BackendException
      * @expectedExceptionMessage test
      */
@@ -633,6 +643,7 @@ class SearchServiceTest extends TestCase
      * Test a failure to resolve.
      *
      * @return void
+     *
      * @expectedException VuFindSearch\Exception\RuntimeException
      * @expectedExceptionMessage Unable to resolve backend: retrieve, junk
      */
diff --git a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php
index b5780ae9c76b745ab89a39edc2fb4b94411d4886..73ddb0a16d71d48f022a3488a193a90a24dac390 100644
--- a/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php
+++ b/module/VuFindTheme/tests/unit-tests/src/VuFindTest/ThemeInfoTest.php
@@ -81,6 +81,7 @@ class ThemeInfoTest extends Unit\TestCase
      * Test setting invalid theme
      *
      * @return void
+     *
      * @expectedException Exception
      * @expectedExceptionMessage Cannot load theme: invalid
      */