diff --git a/module/VuFind/src/VuFind/Db/Table/User.php b/module/VuFind/src/VuFind/Db/Table/User.php
index 46ddc32a9340acb3b9844499cb7f91f1c02089e3..9978af7f188e7d1c2d43ce7b4f72cb4bc8c0f09f 100644
--- a/module/VuFind/src/VuFind/Db/Table/User.php
+++ b/module/VuFind/src/VuFind/Db/Table/User.php
@@ -50,7 +50,7 @@ class User extends Gateway
      *
      * @param \Zend\Config\Config $config VuFind configuration
      */
-    public function __construct(\Zend\Config\Config $config = null)
+    public function __construct(\Zend\Config\Config $config)
     {
         parent::__construct('user', 'VuFind\Db\Row\User');
         $this->config = $config;
diff --git a/module/VuFind/src/VuFindTest/Unit/DbTestCase.php b/module/VuFind/src/VuFindTest/Unit/DbTestCase.php
index 3e4447f13ffe1e66dbb3fe7ed79652a866afc810..52ad6cf13c59a1eb9c60da7860a6f987aaa87e00 100644
--- a/module/VuFind/src/VuFindTest/Unit/DbTestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/DbTestCase.php
@@ -60,7 +60,11 @@ abstract class DbTestCase extends TestCase
                 new \Zend\ServiceManager\Config(
                     array(
                         'abstract_factories' =>
-                            array('VuFind\Db\Table\PluginFactory')
+                            array('VuFind\Db\Table\PluginFactory'),
+                        'factories' => array(
+                            'resource' => 'VuFind\Db\Table\Factory::getResource',
+                            'user' => 'VuFind\Db\Table\Factory::getUser',
+                        )
                     )
                 )
             );
diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php
index ef37bc2703c20c63343d541da330743674942fcf..32291f88922ab0b34c82f6759da8c0b9766cb965 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php
@@ -58,6 +58,7 @@ class CartTest extends \VuFindTest\Unit\MinkTestCase
 
         // Click "add" without selecting anything:
         $updateCart = $page->find('css', '#updateCart');
+        $this->assertTrue(is_object($updateCart));
         $updateCart->click();
         $this->assertEquals(
             'No items were selected. '
@@ -73,6 +74,7 @@ class CartTest extends \VuFindTest\Unit\MinkTestCase
 
         // Open the cart and empty it:
         $viewCart = $page->find('css', '#viewCart');
+        $this->assertTrue(is_object($viewCart));
         $viewCart->click();
         $cartSelectAll = $page->find('css', '#cartCheckboxSelectAll');
         $cartSelectAll->check();