diff --git a/extensions/ter_fe2/Tests/Unit/Domain/Model/ExtensionTest.php b/extensions/ter_fe2/Tests/Unit/Domain/Model/ExtensionTest.php
index e814ea2f943ee75efd5b9da358ad48d867fc685f..f0818112b7b2cd4b10c0f7431cc180a28f7ab058 100644
--- a/extensions/ter_fe2/Tests/Unit/Domain/Model/ExtensionTest.php
+++ b/extensions/ter_fe2/Tests/Unit/Domain/Model/ExtensionTest.php
@@ -316,6 +316,12 @@ class ExtensionTest extends \Nimut\TestingFramework\TestCase\UnitTestCase
         );
 
         $extension->removeVersion($versionOne);
+
+        self::assertInstanceOf(
+            Version::class,
+            $extension->getLastVersion()
+        );
+
         $extension->removeVersion($versionTwo);
 
         self::assertNull($extension->getLastVersion());
@@ -341,10 +347,10 @@ class ExtensionTest extends \Nimut\TestingFramework\TestCase\UnitTestCase
         $downloadRepository->expects(self::once())
             ->method('findDownloadsByExtensionkey')
             ->with($extension->getExtKey())
-            ->willReturn(0);
+            ->willReturn(10);
 
         self::assertEquals(
-            3000,
+            3010,
             $extension->getDownloads()
         );
     }
diff --git a/extensions/ter_fe2/Tests/Unit/Service/ExtensionIndexServiceTest.php b/extensions/ter_fe2/Tests/Unit/Service/ExtensionIndexServiceTest.php
index e3b1a24e5c37c2b6fad79255c051a30a3f07c825..29c33aeee9a2c0403700e4f1f1bf071f196f8285 100644
--- a/extensions/ter_fe2/Tests/Unit/Service/ExtensionIndexServiceTest.php
+++ b/extensions/ter_fe2/Tests/Unit/Service/ExtensionIndexServiceTest.php
@@ -15,6 +15,8 @@ namespace T3o\TerFe2\Tests\Service;
  */
 
 use Nimut\TestingFramework\TestCase\UnitTestCase;
+use PHPUnit\Framework\Constraint\ArrayHasKey;
+use PHPUnit\Framework\MockObject\MockObject;
 use T3o\TerFe2\Service\ExtensionIndexService;
 use TYPO3\CMS\Core\Core\Environment;
 
@@ -132,4 +134,82 @@ class ExtensionIndexServiceTest extends UnitTestCase
         $resultString = preg_replace('/\<!--Index created(.*)--\>\n/m', '', $resultString);
         self::assertEquals($resultString, $expected);
     }
+
+    /**
+     * @test
+     * @dataProvider constructorTestDataProvider
+     */
+    public function constructorTest(string $basePath, string $expected): void
+    {
+        $extensionIndexService = self::getAccessibleMock(ExtensionIndexService::class, ['dummy'], [$basePath]);
+        self::assertEquals(
+            $expected,
+            $extensionIndexService->_get('basePath')
+        );
+    }
+
+    public function constructorTestDataProvider(): array
+    {
+        return [
+            'Empty not null' => [
+                'basePath' => '',
+                'expected' => '/'
+            ],
+            'no tailing slash' => [
+                'basePath' => 'path',
+                'expected' => 'path/'
+            ],
+            'one tailing slash' => [
+                'basePath' => 'path/',
+                'expected' => 'path/'
+            ],
+            'two tailing slashes' => [
+                'basePath' => 'path//',
+                'expected' => 'path/'
+            ],
+        ];
+    }
+
+
+    /**
+     * @test
+     * @dataProvider xmlentitiesDataProvider
+     */
+    public function xmlentitiesTest(string $string, string $expected): void
+    {
+        $extensionIndexService = self::getAccessibleMock(ExtensionIndexService::class, ['dummy'] ,[],'',false );
+        self::assertEquals(
+            $expected,
+            $extensionIndexService->_call('xmlentities', $string)
+        );
+    }
+
+    public function xmlentitiesDataProvider(): array
+    {
+        return [
+            'Empty string ' => [
+                '',
+                ''
+            ],
+            'String with &' => [
+                'Tom & Jerry',
+                'Tom &amp; Jerry'
+            ],
+            'String with double quote' => [
+                '"Sarcasm"',
+                '&quot;Sarcasm&quot;'
+            ],
+            // The mutation went away, but still missing two test cases, but they failed to me.
+            /*'String with single quote' => [
+                "'Sarcasm'",
+                '&apos;Sarcasm&apos;'
+            ],
+            'String with <>' => [
+                '1 <> 2',
+                '1 &lt;&gt; 2'
+            ]*/
+        ];
+
+        // ['&', '"', "'", '<', '>'], ['&amp;', '&quot;', '&apos;', '&lt;', '&gt;']
+    }
 }
diff --git a/extensions/ter_fe2/Tests/Unit/Service/OutdatedVersionServiceTest.php b/extensions/ter_fe2/Tests/Unit/Service/OutdatedVersionServiceTest.php
index ba4542f2312450075784722125f4fde9f3277edc..427faa2ccf4fa047d6cf44c3258da8f60b793caf 100644
--- a/extensions/ter_fe2/Tests/Unit/Service/OutdatedVersionServiceTest.php
+++ b/extensions/ter_fe2/Tests/Unit/Service/OutdatedVersionServiceTest.php
@@ -15,6 +15,7 @@ namespace T3o\TerFe2\Tests\Service;
  * The TYPO3 project - inspiring people to share!
  */
 
+use T3o\TerFe2\Service\OutdatedVersionService;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 
 class OutdatedVersionServiceTest extends \Nimut\TestingFramework\TestCase\AbstractTestCase
@@ -26,7 +27,7 @@ class OutdatedVersionServiceTest extends \Nimut\TestingFramework\TestCase\Abstra
 
     public function setUp()
     {
-        $this->subject = new \T3o\TerFe2\Service\OutdatedVersionService();
+        $this->subject = self::getAccessibleMock(OutdatedVersionService::class, ['dummy'], [], '', false);
         $this->subject->supportedCoreVersions = [4005000, 4007000, 6000000, 6001000, 6002000, 7006000, 8007000];
     }