diff --git a/module/VuFind/src/VuFind/Search/Solr/Options.php b/module/VuFind/src/VuFind/Search/Solr/Options.php
index 34d714f27ac437569e2f8ee9b4f87f29812be178..4b2fab1393cd3af428c752dc6cfb334925920a38 100644
--- a/module/VuFind/src/VuFind/Search/Solr/Options.php
+++ b/module/VuFind/src/VuFind/Search/Solr/Options.php
@@ -40,16 +40,46 @@ use VuFind\Config\Reader as ConfigReader,
  */
 class Options extends BaseOptions
 {
-    // Spelling
+    /**
+     * Spelling limit
+     *
+     * @var int
+     */
     protected $spellingLimit = 3;
+
+    /**
+     * Selected spelling dictionary
+     *
+     * @var string
+     */
     protected $dictionary = 'default';
+
+    /**
+     * Level of spelling correction sophistication
+     *
+     * @var bool
+     */
     protected $spellSimple = false;
+
+    /**
+     * Spell check words with numbers in them?
+     *
+     * @var bool
+     */
     protected $spellSkipNumeric = true;
 
-    // Pre-assigned filters
+    /**
+     * Pre-assigned filters
+     *
+     * @var array
+     */
     protected $hiddenFilters = array();
 
-    // Shard fields to strip
+    /**
+     * Shard fields to strip
+     *
+     * @var array
+     */
     protected $solrShardsFieldsToStrip = array();
 
     /**
diff --git a/module/VuFind/src/VuFindTest/Unit/TestCase.php b/module/VuFind/src/VuFindTest/Unit/TestCase.php
index 26216e9cf1b9f0c134fec5820995f9f6a6153d9a..d533f805ea4fed4e5c528b79b7ff56bec6831438 100644
--- a/module/VuFind/src/VuFindTest/Unit/TestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/TestCase.php
@@ -41,6 +41,11 @@ namespace VuFindTest\Unit;
 
 abstract class TestCase extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * The service manager instance
+     *
+     * @var \Zend\ServiceManager\ServiceManager
+     */
     protected $serviceManager = false;
 
     /**