diff --git a/Classes/Command/IndexCommandController.php b/Classes/Command/IndexCommandController.php
index 55ac4df..78ee643 100644
--- a/Classes/Command/IndexCommandController.php
+++ b/Classes/Command/IndexCommandController.php
@@ -57,9 +57,7 @@ class IndexCommandController extends CommandController
     {
         // TODO: Allow to index multiple tables at once?
         // TODO: Also allow to index everything?
-
-        // TODO: There is no test yet!
-        // TODO: Add test, adjust config path
+        // TODO: Adjust config path
         if (! in_array($table, GeneralUtility::trimExplode(',', $this->configuration->get('indexer.tca.allowedTables')))) {
             $this->outputLine('Table is not allowed for indexing.');
             $this->quit(1);
diff --git a/Tests/Unit/Command/IndexCommandControllerTest.php b/Tests/Unit/Command/IndexCommandControllerTest.php
new file mode 100644
index 0000000..04e0dd0
--- /dev/null
+++ b/Tests/Unit/Command/IndexCommandControllerTest.php
@@ -0,0 +1,106 @@
+<?php
+namespace Leonmrni\SearchCore\Tests\Unit\Command;
+
+/*
+ * Copyright (C) 2017  Daniel Siepmann <coding@daniel-siepmann.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+use Leonmrni\SearchCore\Command\IndexCommandController;
+use Leonmrni\SearchCore\Configuration\ConfigurationContainerInterface;
+use Leonmrni\SearchCore\Domain\Index\IndexerFactory;
+use Leonmrni\SearchCore\Domain\Index\TcaIndexer;
+use Leonmrni\SearchCore\Tests\Unit\AbstractUnitTestCase;
+use TYPO3\CMS\Extbase\Mvc\Controller\CommandController;
+use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
+
+class IndexCommandControllerTest extends AbstractUnitTestCase
+{
+    /**
+     * @var IndexCommandController
+     */
+    protected $subject;
+
+    /**
+     * @var IndexerFactory
+     */
+    protected $indexerFactory;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->indexerFactory = $this->getMockBuilder(IndexerFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $configuration = $this->getMockBuilder(ConfigurationContainerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $configuration->expects($this->once())
+            ->method('get')
+            ->with('indexer.tca.allowedTables')
+            ->will($this->returnValue('allowedTable, anotherTable,YetAnotherTable'));
+
+        $this->subject = $this->getMockBuilder(IndexCommandController::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['quit', 'outputLine'])
+            ->getMock();
+        $this->subject->injectIndexerFactory($this->indexerFactory);
+        $this->inject($this->subject, 'configuration', $configuration);
+    }
+
+    /**
+     * @test
+     */
+    public function indexerStopsForNonAllowedTable()
+    {
+        $this->expectException(StopActionException::class);
+        $this->subject->expects($this->once())
+            ->method('quit')
+            ->with(1)
+            ->will($this->throwException(new StopActionException));
+
+        $this->subject->expects($this->once())
+            ->method('outputLine')
+            ->with('Table is not allowed for indexing.');
+        $this->indexerFactory->expects($this->never())
+            ->method('getIndexer');
+
+        $this->subject->indexCommand('nonAllowedTable');
+    }
+
+    /**
+     * @test
+     */
+    public function indexerExecutesForAllowedTable()
+    {
+        $indexerMock = $this->getMockBuilder(TcaIndexer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->subject->expects($this->never())
+            ->method('quit');
+        $this->subject->expects($this->once())
+            ->method('outputLine')
+            ->with('Table was indexed.');
+        $this->indexerFactory->expects($this->once())
+            ->method('getIndexer')
+            ->with('allowedTable')
+            ->will($this->returnValue($indexerMock));
+
+        $this->subject->indexCommand('allowedTable');
+    }
+}
diff --git a/Tests/Unit/Domain/Search/QueryFactoryTest.php b/Tests/Unit/Domain/Search/QueryFactoryTest.php
index 83f031e..9cb0a3d 100644
--- a/Tests/Unit/Domain/Search/QueryFactoryTest.php
+++ b/Tests/Unit/Domain/Search/QueryFactoryTest.php
@@ -27,6 +27,9 @@ use Leonmrni\SearchCore\Tests\Unit\AbstractUnitTestCase;
 
 class QueryFactoryTest extends AbstractUnitTestCase
 {
+    /**
+     * @var QueryFactory
+     */
     protected $subject;
 
     public function setUp()