diff --git a/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php b/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php
index d0e40e21e81a1164a9760e9d5220635a19c25d9b..e1e801cc21b6c9a0c3222a634a38272b46b996a4 100644
--- a/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php
+++ b/components/testing_framework/Classes/Core/Acceptance/AcceptanceCoreEnvironment.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-namespace TYPO3\Components\TestingFramework\Core;
+namespace TYPO3\Components\TestingFramework\Core\Acceptance;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/components/testing_framework/Classes/Core/Functional/FunctionalTestCase.php b/components/testing_framework/Classes/Core/Functional/FunctionalTestCase.php
index 8bcf12606adde4c190f01c1f3ed7ca797017f681..9f9b2a1a218f35f21131ffe0293133ac42c19575 100644
--- a/components/testing_framework/Classes/Core/Functional/FunctionalTestCase.php
+++ b/components/testing_framework/Classes/Core/Functional/FunctionalTestCase.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\Components\TestingFramework\Core;
+namespace TYPO3\Components\TestingFramework\Core\Functional;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -14,12 +14,14 @@ namespace TYPO3\Components\TestingFramework\Core;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Response;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Cache\Backend\NullBackend;
 use TYPO3\CMS\Core\Core\Bootstrap;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\Components\TestingFramework\Core\BaseTestCase;
+use TYPO3\Components\TestingFramework\Core\Functional\Framework\Frontend\Response;
+use TYPO3\Components\TestingFramework\Core\Testbase;
 
 /**
  * Base test case class for functional tests, all TYPO3 CMS
diff --git a/components/testing_framework/Classes/Core/Unit/UnitTestCase.php b/components/testing_framework/Classes/Core/Unit/UnitTestCase.php
index 1bdd50afdc73851ce4a2701694618c3e5456b233..ee34c02d0bdc0cabf75f659bf7e5da7a5c333922 100644
--- a/components/testing_framework/Classes/Core/Unit/UnitTestCase.php
+++ b/components/testing_framework/Classes/Core/Unit/UnitTestCase.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\Components\TestingFramework\Core;
+namespace TYPO3\Components\TestingFramework\Core\Unit;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -16,6 +16,7 @@ namespace TYPO3\Components\TestingFramework\Core;
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
+use TYPO3\Components\TestingFramework\Core\BaseTestCase;
 
 /**
  * Base test case for unit tests.
@@ -64,7 +65,7 @@ abstract class UnitTestCase extends BaseTestCase
             $declaringClass = $property->getDeclaringClass()->getName();
             if (
                 !$property->isStatic()
-                && $declaringClass !== \TYPO3\Components\TestingFramework\Core\UnitTestCase::class
+                && $declaringClass !== \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase::class
                 && $declaringClass !== \TYPO3\Components\TestingFramework\Core\BaseTestCase::class
                 && strpos($property->getDeclaringClass()->getName(), 'PHPUnit_') !== 0
             ) {
diff --git a/components/testing_framework/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php b/components/testing_framework/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
index 1cd317dba1358c9f46466bbab17322adad2b64f9..e8d7c45f6851a30a19641a53c789567483725363 100644
--- a/components/testing_framework/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
+++ b/components/testing_framework/Classes/Fluid/Unit/ViewHelpers/ViewHelperBaseTestcase.php
@@ -26,7 +26,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
 /**
  * Base test class for testing view helpers
  */
-abstract class ViewHelperBaseTestcase extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+abstract class ViewHelperBaseTestcase extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var ViewHelperVariableContainer|ObjectProphecy
diff --git a/components/testing_framework/Resources/Core/Build/AcceptanceTests.yml b/components/testing_framework/Resources/Core/Build/AcceptanceTests.yml
index e011a8eba4f19662bcdc4ac21e17df4f4c3a014f..cf8fe76fbc311a3f71422219032a91c30e6440bc 100644
--- a/components/testing_framework/Resources/Core/Build/AcceptanceTests.yml
+++ b/components/testing_framework/Resources/Core/Build/AcceptanceTests.yml
@@ -13,4 +13,4 @@ extensions:
   enabled:
     - Codeception\Extension\RunFailed
     - Codeception\Extension\Recorder
-    - TYPO3\Components\TestingFramework\Core\AcceptanceCoreEnvironment
+    - TYPO3\Components\TestingFramework\Core\Acceptance\AcceptanceCoreEnvironment
diff --git a/components/testing_framework/compat/core/FunctionalTestCase.php b/components/testing_framework/compat/core/FunctionalTestCase.php
index b7da53a0e137fb32cbe67be39836451fd4497e9a..96feaa16c70cc8015b67354affb0e2af595c6690 100644
--- a/components/testing_framework/compat/core/FunctionalTestCase.php
+++ b/components/testing_framework/compat/core/FunctionalTestCase.php
@@ -17,6 +17,6 @@ namespace TYPO3\CMS\Core\Tests;
 /**
  * @deprecated since TYPO3 8, will be removed in TYPO3 9
  */
-abstract class FunctionalTestCase extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+abstract class FunctionalTestCase extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
 }
diff --git a/components/testing_framework/compat/core/UnitTestCase.php b/components/testing_framework/compat/core/UnitTestCase.php
index 7af4c8cb09167b0d3a64c7af70165577da0be798..0c44f010bf84494d38ec080f83a6820014f0391f 100644
--- a/components/testing_framework/compat/core/UnitTestCase.php
+++ b/components/testing_framework/compat/core/UnitTestCase.php
@@ -17,6 +17,6 @@ namespace TYPO3\CMS\Core\Tests;
 /**
  * @deprecated since TYPO3 8, will be removed in TYPO3 9
  */
-abstract class UnitTestCase extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+abstract class UnitTestCase extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 }
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
index 36b7ee209165779168315c62a92a87a11452ee1e..80bf1fb56024fc690336e452b3412fc3f2751890 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\DataHandling\DataHandler;
 /**
  * Test case for TYPO3\CMS\Backend\Controller\Page\LocalizationController
  */
-class LocalizationControllerTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class LocalizationControllerTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var LocalizationController
diff --git a/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php b/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
index 429722589bcd269c5ae06daaf3a5a16599b85b62..999ea2c967b79427c6adf57aaee4699b4f25b88f 100644
--- a/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for class \TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher.
  */
-class ConditionMatcherTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ConditionMatcherTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/EditDocumentControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/EditDocumentControllerTest.php
index fbba77eb1dcbbb1d677b2b74c1a91cdb12c8eab5..6366c42b5d93c4ded775f9ec0c27ee6eca2336cb 100644
--- a/typo3/sysext/backend/Tests/Unit/Controller/EditDocumentControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Controller/EditDocumentControllerTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Controller\EditDocumentController;
 /**
  * Tests for EditDocumentController
  */
-class EditDocumentControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class EditDocumentControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php
index 428ebb9be84067ec4e4883c15a28eb070d96eba4..81de64db5190b7478135376d0340fdc230a20ceb 100644
--- a/typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Http\ServerRequest;
 /**
  * Tests for \TYPO3\CMS\Backend\Tests\Unit\Controller\File\FileController
  */
-class FileControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Backend\Controller\File\FileController|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/FormInlineAjaxControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/FormInlineAjaxControllerTest.php
index 73f695c0eaf6a7169cb0efb8d3bb9d3812c7e458..d04ad742efe49741a7157fa687377ad1617beab2 100644
--- a/typo3/sysext/backend/Tests/Unit/Controller/FormInlineAjaxControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Controller/FormInlineAjaxControllerTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 /**
  * Test case
  */
-class FormInlineAjaxControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FormInlineAjaxControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Checks if the given file type may be uploaded without *ANY* limit to file types being given
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/FormSelectTreeAjaxControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/FormSelectTreeAjaxControllerTest.php
index 0253fd8f874a9688a4719be85ca748ca977bb6c8..996b4a496e38a73cd9ad12006ba8de9d628add91 100644
--- a/typo3/sysext/backend/Tests/Unit/Controller/FormSelectTreeAjaxControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Controller/FormSelectTreeAjaxControllerTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Backend\Controller\FormSelectTreeAjaxController;
 /**
  * Test case
  */
-class FormSelectTreeAjaxControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FormSelectTreeAjaxControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/LoginControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/LoginControllerTest.php
index 4575e9541d2ffa09db5ff29d40b86faf6af38a71..4f9216d10020597368614dc20cd9abe61d986381 100644
--- a/typo3/sysext/backend/Tests/Unit/Controller/LoginControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Controller/LoginControllerTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Backend\LoginProvider\UsernamePasswordLoginProvider;
 /**
  * Class LoginControllerTest
  */
-class LoginControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LoginControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var LoginController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php
index 5308a3848548abb466b3b9d6a1ec80d7ef2bb62b..7d908b818240b5f4c085103001eaca55f86e3868 100644
--- a/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Type\Bitmask\Permission;
 /**
  * Class PageLayoutControllerTest
  */
-class PageLayoutControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PageLayoutControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/Wizard/SuggestWizardControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/Wizard/SuggestWizardControllerTest.php
index c489048f74418fbcac441961dcd17b2998e44aa6..35e32f18546b64782c61af181ecfa132a2b8bce1 100644
--- a/typo3/sysext/backend/Tests/Unit/Controller/Wizard/SuggestWizardControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Controller/Wizard/SuggestWizardControllerTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class SuggestWizardControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SuggestWizardControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Form/Element/AbstractFormElementTest.php b/typo3/sysext/backend/Tests/Unit/Form/Element/AbstractFormElementTest.php
index 0ff0d956a09bd62c09c03f950efd45ec8321017b..baf3264374b3164f031024d6efa10a97ae9ba28f 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/Element/AbstractFormElementTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/Element/AbstractFormElementTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
 /**
  * Test case
  */
-class AbstractFormElementTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractFormElementTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @return array
diff --git a/typo3/sysext/backend/Tests/Unit/Form/Element/InputDateTimeElementTest.php b/typo3/sysext/backend/Tests/Unit/Form/Element/InputDateTimeElementTest.php
index c9b8bc2aa195a741206ce48a45ab8a8a6ae2831f..e8fa178d2c3041cb42a3df2973525f27faae61b6 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/Element/InputDateTimeElementTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/Element/InputDateTimeElementTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Lang\LanguageService;
 /**
  * Test case
  */
-class InputDateTimeElementTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class InputDateTimeElementTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var string Selected timezone backup
diff --git a/typo3/sysext/backend/Tests/Unit/Form/Element/InputHiddenElementTest.php b/typo3/sysext/backend/Tests/Unit/Form/Element/InputHiddenElementTest.php
index 66ca49703bc8c2db034788aabec2bf36df93f639..1269e0cba1bac260f6d018b58b10324a9a5ed989 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/Element/InputHiddenElementTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/Element/InputHiddenElementTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Form\Element\InputHiddenElement;
 /**
  * Tests for InputHiddenElement Form
  */
-class InputHiddenElementTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class InputHiddenElementTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php
index dc73d2e46b40f2ed5832bf3f78f9fe88fcb5ffa7..95c5126b495867211136124e0b18c86e8da41b34 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Backend\Form\FormDataGroupInterface;
 /**
  * Test case
  */
-class FormDataCompilerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FormDataCompilerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var FormDataCompiler
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/FlexFormSegmentTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/FlexFormSegmentTest.php
index 2018cd0c12990207b2702b97dda299a24a246b58..c697c05327264f7b26d44df097dabea9f16f65ca 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/FlexFormSegmentTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/FlexFormSegmentTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class FlexFormSegmentTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FlexFormSegmentTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var FlexFormSegment
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/InlineParentRecordTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/InlineParentRecordTest.php
index e81a66bf8e023f0e434811ea82a517ebfce79184..cade32876429f74365b307c442984741ee3640ea 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/InlineParentRecordTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/InlineParentRecordTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class InlineParentRecordTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class InlineParentRecordTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var InlineParentRecord
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/OnTheFlyTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/OnTheFlyTest.php
index 2e71be6d57baa053384d53fb520a8392db63d009..c6967f32259dae9804eeee108e64be7b3120b8cd 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/OnTheFlyTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/OnTheFlyTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class OnTheFlyTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class OnTheFlyTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var OnTheFly
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/OrderedProviderListTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/OrderedProviderListTest.php
index 87534616b98094d2ef5ad1aabebac73e84694042..939a96b8d1b69edcc5b219736e75c1a5476b7782 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/OrderedProviderListTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/OrderedProviderListTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class OrderedProviderListTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class OrderedProviderListTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var OrderedProviderList
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/TcaDatabaseRecordTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/TcaDatabaseRecordTest.php
index 3fd2bf3cc86b62327fecc566ca4d642a5a79d7a1..f2f3229ff8e475d98587fdb9b9f32ee0d8936681 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/TcaDatabaseRecordTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/TcaDatabaseRecordTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class TcaDatabaseRecordTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaDatabaseRecordTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaDatabaseRecord
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/TcaInputPlaceholderRecordTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/TcaInputPlaceholderRecordTest.php
index a0f33a8aceec9eaa2025ff6214c9eb4f34156b92..dacde006a3a65943dabb0efdaf9fd9cda9ead8a6 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/TcaInputPlaceholderRecordTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/TcaInputPlaceholderRecordTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class TcaInputPlaceholderRecordTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaInputPlaceholderRecordTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaInputPlaceholderRecord
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseEditRowTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseEditRowTest.php
index 3ff7cd1a4e1714d62983ad9d6e1bbb306e707e73..c93099a2868518d1f5731323166c30b15a300fa1 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseEditRowTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseEditRowTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Database\DatabaseConnection;
 /**
  * Test case
  */
-class DatabaseEditRowTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseEditRowTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseEditRow|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseEffectivePidTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseEffectivePidTest.php
index 5b678734c1573b69eb291266d475d12908ff8220..70473e61d0bb4956b37fe37005ea3a237d62acfe 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseEffectivePidTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseEffectivePidTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseEffectivePid;
 /**
  * Test case
  */
-class DatabaseEffectivePidTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseEffectivePidTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseEffectivePid
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseLanguageRowsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseLanguageRowsTest.php
index ba63d8918d8335d36c005f696d18ce5dd3db66c0..df93e6a552d63f62267f912c1e2c70d497673447 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseLanguageRowsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseLanguageRowsTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class DatabaseLanguageRowsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseLanguageRowsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseLanguageRows|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabasePageLanguageOverlayRowsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabasePageLanguageOverlayRowsTest.php
index 7fae2a580b64e38a744d95caf0c3f6e98be8806a..ec9c7e6eeddd5678b5b7b874edc621b221a53c79 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabasePageLanguageOverlayRowsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabasePageLanguageOverlayRowsTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\DatabasePageLanguageOverlayRows;
 /**
  * Test case
  */
-class DatabasePageLanguageOverlayRowsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabasePageLanguageOverlayRowsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabasePageLanguageOverlayRows|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseParentPageRowTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseParentPageRowTest.php
index 4a80d19a9a36ecedd595a8d020b00dee74bdbf3c..5224a3f549f6a8e6d7488fff1fb501abd8d62aec 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseParentPageRowTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseParentPageRowTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Database\DatabaseConnection;
 /**
  * Test case
  */
-class DatabaseParentPageRowTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseParentPageRowTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseParentPageRow|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordOverrideValuesTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordOverrideValuesTest.php
index 77229228aae65c902560bde94f3cff3fa02458c4..d228e63bb8b430082944c9d553ee79d439dc0d09 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordOverrideValuesTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordOverrideValuesTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRecordOverrideValues;
 /**
  * Test case
  */
-class DatabaseRecordOverrideValuesTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseRecordOverrideValuesTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseRecordOverrideValues
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordTypeValueTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordTypeValueTest.php
index 901cacbf0d6f25de7d2d894b7b5feb2b02941762..72b53a6e5a0f32086628b2068326468b27d2e7eb 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordTypeValueTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordTypeValueTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Database\DatabaseConnection;
 /**
  * Test case
  */
-class DatabaseRecordTypeValueTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseRecordTypeValueTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseRecordTypeValue|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowDateTimeFieldsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowDateTimeFieldsTest.php
index 4e8d4dd2e57f986f6a895d6c69126261e0610d1f..bb1cec165aebe42abee5f88be1bac4d7e3363421 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowDateTimeFieldsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowDateTimeFieldsTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRowDateTimeFields;
 /**
  * Test case
  */
-class DatabaseRowDateTimeFieldsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseRowDateTimeFieldsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowDefaultValuesTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowDefaultValuesTest.php
index ed4843d76d21c56167202c0987c3e1de0d9c9a6b..db2f612a2c170b6a827d68c6e3e2fbaefb7e9582 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowDefaultValuesTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowDefaultValuesTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRowDefaultValues;
 /**
  * Test case
  */
-class DatabaseRowDefaultValuesTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseRowDefaultValuesTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseRowDefaultValues
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowInitializeNewTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowInitializeNewTest.php
index 33619934ed931339858235c318f1e24a52e5f912..24824d541178c4f3e05e065cb0bb3d91625ed6dc 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowInitializeNewTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowInitializeNewTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRowInitializeNew;
 /**
  * Test case
  */
-class DatabaseRowInitializeNewTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseRowInitializeNewTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseRowInitializeNew
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseSystemLanguageRowsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseSystemLanguageRowsTest.php
index bc7b8914fdf7eea540aa200cd3258790f7205271..37707283cdce4e1716ca001d8ca5baf576f1ab1d 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseSystemLanguageRowsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseSystemLanguageRowsTest.php
@@ -31,7 +31,7 @@ use TYPO3\CMS\Lang\LanguageService;
 /**
  * Test case
  */
-class DatabaseSystemLanguageRowsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseSystemLanguageRowsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseSystemLanguageRows
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseUniqueUidNewRowTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseUniqueUidNewRowTest.php
index 6e495e3e9f499861aa4b76f2d9f484a9fd96ad3e..c4e359521ea03a71530d3cc27e954c9ca3b71da5 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseUniqueUidNewRowTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseUniqueUidNewRowTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseUniqueUidNewRow;
 /**
  * Test case
  */
-class DatabaseUniqueUidNewRowTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseUniqueUidNewRowTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseUniqueUidNewRow
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseUserPermissionCheckTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseUserPermissionCheckTest.php
index 4c88f47000737141a875d75e984890a3cd09b104..c62df019f39fa43cdfdbfc98899b4fd8318301e8 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseUserPermissionCheckTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseUserPermissionCheckTest.php
@@ -30,7 +30,7 @@ use TYPO3\CMS\Core\Type\Bitmask\Permission;
 /**
  * Test case
  */
-class DatabaseUserPermissionCheckTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseUserPermissionCheckTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseUserPermissionCheck
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/EvaluateDisplayConditionsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/EvaluateDisplayConditionsTest.php
index 087214a295d7c44618fae3f985fc2cd9b1cf2900..066b7352b95c9a6ebc0d4cbf52d9fc5a731eaa3e 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/EvaluateDisplayConditionsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/EvaluateDisplayConditionsTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Utility\ArrayUtility;
 /**
  * Test case
  */
-class EvaluateDisplayConditionsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class EvaluateDisplayConditionsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InitializeProcessedTcaTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InitializeProcessedTcaTest.php
index ef1d3df87ce38f53083560bc2b7e19e56a89bd4d..6412df953123bf677be073f74fea34416ec204fd 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InitializeProcessedTcaTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InitializeProcessedTcaTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca;
 /**
  * Test case
  */
-class InitializeProcessedTcaTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class InitializeProcessedTcaTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var InitializeProcessedTca
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrrideChildTcaTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrrideChildTcaTest.php
index 2d1dd5477e9de71e623f3fb06ce659b9f0dd709c..14e130b69fb24d93a913d9595dcd9e734fe66d38 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrrideChildTcaTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrrideChildTcaTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\InlineOverrideChildTca;
 /**
  * InlineOverrideChildTca Test file
  */
-class InlineOverrrideChildTcaTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class InlineOverrrideChildTcaTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var InlineOverrideChildTca
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/PageTsConfigMergedTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/PageTsConfigMergedTest.php
index 767175a4e20eb9daee01b358483c532394e88495..9c086fee508aa46acd09a3e5f86cfd9e761b0ed5 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/PageTsConfigMergedTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/PageTsConfigMergedTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\PageTsConfigMerged;
 /**
  * Test case
  */
-class PageTsConfigMergedTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PageTsConfigMergedTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var PageTsConfigMerged
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/ParentPageTcaTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/ParentPageTcaTest.php
index a4fde95e3d6a1fd2c929ce130fc6c77c661743e3..d7581497c5b43a38e8751cf2f86e08a958fff35e 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/ParentPageTcaTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/ParentPageTcaTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\ParentPageTca;
 /**
  * Test case
  */
-class ParentPageTcaTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ParentPageTcaTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var ParentPageTca
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaCheckboxItemsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaCheckboxItemsTest.php
index 005d99810fb0bb4733b191bf46986474a53e53f2..ecaaa30bad7aa6f6e9b73de95c33a74cf1990a36 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaCheckboxItemsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaCheckboxItemsTest.php
@@ -26,7 +26,7 @@ use TYPO3\CMS\Lang\LanguageService;
 /**
  * Test case
  */
-class TcaCheckboxItemsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaCheckboxItemsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaCheckboxItems
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsOverridesTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsOverridesTest.php
index d3362be1d1fecb30df05048e1f54c83a3eaee1e1..b3c37a00b965f263b5c3a8cc64f60995ed83065a 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsOverridesTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsOverridesTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsOverrides;
 /**
  * Test case
  */
-class TcaColumnsOverridesTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsOverridesTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaColumnsOverrides
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessCommonTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessCommonTest.php
index 387488f20a2636beaaa7dab9a48ba27e60e8b0b1..d3063120ed5c34c8a0873a5a929c354187371660 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessCommonTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessCommonTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsProcessCommon;
 /**
  * Test case
  */
-class TcaColumnsProcessCommonTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsProcessCommonTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaColumnsProcessCommon
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessFieldLabelsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessFieldLabelsTest.php
index d4e9e7dde60f1c3150aaa30507049c920c3f5605..b37dc028a8bf10524f6a843ff26bdb5bfba072fa 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessFieldLabelsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessFieldLabelsTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Lang\LanguageService;
 /**
  * Test case
  */
-class TcaColumnsProcessFieldLabelsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsProcessFieldLabelsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaColumnsProcessFieldLabels
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessPlaceholdersTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessPlaceholdersTest.php
index c01d58b5bbf1e9455a7aefc51383e5e589292ed5..4db8c9d8032c80a2507e673728d22e8f7c61e15d 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessPlaceholdersTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessPlaceholdersTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsProcessPlaceholders;
 /**
  * Test case
  */
-class TcaColumnsProcessPlaceholdersTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsProcessPlaceholdersTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaColumnsProcessPlaceholders
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessRecordTitleTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessRecordTitleTest.php
index 88b64f84f906ebfdebc833b51402072ca875f946..4bc56b507953686ff092e4be5381510f2b743000 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessRecordTitleTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessRecordTitleTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsProcessRecordTitle;
 /**
  * Test case
  */
-class TcaColumnsProcessRecordTitleTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsProcessRecordTitleTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaColumnsProcessRecordTitle
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessShowitemTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessShowitemTest.php
index 5acf009816bf1fc1fd8f7ae0a23dbecd3f230d4a..809c86098fc359ea1e4ade41e76aa2f6d46c1a8f 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessShowitemTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessShowitemTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsProcessShowitem;
 /**
  * Test case
  */
-class TcaColumnsProcessShowitemTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsProcessShowitemTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaColumnsProcessShowitem
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsRemoveUnusedTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsRemoveUnusedTest.php
index 5c161858ca676fc59947af52d77230479bfbf24f..47f71f06e72f39a1801c434676d51e1a5647a206 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsRemoveUnusedTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsRemoveUnusedTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsRemoveUnused;
 /**
  * Test case
  */
-class TcaColumnsRemoveUnusedTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaColumnsRemoveUnusedTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaColumnsRemoveUnused
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexPrepareTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexPrepareTest.php
index c5290e7600ca86d3a4b93ca7bbdb4ef0221af696..14e86eb307249912a14f19ac01d66b513778c3b3 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexPrepareTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexPrepareTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class TcaFlexPrepareTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaFlexPrepareTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaFlexPrepare
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexProcessTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexProcessTest.php
index 90954a7f3ee6b408c3cc20fe197ea858ed6bd9b9..e2abdd826afba0367546dde356e6e3c33ff05c4e 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexProcessTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexProcessTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Lang\LanguageService;
 /**
  * Test case
  */
-class TcaFlexProcessTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaFlexProcessTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var BackendUserAuthentication|ObjectProphecy
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaGroupTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaGroupTest.php
index da45dcdf3021a1eb8caed88548f03a755b267121..f98250a4ea41a7fdbeb9514e5c20623fdad4238c 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaGroupTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaGroupTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class TcaGroupTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaGroupTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaGroup
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineConfigurationTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineConfigurationTest.php
index e76b02af946cf1179c19b6819d449095cdfd9f33..203825f3b0328d6c2ff912e362bb2f537c8aadaa 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineConfigurationTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineConfigurationTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\TcaInlineConfiguration;
 /**
  * Test case
  */
-class TcaInlineConfigurationTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaInlineConfigurationTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaInlineConfiguration
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineExpandCollapseStateTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineExpandCollapseStateTest.php
index 4fea6a435f4776a14bb4886f6e85562d724c0efd..bd9b32f7cafd0328f753c1413530932ad6e47650 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineExpandCollapseStateTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineExpandCollapseStateTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\TcaInlineExpandCollapseState;
 /**
  * Test case
  */
-class TcaInlineExpandCollapseStateTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaInlineExpandCollapseStateTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaInlineExpandCollapseState
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineIsOnSymmetricSideTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineIsOnSymmetricSideTest.php
index 0af62c35409c940105f837a65eab76220317cfc3..c28d3b1c3924bb4f59b07729d52d44d6a13749ad 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineIsOnSymmetricSideTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineIsOnSymmetricSideTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\TcaInlineIsOnSymmetricSide;
 /**
  * Test case
  */
-class TcaInlineIsOnSymmetricSideTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaInlineIsOnSymmetricSideTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaInlineIsOnSymmetricSide
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineTest.php
index 49fc50e37fa891ac10c37cb279cb78f4bc32ab37..21794ea3bba0076eb4c37c1f101b302e3a305162 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 /**
  * Test case
  */
-class TcaInlineTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaInlineTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaInline
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInputPlaceholdersTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInputPlaceholdersTest.php
index 7f5c140f54ace91489f42d73a6ed083965fd7300..8b13935128320a32887f844af541b4e25deb833a 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInputPlaceholdersTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInputPlaceholdersTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Lang\LanguageService;
 /**
  * Test case
  */
-class TcaInputPlaceholdersTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaInputPlaceholdersTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaInputPlaceholders
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRadioItemsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRadioItemsTest.php
index 98a428d6b2d148e38d1c43a83350d9181a689776..f8c03f661f2e55a71ad0ebfd9b26f1c773f92518 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRadioItemsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRadioItemsTest.php
@@ -26,7 +26,7 @@ use TYPO3\CMS\Lang\LanguageService;
 /**
  * Test case
  */
-class TcaRadioItemsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaRadioItemsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaRadioItems
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRecordTitleTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRecordTitleTest.php
index 700b0751c89978c0d3e840490a114d890470bfbd..75fa6093ec3376d4e0123dd4333ef7c127991761 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRecordTitleTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRecordTitleTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Lang\LanguageService;
 /**
  * Test case
  */
-class TcaRecordTitleTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaRecordTitleTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaRecordTitle
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
index 837b4de4ad472044029de3ded0c7900c3ebf7a3f..6185d26ad71779c217d8bb8bd738ccbe506d59ad 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
@@ -37,7 +37,7 @@ use TYPO3\CMS\Lang\LanguageService;
 /**
  * Test case
  */
-class TcaSelectItemsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaSelectItemsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaSelectItems|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectTreeItemsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectTreeItemsTest.php
index 5502d2abc1cc8eb39eaee840ffc38cb4baef09ab..9c8169c209e0a44057364f14705c8b66cf722abd 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectTreeItemsTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectTreeItemsTest.php
@@ -35,7 +35,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  *
  * @see TcaSelecItemsTest
  */
-class TcaSelectTreeItemsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaSelectTreeItemsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaSelectTreeItems
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaTextTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaTextTest.php
index 50e01605d78b6de45d32341b0c630ec0d65186b1..fcfaa34bf422fb4070c96ea6569700c18d471b13 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaTextTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaTextTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class TcaTextTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaTextTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaTypesShowitemTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaTypesShowitemTest.php
index 20d202821a9872e3bc377466f368e39093b572f2..d2742f48b5a1d01a6321a3927ce48bbfff429b69 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaTypesShowitemTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaTypesShowitemTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\TcaTypesShowitem;
 /**
  * Test case
  */
-class TcaTypesShowitemTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaTypesShowitemTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TcaTypesShowitem
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/UserTsConfigTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/UserTsConfigTest.php
index 9480c6408e427e539b8b891a7618c966249de690..3ed13802192714f50aafc0d424032cde0ceaf90b 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/UserTsConfigTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/UserTsConfigTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\FormDataProvider\UserTsConfig;
 /**
  * Test case
  */
-class UserTsConfigTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class UserTsConfigTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var UserTsConfig
diff --git a/typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php b/typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php
index 41a990f13787eee8b1b856e878c61b2a544fe25e..1b51ca7a34c0bbfab08d5266d9850b7a7cc6f649 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\InlineStackProcessor;
 /**
  * Test case
  */
-class InlineStackProcessorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class InlineStackProcessorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php b/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php
index 137d4da15af0758bb347d50559123eb6a28938a2..677ca15f6531021e3cb74f65edf21651fbe0a927 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Backend\Form\NodeResolverInterface;
 /**
  * Test case
  */
-class NodeFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class NodeFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Form/Utility/FormEngineUtilityTest.php b/typo3/sysext/backend/Tests/Unit/Form/Utility/FormEngineUtilityTest.php
index e33580c4333bb8aff8ed13ae54a07260e72335fa..7b9dfed511b7d55d5648972e1290d9e6fe3fe1e2 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/Utility/FormEngineUtilityTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/Utility/FormEngineUtilityTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Form\Utility\FormEngineUtility;
 /**
  * Test case
  */
-class FormEngineUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FormEngineUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Form/Wizard/SuggestWizardTest.php b/typo3/sysext/backend/Tests/Unit/Form/Wizard/SuggestWizardTest.php
index b7d12c3b5ed99c5f94829cf8242d4eab225e61ff..d08243da9177cfb49bb9fafd05138ae9edc11d6a 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/Wizard/SuggestWizardTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/Wizard/SuggestWizardTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Fluid\View\StandaloneView;
 /**
  * Test case
  */
-class SuggestWizardTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SuggestWizardTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Module/ModuleLoaderTest.php b/typo3/sysext/backend/Tests/Unit/Module/ModuleLoaderTest.php
index 4a8eaf038c09ea696d5e334a0204482cefcab290..28f94a66e72cfa75b4a04dd882b3bd0c2377190d 100644
--- a/typo3/sysext/backend/Tests/Unit/Module/ModuleLoaderTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Module/ModuleLoaderTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Module\ModuleLoader;
 /**
  * Test case
  */
-class ModuleLoaderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ModuleLoaderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected function setUp()
     {
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/FullyRenderedButtonTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/FullyRenderedButtonTest.php
index 6d33a6534ea725969b9a576c4c8a9a25fb32c886..c436bf7607067a8a0f7c644f0e12dea48bbe6727 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/FullyRenderedButtonTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/FullyRenderedButtonTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Template\Components\Buttons\FullyRenderedButton;
 /**
  * Test case for FullyRenderedButton
  */
-class FullyRenderedButtonTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FullyRenderedButtonTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Try to valide an empty button
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/InputButtonTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/InputButtonTest.php
index 0bc856bb50db5deb47b24ddefc2d70b280c8d8a6..63cb7a1466b33d5f44434e5105f1d18e767ae18f 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/InputButtonTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/InputButtonTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Imaging\Icon;
 /**
  * Test case for InputButton
  */
-class InputButtonTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class InputButtonTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Try to validate an empty button
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/LinkButtonTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/LinkButtonTest.php
index 28017a38a33999a0337e017f93d04f0596174a98..4a3ba9cbc1eb00a8118004f30e75e2a169ffbc16 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/LinkButtonTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/LinkButtonTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Imaging\Icon;
 /**
  * Test case for LinkButton
  */
-class LinkButtonTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LinkButtonTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Try validating an empty button
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/SplitButtonTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/SplitButtonTest.php
index 82b46d28354f55156c4cc0a61b1e3c51ea047bfa..cee923da8ca9d7f4577f9333448808c04043ad4e 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/Button/SplitButtonTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/Button/SplitButtonTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Imaging\Icon;
 /**
  * Class BackendModuleRequestHandlerTest
  */
-class SplitButtonTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SplitButtonTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Try to validate an empty button
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/Menu/MenuItemTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/Menu/MenuItemTest.php
index 2ffd357b13c7bc9e4e4f46b0b9ed9829df84b0a6..d3f65d067900d5d6575ffe2f84b98f04555b943b 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/Menu/MenuItemTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/Menu/MenuItemTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Template\Components\Menu\MenuItem;
 /**
  * Test case for MenuItem
  */
-class MenuItemTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MenuItemTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Try a blank menu Item
diff --git a/typo3/sysext/backend/Tests/Unit/Template/Components/MenuTest.php b/typo3/sysext/backend/Tests/Unit/Template/Components/MenuTest.php
index 4bff52c0db0203814548224332965bac7b88e345..9ee6ed40c902283d961b41ceb8fa47cfc64e3764 100644
--- a/typo3/sysext/backend/Tests/Unit/Template/Components/MenuTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Template/Components/MenuTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Backend\Template\Components\MenuRegistry;
 /**
  * Test case for Menu
  */
-class MenuTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MenuTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Try setting an empty menu
diff --git a/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php b/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
index ce02145ff68a02c47a197b106b68db25ebb047d7..221ad8245b33f94c648d1d8da49f50d1110cb382 100644
--- a/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Tree\Pagetree;
  * Test case
  * @TODO: Refactor the subject class and make it better testable, especially getNodes()
  */
-class DataProviderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DataProviderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Backend\Tree\Pagetree\DataProvider|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/backend/Tests/Unit/Tree/SortedTreeNodeCollectionTest.php b/typo3/sysext/backend/Tests/Unit/Tree/SortedTreeNodeCollectionTest.php
index bc43d57161e017e8ec511cc7f4d03089f2124d5a..9d15966e3608a76de5f4389ee5c2d1ef21f2c5dd 100644
--- a/typo3/sysext/backend/Tests/Unit/Tree/SortedTreeNodeCollectionTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Tree/SortedTreeNodeCollectionTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Tree;
 /**
  * Testcase for class \TYPO3\CMS\Backend\Tree\SortedTreeNodeCollection.
  */
-class SortedTreeNodeCollectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SortedTreeNodeCollectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected function createTestCollection()
     {
diff --git a/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeCollectionTest.php b/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeCollectionTest.php
index 855c4803d5c82455bc3f466431f00158795799cb..6c852033383d324ffccc39e76654e198244507e9 100644
--- a/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeCollectionTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeCollectionTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Tree;
 /**
  * Testcase for class \TYPO3\CMS\Backend\Tree\TreeNodeCollection.
  */
-class TreeNodeCollectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TreeNodeCollectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeTest.php b/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeTest.php
index a8cbcaca1774868b305d7edbbc9c0095fbae9b2b..f210126248d123ac435f8f4b30e359c51faecef6 100644
--- a/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Tree;
 /**
  * Testcase for class \TYPO3\CMS\Backend\Tree\TreeNode.
  */
-class TreeNodeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TreeNodeTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     //////////////////////
     // Utility functions
diff --git a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
index 12c8773d03d48bfae704a6accb39b5b0a93dfceb..dbfe3822c213e2e48181bb557c115def4a5b1530 100644
--- a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
@@ -35,7 +35,7 @@ use TYPO3\CMS\Lang\LanguageService;
 /**
  * Test case
  */
-class BackendUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     ///////////////////////////////////////
     // Tests concerning calcAge
diff --git a/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutCollectionTest.php b/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutCollectionTest.php
index 8b6a286b1625e75e991f04ea3b787849c2c30fea..2701e4ff487b40682e1815a25f5e08205fd3aeae 100644
--- a/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutCollectionTest.php
+++ b/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutCollectionTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\View\BackendLayout;
 /**
  * Testing collection of backend layouts.
  */
-class BackendLayoutCollectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendLayoutCollectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutTest.php b/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutTest.php
index ce848b17a80a31e2e5257990000f67d2d4126319..0e0bff3bd0bf79ea75632c7104d68d059b265bb4 100644
--- a/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutTest.php
+++ b/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\View\BackendLayout;
 /**
  * Testing backend layout representation.
  */
-class BackendLayoutTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendLayoutTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/backend/Tests/Unit/View/BackendLayout/DataProviderCollectionTest.php b/typo3/sysext/backend/Tests/Unit/View/BackendLayout/DataProviderCollectionTest.php
index 75f9950938325157b4e0c468be3eb2f224228259..80d4d0197f92aec6ac6dc74c572ce90b9d9af468 100644
--- a/typo3/sysext/backend/Tests/Unit/View/BackendLayout/DataProviderCollectionTest.php
+++ b/typo3/sysext/backend/Tests/Unit/View/BackendLayout/DataProviderCollectionTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\View\BackendLayout;
 /**
  * Testing collection of backend layout data providers.
  */
-class DataProviderCollectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DataProviderCollectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Backend\View\BackendLayout\DataProviderCollection
diff --git a/typo3/sysext/backend/Tests/Unit/View/BackendLayoutViewTest.php b/typo3/sysext/backend/Tests/Unit/View/BackendLayoutViewTest.php
index b00a6b853a874175b8ffdddfdae088f3a8dc97d7..22edc32f9cdf1bd34fbed4f0962cf001a75bbd45 100644
--- a/typo3/sysext/backend/Tests/Unit/View/BackendLayoutViewTest.php
+++ b/typo3/sysext/backend/Tests/Unit/View/BackendLayoutViewTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\View;
 /**
  * Testing behaviour of \TYPO3\CMS\Backend\View\BackendLayoutView
  */
-class BackendLayoutViewTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendLayoutViewTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Backend\View\BackendLayoutView|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php
index ad2cb39dd8e84d62bcb3fa309bd7b1d95c7b32a1..11772d69a54fd7fd6c0182934f79ec69f911747b 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Model;
  * Test case
  *
  */
-class ConstraintTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ConstraintTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Belog\Domain\Model\Constraint
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
index 9b2e024b926220a1e156dbf5c4eef3823db5db6d..97b22552eb3696deead5d7966f8096eb7bd09a85 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Model;
  * Test case
  *
  */
-class LogEntryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LogEntryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Belog\Domain\Model\LogEntry
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php
index eec65888913b440ee6b3a235f892998f451cebc1..cc3ee806f3bef9d89c124c2aaee1543e35b8bf9a 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Repository;
 /**
  * Test case
  */
-class HistoryEntryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class HistoryEntryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
index ab5d59ebea45ecddf26bdb706a1beef410bf1a8a..4674053023903b56591c910000e88adec912c3b3 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Repository;
 /**
  * Test case
  */
-class LogEntryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LogEntryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
index c7e971340c1079bd9bf1a3f1126a00bc8103de24..66fd3ec97a077e8ca36ec0fff6ebbafcc1a3e3da 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Repository;
 /**
  * Test case
  */
-class WorkspaceRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class WorkspaceRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php
index b321ee9c974a6ad19561c3e045380fbdd1314690..76e81cc3008081ea7ccdad14bb95b2c410232d48 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Model;
 /**
  * Test case
  */
-class BackendUserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendUserTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Beuser\Domain\Model\BackendUser
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php
index bf163750dbf66a28678eebf736045707400ce519..67a91956a38032dacba3832833e0290d92c2b5ba 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Model;
 /**
  * Test case for class \TYPO3\CMS\Beuser\Domain\Model\Demand
  */
-class DemandTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DemandTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Beuser\Domain\Model\Demand
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
index 667f1fcb51d711225ab24943e27fedb9786f256f..2478c52848ece516647bb8fd519f88a4e44c4192 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Repository;
 /**
  * Test case
  */
-class BackendUserRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendUserRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
index e9617f58dad4db7f3ed1792e84ff9907efc9370e..6d4336363763c67e786054118ed76c6f9e03e62f 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Repository;
 /**
  * Test case
  */
-class BackendUserSessionRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendUserSessionRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php b/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
index 72616f593119068957bb1a87da9317fc1be89114..c17c733cbaeaa5113dc3219093b6722355699392 100644
--- a/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Beuser\Tests\Unit\Service;
 /**
  * Test case
  */
-class ModuleDataStorageServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ModuleDataStorageServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Functional/Cache/Backend/Typo3DatabaseBackendTest.php b/typo3/sysext/core/Tests/Functional/Cache/Backend/Typo3DatabaseBackendTest.php
index 019e2cc42d59a51eebee372075a6d92d6e4b494c..9c2682147e121789c4330809ea3afdc89eef49a8 100644
--- a/typo3/sysext/core/Tests/Functional/Cache/Backend/Typo3DatabaseBackendTest.php
+++ b/typo3/sysext/core/Tests/Functional/Cache/Backend/Typo3DatabaseBackendTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
 /**
  * Test case
  */
-class Typo3DatabaseBackendTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class Typo3DatabaseBackendTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Functional/Cache/Frontend/VariableFrontendTest.php b/typo3/sysext/core/Tests/Functional/Cache/Frontend/VariableFrontendTest.php
index 40d066286512eb831c0c1a628f3e5ac33a14e55e..41955affb1dce7c6fb7af153830781fef5d3af25 100644
--- a/typo3/sysext/core/Tests/Functional/Cache/Frontend/VariableFrontendTest.php
+++ b/typo3/sysext/core/Tests/Functional/Cache/Frontend/VariableFrontendTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Cache\Frontend\VariableFrontend;
 /**
  * Test case
  */
-class VariableFrontendTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class VariableFrontendTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     public function insertSerializedArrayIntoLobAndRetrieveItDataProvider()
     {
diff --git a/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php b/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
index 0c1732c258a54bdd36dd8e10ef63c723b63c9ef0..f2f19438a92c0707a7c39310aea6b7269f40aa06 100644
--- a/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
+++ b/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case for \TYPO3\CMS\Core\Category\Collection\CategoryCollection
  */
-class CategoryCollectionTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class CategoryCollectionTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var CategoryCollection
diff --git a/typo3/sysext/core/Tests/Functional/Collection/RecordCollectionRepositoryTest.php b/typo3/sysext/core/Tests/Functional/Collection/RecordCollectionRepositoryTest.php
index 12b70772dfbdd9852ce98d3426fe1571491939b4..7e8b4c5de60afeaa454b1685a74ebb2b865a2e97 100644
--- a/typo3/sysext/core/Tests/Functional/Collection/RecordCollectionRepositoryTest.php
+++ b/typo3/sysext/core/Tests/Functional/Collection/RecordCollectionRepositoryTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 /**
  * Test case for \TYPO3\CMS\Core\Collection\RecordCollectionRepository
  */
-class RecordCollectionRepositoryTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class RecordCollectionRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var RecordCollectionRepository|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php
index 5a8d3cc0556f44e9cf06ada5779ccedde0c493c7..7fcfaac32c11ba93cd66c403ccd473390e33bda3 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Functional test for the DataHandler
  */
-abstract class AbstractDataHandlerActionTestCase extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+abstract class AbstractDataHandlerActionTestCase extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     const VALUE_BackendUserId = 1;
 
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTest.php
index e088b1f50b947feeda4d4792df7973cd6cc91dc4..e5a5299ff9ff84c4868a5d804205ab8b1c7ab776 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Tests related to DataHandler::getUnique()
  */
-class GetUniqueTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class GetUniqueTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected function setUp()
     {
diff --git a/typo3/sysext/core/Tests/Functional/Database/DatabaseConnectionTest.php b/typo3/sysext/core/Tests/Functional/Database/DatabaseConnectionTest.php
index f764c8fadf3e38a1540a9d711eb7f6324f7dbc2c..e5e920659b3d475f100b62710c2fa4d80466b6d0 100644
--- a/typo3/sysext/core/Tests/Functional/Database/DatabaseConnectionTest.php
+++ b/typo3/sysext/core/Tests/Functional/Database/DatabaseConnectionTest.php
@@ -13,13 +13,13 @@ namespace TYPO3\CMS\Core\Tests\Functional\Database;
  *
  * The TYPO3 project - inspiring people to share!
  */
-use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Core\Database\DatabaseConnection;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 
 /**
  * Test case for \TYPO3\CMS\Core\Database\DatabaseConnection
  */
-class DatabaseConnectionTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class DatabaseConnectionTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var DatabaseConnection
diff --git a/typo3/sysext/core/Tests/Functional/Database/PreparedStatementTest.php b/typo3/sysext/core/Tests/Functional/Database/PreparedStatementTest.php
index 197112a3c3120ab0009242fd49bf6e3fe613ec5c..d8917330f8036e929785baf888cf7579aa4e60fb 100644
--- a/typo3/sysext/core/Tests/Functional/Database/PreparedStatementTest.php
+++ b/typo3/sysext/core/Tests/Functional/Database/PreparedStatementTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Database\DatabaseConnection;
 /**
  * Test case for \TYPO3\CMS\Core\Database\PreparedStatement
  */
-class PreparedStatementTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class PreparedStatementTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var DatabaseConnection
diff --git a/typo3/sysext/core/Tests/Functional/Database/Schema/SchemaMigratorTest.php b/typo3/sysext/core/Tests/Functional/Database/Schema/SchemaMigratorTest.php
index d6e25cdef16bec068ad7cc648382d7df4eaa0e4a..81b5010938c544c108de56a2ae197daa6d9a7b51 100644
--- a/typo3/sysext/core/Tests/Functional/Database/Schema/SchemaMigratorTest.php
+++ b/typo3/sysext/core/Tests/Functional/Database/Schema/SchemaMigratorTest.php
@@ -28,7 +28,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case for \TYPO3\CMS\Core\Database\Schema\SchemaMigratorTest
  */
-class SchemaMigratorTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class SchemaMigratorTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var SqlReader
diff --git a/typo3/sysext/core/Tests/Functional/Log/Writer/DatabaseWriterTest.php b/typo3/sysext/core/Tests/Functional/Log/Writer/DatabaseWriterTest.php
index de2f34650a5fdb80e771e36dfa90636f228f3b34..0ecee81822f9ebee76e0820e3d75362fe951e807 100644
--- a/typo3/sysext/core/Tests/Functional/Log/Writer/DatabaseWriterTest.php
+++ b/typo3/sysext/core/Tests/Functional/Log/Writer/DatabaseWriterTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Log\Writer\DatabaseWriter;
 /**
  * Test case
  */
-class DatabaseWriterTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class DatabaseWriterTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Functional/Messaging/FlashMessageQueueTest.php b/typo3/sysext/core/Tests/Functional/Messaging/FlashMessageQueueTest.php
index f848b992fc61a62a769cc62a29c9824ce1c0a02c..26600e1c41ca043a27d8686752e3ec530c7d17b7 100644
--- a/typo3/sysext/core/Tests/Functional/Messaging/FlashMessageQueueTest.php
+++ b/typo3/sysext/core/Tests/Functional/Messaging/FlashMessageQueueTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 /**
  * Test case
  */
-class FlashMessageQueueTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class FlashMessageQueueTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
index 51d2797d2fa8e47010eb4a66230255de5d8bb9a8..5a98e40360000643f207d3f21e5d832458a19097 100644
--- a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
+++ b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Functional\Page;
 /**
  * Test case
  */
-class PageRendererTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class PageRendererTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Functional/RegistryTest.php b/typo3/sysext/core/Tests/Functional/RegistryTest.php
index fc239c85912c073776ef9eee43b6142edcc848c2..f315819b02e7db7e5420e04f660f152c9feb9ae7 100644
--- a/typo3/sysext/core/Tests/Functional/RegistryTest.php
+++ b/typo3/sysext/core/Tests/Functional/RegistryTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Registry;
 /**
  * Test case
  */
-class RegistryTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class RegistryTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php b/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
index 148148889568a615a677a9d3a233fa03dd7c65d6..bac2ef9f85b0cfff44f07bf6a1294fe50e329235 100644
--- a/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
+++ b/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class ResourceStorageTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class ResourceStorageTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected function tearDown()
     {
diff --git a/typo3/sysext/core/Tests/Functional/Tca/BackendGroupsVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/BackendGroupsVisibleFieldsTest.php
index 4d4c6cd224c50f2bdc239433bad9237ce30d7efe..5924bfc7455d5e58700fc60fc359f5a5b8360400 100644
--- a/typo3/sysext/core/Tests/Functional/Tca/BackendGroupsVisibleFieldsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Tca/BackendGroupsVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class BackendGroupsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class BackendGroupsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $backendGroupsFields = [
         'hidden',
diff --git a/typo3/sysext/core/Tests/Functional/Tca/BackendUsersVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/BackendUsersVisibleFieldsTest.php
index 6e588f0ba7aebf6e4cd2c122a12c1e6b8eac14f1..37b6907272dab994a418e84778bcaa06ad27ecc6 100644
--- a/typo3/sysext/core/Tests/Functional/Tca/BackendUsersVisibleFieldsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Tca/BackendUsersVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class BackendUsersVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class BackendUsersVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $backendUserFields = [
         'disable',
diff --git a/typo3/sysext/core/Tests/Functional/Tca/CategoryVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/CategoryVisibleFieldsTest.php
index 7a0db3cf3718813042d205143d8c2fe9a183f29b..1036f9e145c36f23eadebaea4718098eca4f6615 100644
--- a/typo3/sysext/core/Tests/Functional/Tca/CategoryVisibleFieldsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Tca/CategoryVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class CategoryVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class CategoryVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $categoryFields = [
         'title',
diff --git a/typo3/sysext/core/Tests/Functional/Tca/CollectionVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/CollectionVisibleFieldsTest.php
index 652871f7f14ec7e641c976fcff9515a328e181ba..9c0bfb62fa9a0104e8c08468d66a0dd5790b2161 100644
--- a/typo3/sysext/core/Tests/Functional/Tca/CollectionVisibleFieldsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Tca/CollectionVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class CollectionVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class CollectionVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $collectionFields = [
         'title',
diff --git a/typo3/sysext/core/Tests/Functional/Tca/FileCollectionVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/FileCollectionVisibleFieldsTest.php
index 92b45ba14ba43f128586d81c87b76fbd8dcdb372..bf843a56f5842d28bcd87d09fbe8d5272c9e86fa 100644
--- a/typo3/sysext/core/Tests/Functional/Tca/FileCollectionVisibleFieldsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Tca/FileCollectionVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class FileCollectionVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class FileCollectionVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $fileCollectionFields = [
         'title',
diff --git a/typo3/sysext/core/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php
index d9953c99705a67717e4b8fd7fd1d8c889b6e53b9..4979ecb1e265afb59a3a1bef926a034c49b19d9a 100644
--- a/typo3/sysext/core/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class FileMetadataVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class FileMetadataVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $fileMetadataFields = [
         'title',
diff --git a/typo3/sysext/core/Tests/Functional/Tca/FileStorageVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/FileStorageVisibleFieldsTest.php
index 31f90756089a2d8fadd5fa69a2029cb29da383ac..6be0d94f737e36bc563747adfab6be6e7ec167e9 100644
--- a/typo3/sysext/core/Tests/Functional/Tca/FileStorageVisibleFieldsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Tca/FileStorageVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class FileStorageVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class FileStorageVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $fileStorageFields = [
         'name',
diff --git a/typo3/sysext/core/Tests/Functional/Tca/FilemountsVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/FilemountsVisibleFieldsTest.php
index 26f73e623a1c1eb19da440dee6c2f7dc1f05a28d..fb051ad1aebca1114b2471a833b05eeb7ec2413d 100644
--- a/typo3/sysext/core/Tests/Functional/Tca/FilemountsVisibleFieldsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Tca/FilemountsVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class FilemountsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class FilemountsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $filemountsFields = [
         'title',
diff --git a/typo3/sysext/core/Tests/Functional/Tca/LanguageVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/LanguageVisibleFieldsTest.php
index 4db21091c2cccae28c0b5301a15724c7d8373877..b91f7ffb4afd5ad617850ba15463ad3198007daf 100644
--- a/typo3/sysext/core/Tests/Functional/Tca/LanguageVisibleFieldsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Tca/LanguageVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class LanguageVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class LanguageVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $languageFields = [
         'title',
diff --git a/typo3/sysext/core/Tests/Functional/Tca/NewsVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/NewsVisibleFieldsTest.php
index 08f53af3a1e91f81f4400d34ed7c765bd26551b9..8e63359c69a698042d9d03566e1ad787be5ccbea 100644
--- a/typo3/sysext/core/Tests/Functional/Tca/NewsVisibleFieldsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Tca/NewsVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class NewsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class NewsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $newsFields = [
         'hidden',
diff --git a/typo3/sysext/core/Tests/Functional/Tca/PagesVisibleFieldsTest.php b/typo3/sysext/core/Tests/Functional/Tca/PagesVisibleFieldsTest.php
index 6d6c31542bbd32e9b98a8fef28b6855826da5a05..e22bb25daef84bddc44c529a4441670b4dcd87f3 100644
--- a/typo3/sysext/core/Tests/Functional/Tca/PagesVisibleFieldsTest.php
+++ b/typo3/sysext/core/Tests/Functional/Tca/PagesVisibleFieldsTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Page\PageRepository;
 use TYPO3\CMS\Lang\LanguageService;
 
-class PagesVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class PagesVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * These form fields a visisble in the default page types.
diff --git a/typo3/sysext/core/Tests/Functional/TypoScript/Parser/TypoScriptParserTest.php b/typo3/sysext/core/Tests/Functional/TypoScript/Parser/TypoScriptParserTest.php
index 352d0fc3a21ee75204c7d91b2928fb597db2e139..16467cdc86788f6ec292b1d7eac997fc11aa8e15 100644
--- a/typo3/sysext/core/Tests/Functional/TypoScript/Parser/TypoScriptParserTest.php
+++ b/typo3/sysext/core/Tests/Functional/TypoScript/Parser/TypoScriptParserTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Functional\TypoScript\Parser;
 /**
  * Functional test for TypoScriptParser
  */
-class TypoScriptParserTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class TypoScriptParserTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * This tests triggers an error if the serialize(unserialize())) call
diff --git a/typo3/sysext/core/Tests/Integrity/IntegrityTest.php b/typo3/sysext/core/Tests/Integrity/IntegrityTest.php
index 51092fb63cb7bd8167bd39c06746197091f96883..dcba5788c3a60a9cea3cb540f110a8699bc50554 100644
--- a/typo3/sysext/core/Tests/Integrity/IntegrityTest.php
+++ b/typo3/sysext/core/Tests/Integrity/IntegrityTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
  * should fail if some other test before destroys the environment with
  * invalid mocking or backups.
  */
-class IntegrityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class IntegrityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * This test fails if some test before called
diff --git a/typo3/sysext/core/Tests/Legacy/typo3/contrib/class.removexssTest.php b/typo3/sysext/core/Tests/Legacy/typo3/contrib/class.removexssTest.php
index 95fc0eef18fa18f3947036793599fea022a41a55..9f443d906182a2ab92770019194bf18e4fa117c0 100644
--- a/typo3/sysext/core/Tests/Legacy/typo3/contrib/class.removexssTest.php
+++ b/typo3/sysext/core/Tests/Legacy/typo3/contrib/class.removexssTest.php
@@ -17,7 +17,7 @@
  * @ see http://ha.ckers.org/xss.html
  * @ examples from http://ha.ckers.org/xssAttacks.xml
  */
-class RemoveXSSTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RemoveXSSTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
index f79311f8389b9483f7ff02ca65847cfd13f95016..9f26675124bd47eccb9eabee8aadb72da051256a 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
@@ -27,7 +27,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  * Testcase for class \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication
  *
  */
-class AbstractUserAuthenticationTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractUserAuthenticationTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
index 5d13437398ed061315d7926acd5066b8e5801d51..20d1dfc7c99de25b80166a3cb9542e2286f85467 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
@@ -28,7 +28,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for BackendUserAuthentication
  */
-class BackendUserAuthenticationTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendUserAuthenticationTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/AbstractBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/AbstractBackendTest.php
index e1aef87171c5d419714f1a7687ec228be82f620f..afe43bf19fb33dd1195f836ea37aff84f06d969f 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/AbstractBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/AbstractBackendTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Tests\Unit\Cache\Backend\Fixtures\ConcreteBackendFixture;
 /**
  * Test case
  */
-class AbstractBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
index a73f37f44d8c0693f379a166c10225a8868c7bb8..a5a9a3702a466620d42241796842e0252054e7ee 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Cache\Backend\ApcBackend;
  *
  * This file is a backport from FLOW3
  */
-class ApcBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ApcBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Sets up this testcase
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
index 900bc174c42476fdb1899537f34d500f6dcb5092..448094e121bc9e0419db3564f00997b04a01120d 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
@@ -14,11 +14,11 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Core\Cache\Backend\ApcuBackend;
 use TYPO3\CMS\Core\Cache\Exception;
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 
 /**
  * Test case for the APCu cache backend.
@@ -26,7 +26,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  * NOTE: If you want to execute these tests you need to enable apc in
  * cli context (apc.enable_cli = 1) and disable slam defense (apc.slam_defense = 0)
  */
-class ApcuBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ApcuBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Set up
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
index ddb2587f9245ef53a0cce90c207ac7eeee562b03..767e8488d996d0e66ad105173becca9dd63f00da 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  *
  * This file is a backport from FLOW3
  */
-class FileBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Sets up this testcase
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
index 0e9a907da9cc8212ea83d613197416872a86a076..f1040480b7fc35425dffd047c6db2a56a16a1d20 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Cache\Backend\MemcachedBackend;
  *
  * This file is a backport from FLOW3
  */
-class MemcachedBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MemcachedBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Sets up this testcase
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php
index c002084c247fc255380aee1367c643da5de476d0..68cdf937ddd089c853ab757a06f9c2e876ec65a9 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
 /**
  * Testcase for the PDO cache backend
  */
-class PdoBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PdoBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Sets up this testcase
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
index 883aec472cb21b08b8739121d8472b504ad10f69..db4047c1e244ad89e7455e0503d90bced64c4a80 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
@@ -28,7 +28,7 @@ use TYPO3\CMS\Core\Cache\Exception\InvalidDataException;
  * Warning:
  * The unit tests use and flush redis database numbers 0 and 1!
  */
-class RedisBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RedisBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * If set, the tearDown() method will flush the cache used by this unit test.
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php
index 4d2f3b119041e8fa3e9c695f8547f5d6a60aab34..b597c8183c4a64a838369e7004b82c676b12d256 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  *
  * This file is a backport from FLOW3
  */
-class TransientMemoryBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TransientMemoryBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/Typo3DatabaseBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/Typo3DatabaseBackendTest.php
index 5e23570b2d430a2786b8bea1da5315f87246b77e..c6577ccf7c4b26acef5a9be2c89118ec5271f0f4 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/Typo3DatabaseBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/Typo3DatabaseBackendTest.php
@@ -26,7 +26,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class Typo3DatabaseBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class Typo3DatabaseBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
index 7ab2ae2163cd2e8cdd88ca1bf8eac4e4f9845023..b30493b756c7490a4683915640ecf69bcacfaa89 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Cache\Backend\WincacheBackend;
 /**
  * Testcase for the WinCache cache backend
  */
-class WincacheBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class WincacheBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Sets up this testcase
diff --git a/typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php b/typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php
index 01b3641727be361ec09704d9e168a9e6c553e422..1cb4974ce8c2669cec45ceaf40357f326a9af7c9 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache;
  *
  * This file is a backport from FLOW3
  */
-class CacheFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CacheFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php b/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
index 8d0b5f6888b2e5528a46001047a9a10f7da5c9bf..a5f3309f33f82dc2f0813868826d0e50724d7954 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
@@ -35,7 +35,7 @@ use TYPO3\CMS\Core\Tests\Unit\Cache\Fixtures\FrontendInitializeObjectFixture;
  *
  * This file is a backport from FLOW3
  */
-class CacheManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CacheManagerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php
index cb9dd2b9610b0645e233ab0ef33ed609c4c96106..bdd15d10938f1c8260176351f9c38dbc97a5ef3c 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Frontend;
  *
  * This file is a backport from FLOW3
  */
-class AbstractFrontendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractFrontendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php
index cac593b8583ff04380f57c79695a832719b6b92c..9b938725c00bf1ae26708cc3ebb850a012f2300f 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Cache\Exception\InvalidDataException;
  *
  * This file is a backport from FLOW3
  */
-class PhpFrontendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PhpFrontendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php
index f32cf86f6f6bd2b39d007d17d879c2020b8f5e74..914514db7319c3b22fdfa5020c4281cfb64b19d1 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Cache\Exception\InvalidDataException;
  *
  * This file is a backport from FLOW3
  */
-class StringFrontendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class StringFrontendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php
index 34ac9c9d37fe8a9edd162458c2cb712bece21120..bd012fa27fb6231d3dd513d53a2f826109460cfd 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Frontend;
  *
  * This file is a backport from FLOW3
  */
-class VariableFrontendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class VariableFrontendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php b/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php
index 97bcb374de3620b94bd71090985a4677efb8a29d..2d299cd74d6ccff80b718877c1e8044dbf988e89 100644
--- a/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Category;
 /**
  * Testcase for CategoryRegistry
  */
-class CategoryRegistryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CategoryRegistryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Category\CategoryRegistry
diff --git a/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php b/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php
index 8f858b033e08c098b7c904df29d746774311ea47..9bba17e3c8677145ae3696b31c9dbdf1628b7070 100644
--- a/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Category\Collection\CategoryCollection;
 /**
  * Test case for \TYPO3\CMS\Core\Category\Collection\CategoryCollection
  */
-class CategoryCollectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CategoryCollectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php b/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php
index 09909f1797ae6426406497ba40d4616933c1b68d..e75dfbcf9fabab80b8ed8b0400c6c8c818172ca0 100644
--- a/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Charset;
 /**
  * Testcase for \TYPO3\CMS\Core\Charset\CharsetConverter
  */
-class CharsetConverterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CharsetConverterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Charset\CharsetConverter
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php b/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
index 703e62b42b9e23743d5586ae9f9e5d610c62b422..d0d2beddbd15004d26b1187205d83e72fcaf16d0 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Configuration;
 /**
  * Test case
  */
-class ConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php b/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
index 0db3d567e80d288a279eafc088846e4c68d0c74a..8f1f86b136b6a148ebc11a1a91f7eef38a9c4707 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
@@ -50,7 +50,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class FlexFormToolsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FlexFormToolsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/Loader/YamlFileLoaderTest.php b/typo3/sysext/core/Tests/Unit/Configuration/Loader/YamlFileLoaderTest.php
index edb0393e538e1ff421835676b36bdc4404946820..e0b88542fb7f52d909816b4b24c439928e9bdf67 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/Loader/YamlFileLoaderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/Loader/YamlFileLoaderTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Configuration\Loader\YamlFileLoader;
 /**
  * Test case for the yaml file loader class
  */
-class YamlFileLoaderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class YamlFileLoaderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Generic method to check if the load method returns an array from a YAML file
@@ -92,7 +92,6 @@ betterthanbefore: 2
         $this->assertSame($expected, $output);
     }
 
-
     /**
      * Method checking for placeholders
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/RichtextTest.php b/typo3/sysext/core/Tests/Unit/Configuration/RichtextTest.php
index 58244dab719bffecca7e5090b090496b41780b19..9ec200a01baca7f5fb48e979c35ccf9eaa465a73 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/RichtextTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/RichtextTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Configuration\Richtext;
 /**
  * Test case
  */
-class RichtextTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RichtextTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php b/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php
index cb5ddafd55f354a940a36e31c3fa3c4cb081a41d..2a1f528bf7e0483d920dd0ffe7c6c5d9b739bc97 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test cases
  */
-class AbstractConditionMatcherTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractConditionMatcherTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Core\ApplicationContext
diff --git a/typo3/sysext/core/Tests/Unit/Core/ApplicationContextTest.php b/typo3/sysext/core/Tests/Unit/Core/ApplicationContextTest.php
index 3611ffa1d24a8d5c0f902c6de27f6ba8f249f79f..1b13c593628ed54a6dff14039b6451f01aa7274e 100644
--- a/typo3/sysext/core/Tests/Unit/Core/ApplicationContextTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/ApplicationContextTest.php
@@ -16,7 +16,7 @@ use TYPO3\CMS\Core\Core\ApplicationContext;
 /**
  * Testcase for the ApplicationContext class
  */
-class ApplicationContextTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ApplicationContextTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Data provider with allowed contexts.
diff --git a/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php b/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php
index 06972fd4c6ae613d50693dd07105811cc4ef971c..de30c6284b5a47086efde185941d36329f52e630 100644
--- a/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Package\PackageInterface;
 /**
  * Testcase for the ClassLoadingInformationGenerator class
  */
-class ClassLoadingInformationGeneratorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ClassLoadingInformationGeneratorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php b/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
index 1168c90d1d6aa7179ff2af8a7c66800291bd42c5..0d16fc07e3c34b79d334e2588423f1a44ada1ff2 100644
--- a/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Core;
 /**
  * Testcase
  */
-class SystemEnvironmentBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SystemEnvironmentBuilderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php b/typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php
index 4115cdd07d0c8da343c5af2fa99812a3eca33a6c..a662361e119fcb6475824abb761f0516f2fb799e 100644
--- a/typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php
+++ b/typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Crypto\Random;
 /**
  * Test case
  */
-class RandomTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RandomTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
index d4c7413ca74b53b9def44209361b39cd6832cfc4..66ca6483aef1bb9fe4eb950f47042cf62ab86a08 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\DataHandler;
  */
 
 use Prophecy\Argument;
-use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools;
@@ -23,11 +22,12 @@ use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Tests\Unit\DataHandling\Fixtures\AllowAccessHookFixture;
 use TYPO3\CMS\Core\Tests\Unit\DataHandling\Fixtures\InvalidHookFixture;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 
 /**
  * Test case
  */
-class DataHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DataHandlerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/core/Tests/Unit/Database/ConnectionPoolTest.php b/typo3/sysext/core/Tests/Unit/Database/ConnectionPoolTest.php
index caa9c523f7a0e0369c96c5399abaa84f1fb306b4..69ba8e35ff8e5bba0f49cb106f1fb2970e49a4c3 100644
--- a/typo3/sysext/core/Tests/Unit/Database/ConnectionPoolTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/ConnectionPoolTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
 /**
  * Test case
  */
-class ConnectionPoolTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ConnectionPoolTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php b/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
index fbbbd285fa1f30df5f444fbb0b3b49147ce1abf2..5c43d26560bf22510053a5ebc417a84596d6fc46 100644
--- a/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
@@ -28,7 +28,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  * Test case
  *
  */
-class ConnectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ConnectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Connection|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php b/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
index 476754af31f591b6669836f5d1e3c3f0c361bd53..15d50dba58493c30bfcfd9f7cc27baee789edbcb 100644
--- a/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
@@ -14,15 +14,15 @@ namespace TYPO3\CMS\Core\Tests\Unit\Database;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Core\Database\DatabaseConnection;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 
 /**
  * Test case
  *
  */
-class DatabaseConnectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseConnectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DatabaseConnection
diff --git a/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php b/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
index 9a843a9da63b50f8a369e125218289718b064626..a5ccfd71ffcc9ac8dd7fbe01688977c73c5f79f0 100644
--- a/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Database\PreparedStatement;
 /**
  * Test case
  */
-class PreparedStatementTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PreparedStatementTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|DatabaseConnection
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
index 43451caf06e3aa6e812dd367cb3e79081250eda2..69dcadfcc315ba25a2d9d69a946e44c132766c5b 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\Query\BulkInsertQuery;
 use TYPO3\CMS\Core\Tests\Unit\Database\Mocks\MockPlatform;
 
-class BulkInsertTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BulkInsertTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Connection
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Expression/ExpressionBuilderTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Expression/ExpressionBuilderTest.php
index 3236d5e58f2e5034582e53ef2d01cbcf80af2546..02c6b4c5d0f09eb39ebfa1faae8bb031d795fd71 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Expression/ExpressionBuilderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Expression/ExpressionBuilderTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Database\Query\Expression\CompositeExpression;
 use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
 use TYPO3\CMS\Core\Tests\Unit\Database\Mocks\MockPlatform;
 
-class ExpressionBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExpressionBuilderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Connection
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/QueryBuilderTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/QueryBuilderTest.php
index c1db965522f41b2b25a6dee186fe583a4d95691d..4be2759df99a680d4bb1d5d72869bc6090684379 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/QueryBuilderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/QueryBuilderTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Tests\Unit\Database\Mocks\MockPlatform;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class QueryBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class QueryBuilderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Connection|\Prophecy\Prophecy\ObjectProphecy
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/QueryHelperTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/QueryHelperTest.php
index 62999a9ac6e95a9958762e5dd7ce991361544ac4..69a0f1891417f4eebc51bc2bb325d0ccb0918ed9 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/QueryHelperTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/QueryHelperTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Database\Query\QueryHelper;
 /**
  * Query helper test
  */
-class QueryHelperTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class QueryHelperTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Test cases for stripping of leading logical operators in where constraints.
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/AbstractRestrictionTestCase.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/AbstractRestrictionTestCase.php
index f2f37d42b2d46f433460a4734761d0a059a99270..f191a5f58e2fae7b4d4a36be082c39dc676a5dc5 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/AbstractRestrictionTestCase.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/AbstractRestrictionTestCase.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
 use TYPO3\CMS\Core\Tests\Unit\Database\Mocks\MockPlatform;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class AbstractRestrictionTestCase extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractRestrictionTestCase extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
diff --git a/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php b/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
index c28544ea7c76d42c32e3f3d668c956fb3dc496a8..16576319aaf247a11804e5bd13c92944931db89f 100644
--- a/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Database;
 /**
  * Test case for \TYPO3\CMS\Core\Database\RelationHandler
  */
-class RelationHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RelationHandlerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Database\RelationHandler
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/ConnectionMigratorTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/ConnectionMigratorTest.php
index 4444303435f02680bd82bda166d94188bc50e8f9..cde3d4a75c9a58ab394bcc15323d25d870747eda 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/ConnectionMigratorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/ConnectionMigratorTest.php
@@ -26,7 +26,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Tests for ConnectionMigrator
  */
-class ConnectionMigratorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ConnectionMigratorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/EventListener/SchemaColumnDefinitionListenerTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/EventListener/SchemaColumnDefinitionListenerTest.php
index aaeb6544a20cab6a0a48bd4ca93e7b7de8ca4ed1..8b853878bac90c513c8595844b8d1b5bea473379 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/EventListener/SchemaColumnDefinitionListenerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/EventListener/SchemaColumnDefinitionListenerTest.php
@@ -30,7 +30,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class SchemaColumnDefinitionListenerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SchemaColumnDefinitionListenerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var SchemaColumnDefinitionListener
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/AbstractDataTypeBaseTestCase.php b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/AbstractDataTypeBaseTestCase.php
index d34ee2c55001f0889dcedaaac206c824d5799d77..47927f27748bcf664227fc7aad4dcc4a2f2ebc57 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/AbstractDataTypeBaseTestCase.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/AbstractDataTypeBaseTestCase.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Database\Schema\Parser\Parser;
 /**
  * Base class for test cases related to parser data types.
  */
-abstract class AbstractDataTypeBaseTestCase extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+abstract class AbstractDataTypeBaseTestCase extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Insert datatype to test into this create table statement
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ColumnDefinitionAttributesTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ColumnDefinitionAttributesTest.php
index dc916b0e86c0bb9c024d0535f0ec186f8936cfc8..0260e899615f039cf9b272d0d282bd4218d4cb2a 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ColumnDefinitionAttributesTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ColumnDefinitionAttributesTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Database\Schema\Parser\Parser;
 /**
  * Tests for CreateColumnDefinitionItem attributes
  */
-class ColumnDefinitionAttributesTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ColumnDefinitionAttributesTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Each parameter array consists of the following values:
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ColumnDefinitionItemTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ColumnDefinitionItemTest.php
index ac54e7a4c3d73931735e704d7484b7aac6a412b7..a10fa25103a9c3b3e6a70238a9ae4be5a79d5e14 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ColumnDefinitionItemTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ColumnDefinitionItemTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Database\Schema\Parser\Parser;
 /**
  * Tests for CreateColumnDefinitionItem
  */
-class ColumnDefinitionItemTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ColumnDefinitionItemTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/CreateTableFragmentTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/CreateTableFragmentTest.php
index d1c39ca1dc69718b844bc710d916d9ef88884859..6158d77131d31eb6a664d17647ed47e1d3285f5b 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/CreateTableFragmentTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/CreateTableFragmentTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Database\Schema\Parser\Parser;
 /**
  * Tests for CreateTableStatement
  */
-class CreateTableFragmentTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CreateTableFragmentTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Each parameter array consists of the following values:
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ForeignKeyDefinitionTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ForeignKeyDefinitionTest.php
index 06cce8c3cef28d31bbc9cdd5f79ea56599d1588c..2f50e11c5b335d2f7962b37d20d4301f2063d478 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ForeignKeyDefinitionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ForeignKeyDefinitionTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Database\Schema\Parser\Parser;
 /**
  * Tests for CreateForeignKeyDefinitionItem
  */
-class ForeignKeyDefinitionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ForeignKeyDefinitionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Each parameter array consists of the following values:
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/IndexDefinitionTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/IndexDefinitionTest.php
index fbf8d17169449c3d96eed574f4088fa5de02d187..efc6657f633b897b058e62cfd552a405e7a40559 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/IndexDefinitionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/IndexDefinitionTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Database\Schema\Parser\Parser;
 /**
  * Tests for CreateIndexDefinitionItem
  */
-class IndexDefinitionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class IndexDefinitionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Each parameter array consists of the following values:
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ReferenceDefinitionTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ReferenceDefinitionTest.php
index 8f289290b55d82067c1b8e545c3900c277f12744..1a8a10cb24ee33275465f2c9a2ca4f088d8bba2c 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ReferenceDefinitionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/ReferenceDefinitionTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Database\Schema\Parser\Parser;
 /**
  * Tests for ReferenceDefinition
  */
-class ReferenceDefinitionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ReferenceDefinitionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Each parameter array consists of the following values:
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/TableBuilderTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/TableBuilderTest.php
index 50794e885a9d1474e17c39b1307c31f5540bedcd..0f9d75e6b916de00a5c24123353c07060899d34c 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/TableBuilderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/TableBuilderTest.php
@@ -29,7 +29,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Tests for TableBuilder
  */
-class TableBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TableBuilderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Table
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/TableOptionsTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/TableOptionsTest.php
index c9a7ea118b4d7ea32d604cedee9b42de4d45318a..b0b91591ff3471c32b6d3b28ec476f8f7b0c5268 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/TableOptionsTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/Parser/TableOptionsTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Database\Schema\Parser\Parser;
 /**
  * Tests for CreateTableStatement table options
  */
-class TableOptionsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TableOptionsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Each parameter array consists of the following values:
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/SqlReaderTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/SqlReaderTest.php
index 643967aa068d7badcc90ea5bc0a65530282b06aa..2f6f3fe16293b86942d4f61edcaf5a3cb99a69f3 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/SqlReaderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/SqlReaderTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Tests for SqlReader
  */
-class SqlReaderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SqlReaderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var SqlReader
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/Types/EnumTypeTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/Types/EnumTypeTest.php
index d99fdaccd0e5f118d2b5ddad272c55122b4ed905..6ed65b44037113125d5dc31591167011d5c8278a 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/Types/EnumTypeTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/Types/EnumTypeTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Database\Schema\Types\EnumType;
 /**
  * Test for EnumType
  */
-class EnumTypeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class EnumTypeTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Set up the test subject
diff --git a/typo3/sysext/core/Tests/Unit/Database/Schema/Types/SetTypeTest.php b/typo3/sysext/core/Tests/Unit/Database/Schema/Types/SetTypeTest.php
index dffee9888ad4b4977730e4fc393badcd9626811b..04e86f9b71e5b694ae220d43ea9fdbc24a034b2b 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Schema/Types/SetTypeTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Schema/Types/SetTypeTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Database\Schema\Types\SetType;
 /**
  * Tests for SetType
  */
-class SetTypeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SetTypeTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Set up the test subject
diff --git a/typo3/sysext/core/Tests/Unit/Encoder/JavaScriptEncoderTest.php b/typo3/sysext/core/Tests/Unit/Encoder/JavaScriptEncoderTest.php
index 642be17cb2e0f0e8caa7107d76fa0b65ae515cff..be0dcd9de2bef44ae4d3e3cbbaebd3f0844e86ed 100644
--- a/typo3/sysext/core/Tests/Unit/Encoder/JavaScriptEncoderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Encoder/JavaScriptEncoderTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Encoder;
 /**
  * Test cases for TYPO3\CMS\Core\Encoder\JavaScriptEncoder.
  */
-class JavaScriptEncoderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class JavaScriptEncoderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Encoder\JavaScriptEncoder
diff --git a/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php b/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
index 0d0afeb1b57ff8cc4982477d50602f745aac2487..f3f0ce8db14df57d923d934523dee16c2a1335b5 100644
--- a/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Error;
 /**
  * testcase for the DebugExceptionHandler class.
  */
-class DebugExceptionHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DebugExceptionHandlerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Error\DebugExceptionHandler|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php b/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
index 037c3cf1b69777e609999d84fedc868d358c0192..5b37d52ee899dea229956b45cf7770c5b0172fbf 100644
--- a/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Error;
 /**
  * testcase for the \TYPO3\CMS\Core\Error\ProductionExceptionHandler class.
  */
-class ProductionExceptionHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ProductionExceptionHandlerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Error\ProductionExceptionHandler|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/core/Tests/Unit/FileStreamWrapperTest.php b/typo3/sysext/core/Tests/Unit/FileStreamWrapperTest.php
index 3686ffebff5aef3bc52baefb7e0c821de22c98f7..dc46caeca4e34596c9e9f6309f3aaba57ce4210f 100644
--- a/typo3/sysext/core/Tests/Unit/FileStreamWrapperTest.php
+++ b/typo3/sysext/core/Tests/Unit/FileStreamWrapperTest.php
@@ -20,7 +20,7 @@ use TYPO3\Components\TestingFramework\Core\FileStreamWrapper;
 /**
  * Test case for \TYPO3\CMS\Core\Tests\Unit\FileStreamWrapper
  */
-class FileStreamWrapperTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileStreamWrapperTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
index 03dc6c95dfa498b478e8e21b6f478647e812bf3b..9cbe07246ff7c58d685d6e378e85de4138b73098 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\FormProtection;
 /**
  * Testcase
  */
-class AbstractFormProtectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractFormProtectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
index a3f59ebb1b4d823e91e542f33a9253d5e9d05dfb..a46d28a0bca96fd40d296ab5bed34d9b607e7fa7 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Registry;
 /**
  * Testcase
  */
-class BackendFormProtectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendFormProtectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\FormProtection\BackendFormProtection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
index 4e97f000d4932484a834c1688c81a7e9ddaea939..bbc51b2ab39167ab8310c597b9c0d7b00d8b2669 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Registry;
 /**
  * Testcase
  */
-class FormProtectionFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FormProtectionFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected function tearDown()
     {
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
index ade8f80bbc54e207916263f5718a4dc8fcfb690b..9297447ecd5b49c3ae62f66b34ca61abe2876473 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\FormProtection;
 /**
  * Testcase
  */
-class InstallToolFormProtectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class InstallToolFormProtectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php b/typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php
index c7f166d6ecbee7c0eb4bcb2badfe8d1d5f3a75e3..5443a137ecba12f4c77617b27331e32e35007d07 100644
--- a/typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Html\HtmlParser;
 /**
  * Testcase for \TYPO3\CMS\Core\Html\HtmlParser
  */
-class HtmlParserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class HtmlParserTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Html\HtmlParser
diff --git a/typo3/sysext/core/Tests/Unit/Html/RteHtmlParserTest.php b/typo3/sysext/core/Tests/Unit/Html/RteHtmlParserTest.php
index 7e1da7cc43d100fca7e68c716d6c21048a9a7c9c..8a5d7fdae533e4b89595b2f392733356ec44f4a1 100644
--- a/typo3/sysext/core/Tests/Unit/Html/RteHtmlParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/Html/RteHtmlParserTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Html;
 /**
  * Testcase for \TYPO3\CMS\Core\Html\RteHtmlParser
  */
-class RteHtmlParserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RteHtmlParserTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Html\RteHtmlParser
diff --git a/typo3/sysext/core/Tests/Unit/Http/MessageTest.php b/typo3/sysext/core/Tests/Unit/Http/MessageTest.php
index 80464506627035e71c9340072bff5e4577baba49..a2ba8b1d62de3013dcf3ab392542cf300d779d4f 100644
--- a/typo3/sysext/core/Tests/Unit/Http/MessageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Http/MessageTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Http\Stream;
  *
  * Adapted from https://github.com/phly/http/
  */
-class MessageTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MessageTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Stream
diff --git a/typo3/sysext/core/Tests/Unit/Http/RequestTest.php b/typo3/sysext/core/Tests/Unit/Http/RequestTest.php
index ef9fdb26c6c6a66b8e9b045e6ede4071c87e43fe..5cdb5034f9d73a0e859d5723b5f57ac5ec21c65e 100644
--- a/typo3/sysext/core/Tests/Unit/Http/RequestTest.php
+++ b/typo3/sysext/core/Tests/Unit/Http/RequestTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Http\Uri;
  *
  * Adapted from https://github.com/phly/http/
  */
-class RequestTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RequestTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Request
diff --git a/typo3/sysext/core/Tests/Unit/Http/ResponseTest.php b/typo3/sysext/core/Tests/Unit/Http/ResponseTest.php
index 16352e0c7931c32c13e1203c43a2ab102cc469e2..45f7a8196794d0721919844d0036114db5c0f686 100644
--- a/typo3/sysext/core/Tests/Unit/Http/ResponseTest.php
+++ b/typo3/sysext/core/Tests/Unit/Http/ResponseTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Http\Stream;
  *
  * Adapted from https://github.com/phly/http/
  */
-class ResponseTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ResponseTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Response
diff --git a/typo3/sysext/core/Tests/Unit/Http/ServerRequestFactoryTest.php b/typo3/sysext/core/Tests/Unit/Http/ServerRequestFactoryTest.php
index ab4112bf4345c494917e362e14609d8fd690dc23..c7d414107cc2f007bc403d262ae7f005a3d1b670 100644
--- a/typo3/sysext/core/Tests/Unit/Http/ServerRequestFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Http/ServerRequestFactoryTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for \TYPO3\CMS\Core\Http\ServerRequestFactory
  */
-class ServerRequestFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ServerRequestFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Set up
diff --git a/typo3/sysext/core/Tests/Unit/Http/ServerRequestTest.php b/typo3/sysext/core/Tests/Unit/Http/ServerRequestTest.php
index 3b031039722dcfb2f5ba9a983b4922c8653ca8ea..8b1aa9565d68cc97596b9e46e1dcc81e938730bb 100644
--- a/typo3/sysext/core/Tests/Unit/Http/ServerRequestTest.php
+++ b/typo3/sysext/core/Tests/Unit/Http/ServerRequestTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Http\Uri;
  *
  * Adapted from https://github.com/phly/http/
  */
-class ServerRequestTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ServerRequestTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var ServerRequest
diff --git a/typo3/sysext/core/Tests/Unit/Http/StreamTest.php b/typo3/sysext/core/Tests/Unit/Http/StreamTest.php
index c5ecdd80460bafa69772bf6d5ab1085d7af2d8ed..ca946f7198d735561e9b8215c976046782f0efec 100644
--- a/typo3/sysext/core/Tests/Unit/Http/StreamTest.php
+++ b/typo3/sysext/core/Tests/Unit/Http/StreamTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Http\Stream;
  *
  * Adapted from https://github.com/phly/http/
  */
-class StreamTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class StreamTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Stream
diff --git a/typo3/sysext/core/Tests/Unit/Http/UploadedFileTest.php b/typo3/sysext/core/Tests/Unit/Http/UploadedFileTest.php
index 21dfbbe1e1014c1ccf74257b73b59ff9ab3116bf..3b1f50efeda12e8d9a9251ca9166cddf101da776 100644
--- a/typo3/sysext/core/Tests/Unit/Http/UploadedFileTest.php
+++ b/typo3/sysext/core/Tests/Unit/Http/UploadedFileTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  *
  * Adapted from https://github.com/phly/http/
  */
-class UploadedFileTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class UploadedFileTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected $tmpFile;
 
diff --git a/typo3/sysext/core/Tests/Unit/Http/UriTest.php b/typo3/sysext/core/Tests/Unit/Http/UriTest.php
index 1bfa232dea63be489eddac13be8071529e664fd6..5dcb4c90db9d034cfa89b9bea6c0edf84586b025 100644
--- a/typo3/sysext/core/Tests/Unit/Http/UriTest.php
+++ b/typo3/sysext/core/Tests/Unit/Http/UriTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Http\Uri;
  *
  * Adapted from https://github.com/phly/http/
  */
-class UriTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class UriTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php b/typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php
index fc59570a302d74ceaf0e015693f92bdb8499cfd9..7c44e6c9c88465a94d14d2e8a5f41413d1176f96 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Imaging\Icon;
 /**
  * Testcase for \TYPO3\CMS\Core\Imaging\Dimension
  */
-class DimensionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DimensionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Imaging\Dimension
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php b/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php
index a4606b148c43f2ff68167dfd2e7e81133af43d1c..be3c92ecba8fbd9fa7c885628472c343ec3f737d 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Imaging;
 /**
  * Testcase for \TYPO3\CMS\Core\Imaging\GraphicalFunctions
  */
-class GraphicalFunctionsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class GraphicalFunctionsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Imaging\GraphicalFunctions
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php
index 97222bd0ef6920ed57dfd3bc65c8c444c955add9..d1f0ffc1ab05edaa941a9af8e8229ff6242e7551 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Resource\File;
 /**
  * TestCase for \TYPO3\CMS\Core\Imaging\IconFactory
  */
-class IconFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class IconFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Imaging\IconFactory
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/BitmapIconProviderTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/BitmapIconProviderTest.php
index 2ee4a5eaa7402f54529185656f832ea025e82dd8..eb7e213e8397bf8215d2b54ec1bb9167f52fea44 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/BitmapIconProviderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/BitmapIconProviderTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider
  */
-class BitmapIconProviderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BitmapIconProviderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/FontawesomeIconProviderTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/FontawesomeIconProviderTest.php
index b08f6581e6f60a001a3427b550686c5ccf6d2410..ad3fea82974110f2d13ef21632524333d2837d99 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/FontawesomeIconProviderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/FontawesomeIconProviderTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for \TYPO3\CMS\Core\Imaging\IconProvider\FontawesomeIconProvider
  */
-class FontawesomeIconProviderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FontawesomeIconProviderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Imaging\IconProvider\FontawesomeIconProvider
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/SvgIconProviderTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/SvgIconProviderTest.php
index f12ddbd0b7c112df9d4a959e7d9624d4891acdb4..2b997adc9b67e761699edf0b1fd53b0bd6af044a 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/SvgIconProviderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconProvider/SvgIconProviderTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider
  */
-class SvgIconProviderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SvgIconProviderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconRegistryTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconRegistryTest.php
index 82d1407346ea2805ca05d3f165913f8291a5983f..a2875408dd731701b8af08e1adfc7df9dea6adf2 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconRegistryTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * TestCase for \TYPO3\CMS\Core\Imaging\IconRegistry
  */
-class IconRegistryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class IconRegistryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Imaging\IconRegistry
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconTest.php
index e8eeff5461d5c2d859902f182cbef87294d21533..5f1a50e1b8ec6c410ea66c2322ac1d9b50a417b6 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Type\Icon\IconState;
 /**
  * Testcase for \TYPO3\CMS\Core\Imaging\Icon
  */
-class IconTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class IconTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Imaging\Icon
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/EmailLinkHandlerTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/EmailLinkHandlerTest.php
index a6a127ea9f68a09198c3550daa93d4452cde107c..287dfb6ea2a02a41d3613717c8274c92ac85011f 100644
--- a/typo3/sysext/core/Tests/Unit/LinkHandling/EmailLinkHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/LinkHandling/EmailLinkHandlerTest.php
@@ -16,7 +16,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\LinkHandling;
 
 use TYPO3\CMS\Core\LinkHandling\EmailLinkHandler;
 
-class EmailLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class EmailLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php
index f2b24b585387b485606946390987ad7e3e29f1ee..01261ba0b2261ed5704933b9f46c1d589eada7e4 100644
--- a/typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Resource\ResourceStorage;
 use TYPO3\CMS\Core\Utility\MathUtility;
 
-class FileLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php
index 91ec1c06e30cacfdf83b695b41c5d9bf9cd82046..8c30e0c8a578e32997edf5fa1cf41d9e3f7b905b 100644
--- a/typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Resource\Folder;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Resource\ResourceStorage;
 
-class FolderLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FolderLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
index 5161d114ee2b25fb702ee6daf2d2711f973f22f1..c1b9b1422a19d111424b2f90855319207da0347b 100644
--- a/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
+++ b/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Resource\ResourceStorage;
 use TYPO3\CMS\Core\Utility\MathUtility;
 
-class LegacyLinkNotationConverterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LegacyLinkNotationConverterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Data to resolve strings to arrays and vice versa, external, mail, page
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/LinkServiceTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/LinkServiceTest.php
index 58208329bb51251ee5949685168b0baf52589ee1..0e6aea0348355a84f7021c53cace54668365b9ae 100644
--- a/typo3/sysext/core/Tests/Unit/LinkHandling/LinkServiceTest.php
+++ b/typo3/sysext/core/Tests/Unit/LinkHandling/LinkServiceTest.php
@@ -16,7 +16,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\LinkHandling;
 
 use TYPO3\CMS\Core\LinkHandling\LinkService;
 
-class LinkServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LinkServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Data to resolve strings to arrays and vice versa, external, mail, page
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/PageLinkHandlerTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/PageLinkHandlerTest.php
index 49ab7d2c8ff8c6249d458c85213702528623b1cc..2c781b937cfacf20ad6ae0b14a85e5d388ca9c89 100644
--- a/typo3/sysext/core/Tests/Unit/LinkHandling/PageLinkHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/LinkHandling/PageLinkHandlerTest.php
@@ -16,7 +16,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\LinkHandling;
 
 use TYPO3\CMS\Core\LinkHandling\PageLinkHandler;
 
-class PageLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PageLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/UrlLinkHandlerTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/UrlLinkHandlerTest.php
index f569de189279e2565c3cef2bef580e852b09fa90..fb2db609c489316cca47845a6b0589f6abf53657 100644
--- a/typo3/sysext/core/Tests/Unit/LinkHandling/UrlLinkHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/LinkHandling/UrlLinkHandlerTest.php
@@ -16,7 +16,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\LinkHandling;
 
 use TYPO3\CMS\Core\LinkHandling\UrlLinkHandler;
 
-class UrlLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class UrlLinkHandlerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/Localization/LocalesTest.php b/typo3/sysext/core/Tests/Unit/Localization/LocalesTest.php
index 399e93c38dfabfe56e3f3414f8a39a901695714e..57a26d16cd009bd18b6bf97ea1cb0419338d4830 100644
--- a/typo3/sysext/core/Tests/Unit/Localization/LocalesTest.php
+++ b/typo3/sysext/core/Tests/Unit/Localization/LocalesTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class LocalesTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LocalesTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Locales
diff --git a/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php b/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
index 010784a6f7d47951053238505f0841d623df54c9..63b58b368b7a68c3b3a4095ed48406347fe1ad7f 100644
--- a/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class LocalizationFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LocalizationFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Localization/Parser/LocallangXmlParserTest.php b/typo3/sysext/core/Tests/Unit/Localization/Parser/LocallangXmlParserTest.php
index 157113bd881068b76f0dae9f02add0a927dbf609..52f8f286f5c154544e984c2fe9a82c3f96be0552 100644
--- a/typo3/sysext/core/Tests/Unit/Localization/Parser/LocallangXmlParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/Localization/Parser/LocallangXmlParserTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Localization\LocalizationFactory;
 /**
  * Testcase for class \TYPO3\CMS\Core\Localization\Parser\LocallangXmlParser.
  */
-class LocallangXmlParserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LocallangXmlParserTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Localization\Parser\LocallangXmlParser
diff --git a/typo3/sysext/core/Tests/Unit/Localization/Parser/XliffParserTest.php b/typo3/sysext/core/Tests/Unit/Localization/Parser/XliffParserTest.php
index 68ff67a5739795bf93247f9324abf8ab7c6fd5cc..8d390f5483eaf13509bf094c1a88a819dacd6251 100644
--- a/typo3/sysext/core/Tests/Unit/Localization/Parser/XliffParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/Localization/Parser/XliffParserTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Localization\LocalizationFactory;
 /**
  * Testcase for class \TYPO3\CMS\Core\Localization\Parser\XliffParser.
  */
-class XliffParserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class XliffParserTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Localization\Parser\XliffParser
diff --git a/typo3/sysext/core/Tests/Unit/Locking/FileLockStrategyTest.php b/typo3/sysext/core/Tests/Unit/Locking/FileLockStrategyTest.php
index 5411c7f04e7a25398af4f4574ae160f874a94a7f..9ed4cd634f4e4204fcfa67618bf6410d25e1fdb0 100644
--- a/typo3/sysext/core/Tests/Unit/Locking/FileLockStrategyTest.php
+++ b/typo3/sysext/core/Tests/Unit/Locking/FileLockStrategyTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for \TYPO3\CMS\Core\Locking\FileLockStrategy
  */
-class FileLockStrategyTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileLockStrategyTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Locking/LockFactoryTest.php b/typo3/sysext/core/Tests/Unit/Locking/LockFactoryTest.php
index d107eca3cf00fff86971f76449602fc8e21dbc50..e5bfa9754661f13c226bf0844aa6f99e71269f66 100644
--- a/typo3/sysext/core/Tests/Unit/Locking/LockFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Locking/LockFactoryTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Tests\Unit\Locking\Fixtures\DummyLock;
 /**
  * Testcase for \TYPO3\CMS\Core\Locking\LockFactory
  */
-class LockFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LockFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var LockFactory|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/core/Tests/Unit/Locking/SemaphoreLockStrategyTest.php b/typo3/sysext/core/Tests/Unit/Locking/SemaphoreLockStrategyTest.php
index b30e88d31a2ac51a374c028238c98e9df17d8db0..1858b2d5e480d21150bd38839c866ecba22b0e1f 100644
--- a/typo3/sysext/core/Tests/Unit/Locking/SemaphoreLockStrategyTest.php
+++ b/typo3/sysext/core/Tests/Unit/Locking/SemaphoreLockStrategyTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Locking\SemaphoreLockStrategy;
 /**
  * Testcase for \TYPO3\CMS\Core\Locking\SemaphoreLockStrategy
  */
-class SemaphoreLockStrategyTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SemaphoreLockStrategyTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Set up the tests
diff --git a/typo3/sysext/core/Tests/Unit/Locking/SimpleLockStrategyTest.php b/typo3/sysext/core/Tests/Unit/Locking/SimpleLockStrategyTest.php
index 67c0c16f60efda88436e0719bbaf39e361f0ca6b..754822ec9053611afad8ffc986daa9b31eac0725 100644
--- a/typo3/sysext/core/Tests/Unit/Locking/SimpleLockStrategyTest.php
+++ b/typo3/sysext/core/Tests/Unit/Locking/SimpleLockStrategyTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for \TYPO3\CMS\Core\Locking\SimpleLockStrategy
  */
-class SimpleLockStrategyTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SimpleLockStrategyTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php b/typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php
index 67e5dba7f2681afb22b5a98b3ed8cdd3ecbac529..62b34d4c65baf8eb7ea50459dbe86af3ec2f7b33 100644
--- a/typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log;
 /**
  * Test case
  */
-class LogLevelTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LogLevelTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php b/typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php
index 97c7fd315f76017eec0df3dab727e9cdf975b8af..1f3a4c7b09fd9f31c14dfefa9e5aa68bf8b1b4cd 100644
--- a/typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log;
 /**
  * Test case
  */
-class LogManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LogManagerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Log\LogManager
diff --git a/typo3/sysext/core/Tests/Unit/Log/LogRecordTest.php b/typo3/sysext/core/Tests/Unit/Log/LogRecordTest.php
index 12b161dee3462b1f138d292e4e1a86b176ac6c53..ef8d55fc3f45924b3501fa0104f5a4c2a0b19d4d 100644
--- a/typo3/sysext/core/Tests/Unit/Log/LogRecordTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/LogRecordTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Log\LogRecord;
 /**
  * Test case
  */
-class LogRecordTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LogRecordTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Returns a \TYPO3\CMS\Core\Log\LogRecord
diff --git a/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php b/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php
index 8e9796255869700630e067e097fc3fc8e45797fe..1dc7a7a8f117bec61aff57583207a8c02fb1fdeb 100644
--- a/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Log\Writer\NullWriter;
 /**
  * Test case
  */
-class LoggerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LoggerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractMemoryTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractMemoryTest.php
index 2a0cc10b9604b7bf59c5515efb613e96fa97ce05..39c088e1c875edd0ee3979d4017fc5f97ee777b7 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractMemoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractMemoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log\Processor;
 /**
  * Test case
  */
-class AbstractMemoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractMemoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractProcessorTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractProcessorTest.php
index 0bd7afc7f78229b7dac574cecea07b7ce734a0d0..f00c4f3b6cfb907950a9f9a4f0a0b78aca696bd5 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractProcessorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractProcessorTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class AbstractProcessorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractProcessorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/IntrospectionProcessorTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/IntrospectionProcessorTest.php
index 32c1204cf7234f3d47027b4891a735efa1fe6798..3437c23280b032b3c66bcc10fd08ada18b2d7a24 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/IntrospectionProcessorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/IntrospectionProcessorTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log\Processor;
 /**
  * Test case
  */
-class IntrospectionProcessorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class IntrospectionProcessorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Log\Processor\IntrospectionProcessor
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryPeakUsageProcessorTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryPeakUsageProcessorTest.php
index d05b42309be3c8a972e6b662a214f3d80a9b697d..101041558c0f5d7016ab535ba59dacd13fa5d2ac 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryPeakUsageProcessorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryPeakUsageProcessorTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log\Processor;
 /**
  * Test case
  */
-class MemoryPeakUsageProcessorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MemoryPeakUsageProcessorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryUsageProcessorTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryUsageProcessorTest.php
index 3b12f712861f6ca8e44a367e29d43eeace623276..8c4d2e3f694eae30f826b774795ff43104dbcbdb 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryUsageProcessorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryUsageProcessorTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log\Processor;
 /**
  * Test case
  */
-class MemoryUsageProcessorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MemoryUsageProcessorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/WebProcessorTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/WebProcessorTest.php
index e4a6c8b257f138b7cb05184c4ed5f061a5bbec83..f7f4651c5a8070f37eeeac3f1c95a0c93723b330 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/WebProcessorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/WebProcessorTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log\Processor;
 /**
  * Test case
  */
-class WebProcessorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class WebProcessorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Log/Writer/AbstractWriterTest.php b/typo3/sysext/core/Tests/Unit/Log/Writer/AbstractWriterTest.php
index 8f86fbcf5f5827373f8308dba6471da9f5b79ad4..eed18e3549549694d2908044f05a45ac3e7ccc5e 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Writer/AbstractWriterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Writer/AbstractWriterTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Log\Exception\InvalidLogWriterConfigurationException;
 /**
  * Test case
  */
-class AbstractWriterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractWriterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php b/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php
index a3371a1a96425fd26dd1af825259f8b421c970e8..52b45c9fd8f0f696bb84f653c7665bc721d0059b 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class DatabaseWriterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseWriterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php b/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php
index 7517fc0e9211ee1ec5d667e6985a46ff14b455ae..ab7aa7bc744e9b57df166e86d56888c11de3cee6 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php
@@ -20,7 +20,7 @@ use org\bovigo\vfs\vfsStreamWrapper;
 /**
  * Test case
  */
-class FileWriterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileWriterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var string
diff --git a/typo3/sysext/core/Tests/Unit/Mail/MailMessageTest.php b/typo3/sysext/core/Tests/Unit/Mail/MailMessageTest.php
index 3988d5703a86bd89f8ef95c76e01190eba8af4a4..14831cb22d3194ee4cd39b7aad166313b0e8b8ad 100644
--- a/typo3/sysext/core/Tests/Unit/Mail/MailMessageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Mail/MailMessageTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Mail;
 /**
  * Testcase for the TYPO3\CMS\Core\Mail\MailMessage class.
  */
-class MailMessageTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MailMessageTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Mail\MailMessage
diff --git a/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php b/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
index 13101e1a055c03d9bc7ee6c0580a6659983704c3..16d33ad4698c3dbe1c3ba40ce4d3f2328584f3f5 100644
--- a/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Tests\Unit\Mail\Fixtures\FakeTransportFixture;
 /**
  * Testcase for the TYPO3\CMS\Core\Mail\Mailer class.
  */
-class MailerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MailerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Mail\Mailer
diff --git a/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageRendererResolverTest.php b/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageRendererResolverTest.php
index e0c7eff850df5088f1e9346b2e781930db9a0d7b..07782520afbbab87f12facc8afc741b3f5e886f4 100644
--- a/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageRendererResolverTest.php
+++ b/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageRendererResolverTest.php
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\Components\TestingFramework\Core\UnitTestCase;
 use TYPO3\CMS\Core\Messaging\FlashMessageRendererResolver;
 use TYPO3\CMS\Core\Messaging\Renderer\FlashMessageRendererInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Test case
diff --git a/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php b/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php
index c295f90de839c4380f1041de8f1db6a7109c2b10..d0ab77fd0ca98df38b3c573d61c3baffa4af8c58 100644
--- a/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php
+++ b/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
 /**
  * Test case
  */
-class FlashMessageServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FlashMessageServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Messaging\FlashMessageService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/BootstrapRendererTest.php b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/BootstrapRendererTest.php
index 4081d4d4c122d138c9eac5aac2e7722523026bae..f5edfec842b73b339b5b228c1d982d4c0dcf396f 100644
--- a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/BootstrapRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/BootstrapRendererTest.php
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\Components\TestingFramework\Core\UnitTestCase;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\Renderer\BootstrapRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Test case
diff --git a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/ListRendererTest.php b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/ListRendererTest.php
index b8632b7372babf6b7b0792acf24ccdf3f9ed8aa9..78bcacf91190c1589afdbffee527828a85ba17b9 100644
--- a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/ListRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/ListRendererTest.php
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\Components\TestingFramework\Core\UnitTestCase;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\Renderer\ListRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Test case
diff --git a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/PlaintextRendererTest.php b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/PlaintextRendererTest.php
index 056ab1e9c5ff770608d58240f2db86c4e56b9da0..2e374d9b4057eb694d5c59c1c36720e4eb58853c 100644
--- a/typo3/sysext/core/Tests/Unit/Messaging/Renderer/PlaintextRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Messaging/Renderer/PlaintextRendererTest.php
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Core\Tests\Unit\Messaging;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\Components\TestingFramework\Core\UnitTestCase;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\Renderer\PlaintextRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
  * Test case
diff --git a/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php b/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
index 20410537d5b9f49e32d396487a77eca28bf5a3bc..306ed0e61f362cd4655b9f40e381acc2229fc1eb 100644
--- a/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Migrations\TcaMigration;
 /**
  * Test case
  */
-class TcaMigrationTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TcaMigrationTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Package/DependencyResolverTest.php b/typo3/sysext/core/Tests/Unit/Package/DependencyResolverTest.php
index 4864c6d8de3c3b2974228517d9d7bb985087d761..5bf53723382ebb7c6171180f30f6fc02e784da00 100644
--- a/typo3/sysext/core/Tests/Unit/Package/DependencyResolverTest.php
+++ b/typo3/sysext/core/Tests/Unit/Package/DependencyResolverTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Service\DependencyOrderingService;
 /**
  * Test case
  */
-class DependencyResolverTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DependencyResolverTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
index 6cac1d555ab0401d76397c84b23f28c1df5a46fa..5f56c3337029e850b59b7cc7050b2b6e0ba85e00 100644
--- a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Package\PackageManager;
  * Testcase for the default package manager
  *
  */
-class PackageManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PackageManagerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var PackageManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface $packageManager
diff --git a/typo3/sysext/core/Tests/Unit/Package/PackageTest.php b/typo3/sysext/core/Tests/Unit/Package/PackageTest.php
index 2b892d3712f99f5394e2b8ad4939e724d43a22c5..bd9527e8458b9b5c3af80a969845d251ebde9481 100644
--- a/typo3/sysext/core/Tests/Unit/Package/PackageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Package/PackageTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Package\PackageManager;
  * Testcase for the package class
  *
  */
-class PackageTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PackageTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      */
diff --git a/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
index 1f472978e153f66016b7f2c90e0bfc9867dbaf9c..5c714d10a6a68791b75d940e18df4b7a44c5484c 100644
--- a/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Page\PageRenderer;
  *
  * @see According functional test case
  */
-class PageRendererTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PageRendererTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/RegistryTest.php b/typo3/sysext/core/Tests/Unit/RegistryTest.php
index 284364601aa4b0e362b6170671647b4632ccef0e..3f5f6dece49132551254a56788d00c76c550e05c 100644
--- a/typo3/sysext/core/Tests/Unit/RegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/RegistryTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Registry;
 /**
  * Test case
  */
-class RegistryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RegistryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php b/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
index b17c7873a66fd48badf4b2c24b3b008fc0af772c..3fc8384747038b7cf6927888de850608b7a7c79f 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Resource\ResourceStorage;
 /**
  * Testcase for the abstract file class of the TYPO3 FAL
  */
-class AbstractFileTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractFileTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php b/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
index b559df0cb440cdabc2c1b1a9ba09c07e63524289..9dd4246674474381b9a82bbea748d9537f7bf075 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
@@ -19,7 +19,7 @@ use org\bovigo\vfs\vfsStream;
 /**
  * Basic test case for the \TYPO3\CMS\Core\Resource\File tests
  */
-abstract class BaseTestCase extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+abstract class BaseTestCase extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var string
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php b/typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php
index bf0b1b75ea26d177026ebc9703d7f8405cc15c32..2291eba3513fe25b0f19370736cbf070c37dafe5 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Driver;
 /**
  * Testcase for the FAL driver registry.
  */
-class DriverRegistryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DriverRegistryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Resource\Driver\DriverRegistry
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php b/typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php
index 60973aea36a913b3d53724efcd2629ead363dda5..49ac81d04a9348871e712a9d50a7a9f591711439 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource;
  * Testcase for the file class of the TYPO3 FAL
  *
  */
-class FileReferenceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileReferenceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FileTest.php b/typo3/sysext/core/Tests/Unit/Resource/FileTest.php
index 030f34c7b329d22f9f1fe44b182dd4c9542c19e4..4bdef0babf332f620605915b5ab0aa3503f5fa07 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/FileTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/FileTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Resource\ResourceStorage;
 /**
  * Testcase for the file class of the TYPO3 FAL
  */
-class FileTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php b/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php
index 15c6ec115e29d7ebb32873e782a171d1db6ebfd3..86088d499ea55c3fe5b90abea9d35a9464007fb8 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Resource\Filter\FileNameFilter;
 /**
  * Testcase for the filename filter of the TYPO3 VFS
  */
-class FileNameFilterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileNameFilterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Return combinations of files and paths to test against.
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php b/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
index 6c117e6094bc381253e08e9d73a34322ff124163..f7f43dc595bd8eeeb248763952e77ba3fdddac2c 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
@@ -19,7 +19,7 @@ use org\bovigo\vfs\vfsStream;
 /**
  * Testcase for the storage collection class of the TYPO3 FAL
  */
-class FolderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FolderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Index/ExtractorRegistryTest.php b/typo3/sysext/core/Tests/Unit/Resource/Index/ExtractorRegistryTest.php
index dfeb9653ba643eb193d9fe1c6d2351f9a46ced27..e169ab2d0f8b42749ff5bf104db393c9dd0cc92d 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Index/ExtractorRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Index/ExtractorRegistryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Index;
 /**
  * Class ExtractorRegistryTest
  */
-class ExtractorRegistryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExtractorRegistryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php b/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php
index 9e0d475d4c3eb9d6395044422e08634db3fefa5c..239cc1d2c0488e890e490add18880c8ec9afa46f 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Resource\Index\Indexer;
 /**
  * Class IndexerTest
  */
-class IndexerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class IndexerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php b/typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php
index 74f33a28a25de2e9746946bd6290fcd41a041eae..e8f15b400aed7a249f375102dc84715372609e44 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Resource\ResourceStorage;
 /**
  * Testcase for the ProcessedFile class of the TYPO3 FAL
  */
-class ProcessedFileTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ProcessedFileTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|Folder
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Processing/LocalPreviewHelperTest.php b/typo3/sysext/core/Tests/Unit/Resource/Processing/LocalPreviewHelperTest.php
index d4d6cd0ba3aa4760a726c80df8baea6a1ed7ffa6..bfb6f107f52f44a8aaf4efd2ee4e793d564c1892 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Processing/LocalPreviewHelperTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Processing/LocalPreviewHelperTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Resource\Processing\TaskInterface;
 /**
  * Testcase for \TYPO3\CMS\Core\Resource\Processing\LocalPreviewHelper
  */
-class LocalPreviewHelperTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LocalPreviewHelperTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/AudioTagRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/AudioTagRendererTest.php
index 083e135d24207fea2848d70ff92ed0f61cf1d898..2aefc2e14f28ba4d663925eb526562bfb41b2b46 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/AudioTagRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/AudioTagRendererTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Rendering;
 /**
  * Class AudioTagRendererTest
  */
-class AudioTagRendererTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AudioTagRendererTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/RendererRegistryTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/RendererRegistryTest.php
index e7390b094e6025fe7fcaef8e01eb101024b97dba..2f0a54174fd5d42982154e184fef29d89b75af5c 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/RendererRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/RendererRegistryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Rendering;
 /**
  * Test cases for RendererRegistry
  */
-class RendererRegistryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RendererRegistryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Initialize a RendererRegistry and mock createRendererInstance()
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VideoTagRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VideoTagRendererTest.php
index cd86ea60c565c5c38bd32a80219f4c206adf4d49..f6e89db44cc732a0ec64d37809033a68a3991261 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VideoTagRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VideoTagRendererTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Rendering;
 /**
  * Class VideoTagRendererTest
  */
-class VideoTagRendererTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class VideoTagRendererTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
index f0f50f7fe0efa19ed99e97969b9d7858c6bc8cd1..7ceaf1f087c9a0c1c6f9bac39f0e26fc9c59a865 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Resource\Rendering\VimeoRenderer;
 /**
  * Class VimeoRendererTest
  */
-class VimeoRendererTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class VimeoRendererTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var VimeoRenderer|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
index bb849070e6074ec78b294372e85c91f553b18f99..3669f2bfd7fab72a4627d5e2023d03884c01cb62 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Class YouTubeRendererTest
  */
-class YouTubeRendererTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class YouTubeRendererTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var YouTubeRenderer|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php b/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
index f4b64fbe7a8d993c7b55ddbf3111cf08ea93a714..ddafd9f64be2a39b18b9bf79d93d08553aefc8c5 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class AbstractRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var AbstractRepository
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
index 4c90558b1cde757c1229170f1139c08af94ec6d9..a1654f88de1b58dcbfd1f229a0971479459742f6 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource;
 /**
  * Testcase for the factory of FAL
  */
-class ResourceFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ResourceFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/PlainTextExtractorTest.php b/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/PlainTextExtractorTest.php
index 71cf0ccb6c81f38a3cdae370950b155f50dd5051..0c0d2a2123954938877d25966bf03a2debf8aab8 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/PlainTextExtractorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/PlainTextExtractorTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Resource\TextExtraction\PlainTextExtractor;
 /**
  * Class PlainTextExtractorTest
  */
-class PlainTextExtractorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PlainTextExtractorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/TextExtractorRegistryTest.php b/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/TextExtractorRegistryTest.php
index 1b510e81e4b3ad1b3b547962bed3daf00644983a..c6075c4114b11f2b2f0c9a4914418c950531372b 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/TextExtractorRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/TextExtractorRegistryTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Resource\TextExtraction\TextExtractorRegistry;
 /**
  * Test cases for TextExtractorRegistry
  */
-class TextExtractorRegistryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TextExtractorRegistryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Initialize a TextExtractorRegistry and mock createTextExtractorInstance()
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php b/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
index 0b1d227b90903c07786f284408f1ceb26b07372e..2b46decfdbc3e0fb11ad913049fe3dba4346a8df 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Utility;
 /**
  * Test suite for filtering files by their extensions.
  */
-class FileExtensionFilterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileExtensionFilterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/core/Tests/Unit/Service/DependencyOrderingServiceTest.php b/typo3/sysext/core/Tests/Unit/Service/DependencyOrderingServiceTest.php
index c5dafd2040061e57031fd78bba506174513dd8a4..52b6f744c88b5c65c286073513b321aa195af30a 100644
--- a/typo3/sysext/core/Tests/Unit/Service/DependencyOrderingServiceTest.php
+++ b/typo3/sysext/core/Tests/Unit/Service/DependencyOrderingServiceTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Service\DependencyOrderingService;
 /**
  * Test case
  */
-class DependencyOrderingServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DependencyOrderingServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Service/MarkerBasedTemplateServiceTest.php b/typo3/sysext/core/Tests/Unit/Service/MarkerBasedTemplateServiceTest.php
index b91c9beefba03099e344d6474fe8e39410b57e02..e72cc3c279a29877365027657463cfbdf130ffd3 100644
--- a/typo3/sysext/core/Tests/Unit/Service/MarkerBasedTemplateServiceTest.php
+++ b/typo3/sysext/core/Tests/Unit/Service/MarkerBasedTemplateServiceTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Unit test for marker utility
  */
-class MarkerBasedTemplateServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MarkerBasedTemplateServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var MarkerBasedTemplateService
diff --git a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
index 23058f8bf98b730ae77a71d2d3ece65d68311992..52044b8d2b4f43c6f7895fbd10261901c15c08df 100644
--- a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
@@ -29,7 +29,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeDataProvider
  */
-class DatabaseTreeDataProviderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatabaseTreeDataProviderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|DatabaseTreeDataProvider|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php
index b944961181250dd608f5fc0921b4c58c18ba6ca9..1ed02a2a07a832ab15bc745eef6ded1781201d50 100644
--- a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Tree\TableConfiguration\TreeDataProviderFactory;
 /**
  * Test case
  */
-class TreeDataProviderFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TreeDataProviderFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TreeDataProviderFactory
diff --git a/typo3/sysext/core/Tests/Unit/Type/EnumerationTest.php b/typo3/sysext/core/Tests/Unit/Type/EnumerationTest.php
index 5e7f3b2f4d2a9924814d284c34bc8e47f30da996..ceae4d39912303bbf2e425e48c559746709fd230 100644
--- a/typo3/sysext/core/Tests/Unit/Type/EnumerationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Type/EnumerationTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Type\Exception\InvalidEnumerationValueException;
 /**
  * Test case
  */
-class EnumerationTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class EnumerationTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Type/File/FileInfoTest.php b/typo3/sysext/core/Tests/Unit/Type/File/FileInfoTest.php
index 485a75ab447d8a29eb1a3b8919e35ef1360dcbe0..a154b0450dc94c2c254aa99ca20c35e4166e5910 100644
--- a/typo3/sysext/core/Tests/Unit/Type/File/FileInfoTest.php
+++ b/typo3/sysext/core/Tests/Unit/Type/File/FileInfoTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Type\File;
 /**
  * Test case
  */
-class FileInfoTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileInfoTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/Type/File/ImageInfoTest.php b/typo3/sysext/core/Tests/Unit/Type/File/ImageInfoTest.php
index 7788265de2763f3d251ce225d2773340c7dc6ecd..00d271af56171141efd8f41e130264bd29942970 100644
--- a/typo3/sysext/core/Tests/Unit/Type/File/ImageInfoTest.php
+++ b/typo3/sysext/core/Tests/Unit/Type/File/ImageInfoTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Type\File;
 /**
  * Test case
  */
-class ImageInfoTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ImageInfoTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php b/typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php
index 6e5d47da9319d079f3b979315916ec89f151c5c6..92f64e677c19bff674042d1470956d390b86ec70 100644
--- a/typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\TypoScript\Parser;
 /**
  * Test case for \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser
  */
-class TypoScriptParserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TypoScriptParserTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php b/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
index db7b1ddd36a4ebe0043786ba177529e80c1e24f5..425f1320e5de64a2c2c8cd8810f538f87f71aeec 100644
--- a/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
+++ b/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for \TYPO3\CMS\Core\TypoScript\TemplateService
  */
-class TemplateServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TemplateServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\TypoScript\TemplateService
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php
index 178dd0fb3269c3b39acda5491953e5e9f4a1674e..45bddba7ce162c6629174a2b97a03ff85058f562 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\ArrayUtility;
 /**
  * Test case
  */
-class ArrayUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ArrayUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     ///////////////////////
     // Tests concerning filterByValueRecursive
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ClassNamingUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ClassNamingUtilityTest.php
index 5dd6ffd76fccb43877bceea834312453dc7515e7..262b2aa7fd991b86020c4e448f442ae747fa0262 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/ClassNamingUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/ClassNamingUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\ClassNamingUtility
  */
-class ClassNamingUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ClassNamingUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * DataProvider for translateModelNameToRepositoryName
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php
index af0bdebc66ea9d00310cbb5cfb6041c15fc0f898..d23485649764bfbd83327f5e05c37c0e83681342 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 /**
  * Testcase for the \TYPO3\CMS\Core\Utility\ClientUtility class.
  */
-class ClientUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ClientUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     //////////////////////////////////////////////////////////
     // Utility Functions
diff --git a/typo3/sysext/core/Tests/Unit/Utility/CommandUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/CommandUtilityTest.php
index 7580fceeeddc44a452cb1c354871ac814905fa78..a0438818a1c972103084b14963b5365300afbd5f 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/CommandUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/CommandUtilityTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Utility\CommandUtility;
 /**
  * Test case for class \TYPO3\CMS\Core\Utility\CommandUtility
  */
-class CommandUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CommandUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Data provider for getConfiguredApps
diff --git a/typo3/sysext/core/Tests/Unit/Utility/CsvUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/CsvUtilityTest.php
index 633f7766b1ce01516ddc12fe6c7e74f00177c05e..2f2323e59f2f3f1fca70f3c36fd721ba03c4ed17 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/CsvUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/CsvUtilityTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Utility\CsvUtility;
 /**
  * Test cases of CsvUtility
  */
-class CsvUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CsvUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @return array
diff --git a/typo3/sysext/core/Tests/Unit/Utility/DebugUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/DebugUtilityTest.php
index 4460056c2737619225fbb45e5f80aaf3ecebbc65..15c3415b3ad09f3d00034d719496296ad7537134 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/DebugUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/DebugUtilityTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\DebugUtility;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\DebugUtility
  */
-class DebugUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DebugUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected function tearDown()
     {
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
index e96cbd36c0385ac0d00cb268c86b1d2fca1d9e10..7cf43ccf11e2f6a947e44c72a57ac660ac2851a2 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
@@ -28,7 +28,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class ExtensionManagementUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExtensionManagementUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
index b480ef5ca53017109415d531729e59e279aaebb4..7180865767892cb3493ba40e34e4260a7e0b03fc 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
@@ -26,7 +26,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility
  */
-class ExtendedFileUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExtendedFileUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Sets up this testcase
diff --git a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
index 7e2b531b24bd5489b7f5646efbeadaa9c3b46636..151a1d14ce3c5c6a124ce564845ba2b9fd1dfd01 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
@@ -17,7 +17,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
 use org\bovigo\vfs\vfsStreamWrapper;
-use TYPO3\Components\TestingFramework\Core\FileStreamWrapper;
 use TYPO3\CMS\Core\Package\Package;
 use TYPO3\CMS\Core\Package\PackageManager;
 use TYPO3\CMS\Core\Tests\Unit\Utility\AccessibleProxies\ExtensionManagementUtilityAccessibleProxy;
@@ -30,11 +29,12 @@ use TYPO3\CMS\Core\Tests\Unit\Utility\Fixtures\ReplacementClassFixture;
 use TYPO3\CMS\Core\Tests\Unit\Utility\Fixtures\TwoParametersConstructorFixture;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\Components\TestingFramework\Core\FileStreamWrapper;
 
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\GeneralUtility
  */
-class GeneralUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class GeneralUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     const NO_FIX_PERMISSIONS_ON_WINDOWS = 'fixPermissions() not available on Windows (method does nothing)';
     /**
diff --git a/typo3/sysext/core/Tests/Unit/Utility/HttpUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/HttpUtilityTest.php
index 57a3b20277463ac6872419bd583429d39b84c534..4abe2ca659f920877b7ed3acebcf53acf9aed001 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/HttpUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/HttpUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\HttpUtility
  */
-class HttpUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class HttpUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @param array $urlParts
diff --git a/typo3/sysext/core/Tests/Unit/Utility/MailUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/MailUtilityTest.php
index e68bdb7bbb5f851cc26ec5f762ad301092e02dd5..078fca29f1d1b5210644fe1ff836d3f2c910db9a 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/MailUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/MailUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 /**
  * Testcase for the \TYPO3\CMS\Core\Utility\MailUtility class.
  */
-class MailUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MailUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/core/Tests/Unit/Utility/MathUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/MathUtilityTest.php
index 92619c90e1452392aa31e7f5503c66c2a1a8d6fa..b52f5b0b997e89e32d2f634413fa38a8355bb01a 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/MathUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/MathUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\MathUtility
  */
-class MathUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MathUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     //////////////////////////////////
     // Tests concerning forceIntegerInRange
diff --git a/typo3/sysext/core/Tests/Unit/Utility/PathUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/PathUtilityTest.php
index 8c5395a45e4b39e71c43e9dd5a43704c4da96f79..4efa8ea2c092234f3ead495a590673c065cd29a2 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/PathUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/PathUtilityTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Tests\Unit\Utility\Fixtures\WindowsPathUtilityFixture;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\PathUtility
  */
-class PathUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PathUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @param array $paths
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ResourceUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ResourceUtilityTest.php
index 8c5f98db75b0dbaef80793699fd037cf91e8ac62..d4527c3b9f543716e4fe07b21eac95b59d807217 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/ResourceUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/ResourceUtilityTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\ResourceUtility;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\ResourceUtility
  */
-class ResourceUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ResourceUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @return array
diff --git a/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
index a2a3ac4bfa4a151731f6096fdc08f0d18bcf75e7..c132cd4c6deb780faa081cc1e3085f7bb261276a 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\RootlineUtility;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\RootlineUtility
  */
-class RootlineUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RootlineUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var RootlineUtility|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php
index 0a84d35d82adbb4addb052ab19570ff786162e3b..f3cc7aab9671fb976d0295f3838cff6f8f9a78c8 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\StringUtility;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\StringUtility
  */
-class StringUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class StringUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Data provider for endsWithReturnsTrueForMatchingFirstPart
diff --git a/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php
index 898acfd67a945ec352e3a5fec050248d1589995b..606a27a87909797cbda198191addebd34a9225c3 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 /**
  * Testcase for class \TYPO3\CMS\Core\Utility\VersionNumberUtility
  */
-class VersionNumberUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class VersionNumberUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Data Provider for convertVersionNumberToIntegerConvertsVersionNumbersToIntegers
diff --git a/typo3/sysext/css_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php b/typo3/sysext/css_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php
index 958a9fa6ed78e73ce7ea4d92f57b05032aa21d53..755c5ed2abc9c5a4231e71b2c3d67d67a89817e4 100644
--- a/typo3/sysext/css_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php
+++ b/typo3/sysext/css_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['css_styled_content'];
 
diff --git a/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentFormatTest.php b/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentFormatTest.php
index 2608e21c59a1847ed7953d93893a166784313f22..f9479d458fe36bc0cb1d732c0940b69e3b4f3904 100644
--- a/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentFormatTest.php
+++ b/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentFormatTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Documentation\Tests\Unit\Domain\Model;
 /**
  * Test case
  */
-class DocumentFormatTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DocumentFormatTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Documentation\Domain\Model\DocumentFormat
diff --git a/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentTest.php b/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentTest.php
index 94c52d2e72f63c56d95fb81c055a8d31275f10e6..db1caa13b2c1c639ed8e5a56582eea69f6088622 100644
--- a/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentTest.php
+++ b/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Documentation\Tests\Unit\Domain\Model;
 /**
  * Test case
  */
-class DocumentTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DocumentTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Documentation\Domain\Model\Document
diff --git a/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentTranslationTest.php b/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentTranslationTest.php
index c26ce3ab46bc329f5a6c8d477cab8060629ec90a..2afc81d7dc99e32f34638a188bb9f262b3d9d258 100644
--- a/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentTranslationTest.php
+++ b/typo3/sysext/documentation/Tests/Unit/Domain/Model/DocumentTranslationTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Documentation\Tests\Unit\Domain\Model;
 /**
  * Test case
  */
-class DocumentTranslationTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DocumentTranslationTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Documentation\Domain\Model\DocumentTranslation
diff --git a/typo3/sysext/extbase/Tests/Functional/Configuration/BackendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Functional/Configuration/BackendConfigurationManagerTest.php
index 285bc91a4d3dd8280d41541c9ea95520ae254703..d4ada384c423b3282a9410ded490cfd72f77d015 100644
--- a/typo3/sysext/extbase/Tests/Functional/Configuration/BackendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Configuration/BackendConfigurationManagerTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Extbase\Service\TypoScriptService;
 /**
  * Test case
  */
-class BackendConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class BackendConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * Warning: white box test
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/AddTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/AddTest.php
index b59df89bda54d0438ed8b5fe6f79242f9d46055a..12562ecdb325e9cd642af4aa2b84a8f554a3c966 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/AddTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/AddTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Functional\Persistence;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class AddTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class AddTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php
index a30a9476ab8f7cfe75f2d930307a9011638051a6..d73c493a2a45892432e579db142d39fecec01358 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php
@@ -16,7 +16,7 @@ namespace TYPO3\CMS\Extbase\Tests\Functional\Persistence;
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class CountTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class CountTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var int number of all records
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapperTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapperTest.php
index e7f9eea6242109088d8632be4ed68c00b5b26010..d8885d37b6533d6e4287b6e1a22c8f1d266d3c12 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapperTest.php
@@ -5,7 +5,7 @@ use ExtbaseTeam\BlogExample\Domain\Model\Comment;
 use ExtbaseTeam\BlogExample\Domain\Model\DateExample;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class DataMapperTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class DataMapperTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/InTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/InTest.php
index cb90895230b2a79637ea9d3b7f53376d96aee6b2..f330f6bdd29cd5ef88455a9525a00477cc0abe9e 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/InTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/InTest.php
@@ -16,7 +16,7 @@ namespace TYPO3\CMS\Extbase\Tests\Functional\Persistence;
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class InTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class InTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var \ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php
index 11578dc12c7dabd76c774977a4a1b3a7c5cffba0..bfa1b0113aa39c2aa37f1b5e3c6d126562a9376a 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Functional\Persistence;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 
-class OperatorTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class OperatorTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var \ExtbaseTeam\BlogExample\Domain\Repository\BlogRepository
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php
index ec0e797b77c4bc92b417ace6a06625e659b4bd37..8279f904e822667bdf07991a6d18075db5e3099b 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php
@@ -16,7 +16,7 @@ namespace TYPO3\CMS\Extbase\Tests\Functional\Persistence;
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-class QueryParserTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class QueryParserTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
index 1081595aa72489594ae081ee2e37291ff4a0bf66..295ecf5c9f0f0ba0dc85a72c233e3f788a69e05b 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-class RelationTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class RelationTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var \ExtbaseTeam\BlogExample\Domain\Model\Blog
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
index 903fb25a58403e6e4ec4a0c5597b23cb20f5a36b..771e6cce7cfb7796a303458d685784496bbdd844 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 use TYPO3\CMS\Frontend\Page\PageRepository;
 
-class TranslationTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class TranslationTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var array
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
index f6cfa50722f35bbf4551ea2b52f1b42d8748cd82..becc6c7026bc5093822f4090dd1dbebe4dd25af1 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Configuration;
 /**
  * Test case
  */
-class AbstractConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Configuration\AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
index f52ce5da00c42cc5e204bfdc956606cb3a0f27d1..2cf2fcb60c43337ccd36ffc94216577e6cb9f04d 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
@@ -18,7 +18,7 @@ use Prophecy\Prophecy\ObjectProphecy;
 /**
  * Test case
  */
-class BackendConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
index 20c49d571b45159eafca95b3fc6481f8c0ccee6d..ea1e2d90bdb68ba7a50445ba0a69239e2923031d 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Extbase\Configuration\Exception\ParseErrorException;
 /**
  * Test case
  */
-class FrontendConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FrontendConfigurationManagerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php b/typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php
index ca8bf1fd0b16f9fc327c92347d8a4fa328b1e0a5..6c6a7c991ffb2f9bf089010274fa914c5b996e8e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Core;
 /**
  * Test case
  */
-class BootstrapTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BootstrapTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserGroupTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserGroupTest.php
index e4967addde6f66128e55af1c207e5f08da627eab..f6e8370cf9c76e1fd81b757fa4af30b269a8350b 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserGroupTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserGroupTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Model;
 /**
  * Test case
  */
-class BackendUserGroupTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendUserGroupTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserTest.php
index e301fbb21d2d3ba203bdf64fd3f6ed251e324bca..bfe5bef4a54d30828169d9e0d28630f518b6fbf8 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Model;
 /**
  * Test case
  */
-class BackendUserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendUserTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Domain\Model\BackendUser
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Model/CategoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Model/CategoryTest.php
index c8c6997cf486cc76df358d99b26cc54dcdd471cf..62d7f60b026b04acf05bf66472b4915361dc9df8 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Model/CategoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Model/CategoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Model;
 /**
  * Test case
  */
-class CategoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CategoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Domain\Model\Category
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Model/FileMountTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Model/FileMountTest.php
index 261944b2f30ebce3631dfc7eebda2baca518ade7..1a8e1e3480e1978ae638bb1d48f9ea4fad27b58a 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Model/FileMountTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Model/FileMountTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Model;
 /**
  * Test case
  */
-class FileMountTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileMountTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Domain\Model\FileMount
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserGroupTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserGroupTest.php
index d0ab3c53a71c6f067bac6dbd5b20bbf787f809c4..0e0d550b42a7311cb45197b10a1ac96c0f3accba 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserGroupTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserGroupTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Model;
 /**
  * Test case
  */
-class FrontendUserGroupTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FrontendUserGroupTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php
index cbd1911aef8851d3aea9dd7e65e1a93bbe29d074..eca92ee8b3cadef329352a9c2d23ef42cd8e4e6d 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Model;
 /**
  * Test case
  */
-class FrontendUserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FrontendUserTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Domain\Model\FrontendUser
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php
index a8cf5b2fcb5dc325328916b1b0bbd54e3ccd7ab4..87c7f6def38f7012036e0c473dfc6817b705b036 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Repository;
 /**
  * Test case
  */
-class BackendUserGroupRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendUserGroupRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
index e0454a2623a98ab59f4678c50f84d0754ff99e5f..03a812ce1014d4914c443d78fe0f42165866cdc5 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Repository;
 /**
  * Test case
  */
-class BackendUserRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendUserRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php
index aaf2cb5537719eefd4d38f8f711462845f881b80..8b1a2325053fb3efafb05fabaf750d646d7e3ea4 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Repository;
 /**
  * Test case
  */
-class CategoryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CategoryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/FileMountRepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/FileMountRepositoryTest.php
index f74f0877c2dde8430c71cdee1693f46612f358d9..37cdfc5d6069fdf40edfdad67c3963ac10ecfd58 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/FileMountRepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/FileMountRepositoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Domain\Repository;
 /**
  * Test case
  */
-class FileMountRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileMountRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/DomainObject/AbstractEntityTest.php b/typo3/sysext/extbase/Tests/Unit/DomainObject/AbstractEntityTest.php
index 091617909608688c782a9c9feae06fb159dfd912..b2897e7a3b175effeb583b25f4f00247390bd95c 100644
--- a/typo3/sysext/extbase/Tests/Unit/DomainObject/AbstractEntityTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/DomainObject/AbstractEntityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\DomainObject;
 /**
  * Test case
  */
-class AbstractEntityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractEntityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Error/ErrorTest.php b/typo3/sysext/extbase/Tests/Unit/Error/ErrorTest.php
index e49507e4185de1f61907ec978b6f5e4a4685ced0..f0add5402dd675efaada34a780d309e638e6e723 100644
--- a/typo3/sysext/extbase/Tests/Unit/Error/ErrorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Error/ErrorTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Error;
 /**
  * Test case
  */
-class ErrorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ErrorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Error/MessageTest.php b/typo3/sysext/extbase/Tests/Unit/Error/MessageTest.php
index 52de9901a874f954a228c52c11317f7305e27340..57df8d8bebc16373c3aa08eba0ef737cfc65abef 100644
--- a/typo3/sysext/extbase/Tests/Unit/Error/MessageTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Error/MessageTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Error;
 /**
  * Test case
  */
-class MessageTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MessageTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php b/typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php
index 5657e01638f0f452746ee36f6e492af6618c796c..8662a2bbc62c58602fa9ad432a1d60ff0b3444e3 100644
--- a/typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Error;
 /**
  * Test case
  */
-class ResultTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ResultTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Error\Result
diff --git a/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php b/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php
index 1edff2d676b5b268d0f3dcd076ea69bbc42147ae..0ae052b00243158ca2c2959eb1142ad61470ad6c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Hook\DataHandler;
 /**
  * Test case
  */
-class CheckFlexFormValueTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CheckFlexFormValueTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandManagerTest.php
index a14b5af93ad3cca2195ab7f81d21be48d40afe31..65311142a1e3938cfa83c15c010364bf1b37ad1e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandManagerTest.php
@@ -26,7 +26,7 @@ use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchCommandException;
 /**
  * Test case
  */
-class CommandManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CommandManagerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
index b90a90451a4b825e4c6020a8df84d7fd1bb7f19f..7166f84132de0d433a6a81fb5c2445bd93428885 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc\Cli;
 /**
  * Test case
  */
-class CommandTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CommandTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Mvc\Cli\Command|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php
index fa22403568123f478ae2ce3019b1773256ca2d3a..4568dd341c9ac05e7adf26333ad5955499f583f2 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentMixingException;
 /**
  * Test case
  */
-class RequestBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RequestBuilderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Mvc\Cli\RequestBuilder|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_Comparator_MockObject
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php
index c8b5bd2c39fe77e8e8b35d2cb702bd9118dd6aaf..b0748631d750fbe9ea58bf3f35b37d298828b97b 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc\Cli;
 /**
  * Test case
  */
-class RequestTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RequestTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Mvc\Cli\Request|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php
index c5f8514288fc7ef5fc54daf9d2c3bbe7ececdf85..a3c4cc2060ce8a77b6d40f6e9ee6a0bc43427738 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc\Controller;
 /**
  * Test case
  */
-class AbstractControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
index 356c111f62a286ec5ac9442ea389233f1feed38b..ac7ea2a16bac84a336bcae60f4a1d25833d83604 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchActionException;
 /**
  * Test case
  */
-class ActionControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ActionControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
index b151686c120ba0518b5edbe4baac29f432175c96..4cbbe1a2120bd23e0b8b0089399c8c69cdbccb86 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc\Controller;
 /**
  * Test case
  */
-class ArgumentTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ArgumentTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Mvc\Controller\Argument
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentsTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentsTest.php
index d81cdc7cf4c5ca5dbe6abc5c034a4cd3c695c0e5..ee0d59caf579c5b8f33999d17d3800e52c301735 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentsTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentsTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc\Controller;
 /**
  * Test case
  */
-class ArgumentsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ArgumentsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/CommandControllerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/CommandControllerTest.php
index b1310e0c2f7ecf610ab15bac436412fd1fdfb7fb..ac4a1fb07d99a64c12c240f8137781397f997af6 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/CommandControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/CommandControllerTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
 /**
  * Test case
  */
-class CommandControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CommandControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Mvc\Controller\CommandController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php
index 155a5041de4bc90aa193cc31fa5db2e8174dada7..90f1d23b03fa6d970122dd4700b40acc0ec6e143 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Extbase\Security\Exception\InvalidArgumentForHashGenerationExcepti
 /**
  * Test case
  */
-class MvcPropertyMappingConfigurationServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MvcPropertyMappingConfigurationServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Data provider for generating the list of trusted properties
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php
index b62f199140b3d7428c18ab834fff0fe3c05dff90..4fe343231f5387224ec6cb413445bf268834c231 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentTypeException;
 /**
  * Test case
  */
-class RequestTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RequestTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php
index b4f9b9bfa48e75db34107491743b798a9d6e7b61..d15a2b9520ad18543803165de91846e225c55314 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Mvc;
 /**
  * Test case
  */
-class ResponseTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ResponseTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Mvc\Response|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php
index 90d05026631a340473da2ae365721c78e2453dc3..3816a3d8e66eaf621094bb7b2227db4024d44c89 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Extbase\Mvc\View\JsonView;
  * Testcase for the JSON view
  *
  */
-class JsonViewTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class JsonViewTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Mvc\View\JsonView
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/CacheHashEnforcerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/CacheHashEnforcerTest.php
index 5ee13ccfa6b37a512b938b3adbecf9f8a7441d31..9647baf194003c4fe168a42bf0efd7a79448a774 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/CacheHashEnforcerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/CacheHashEnforcerTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Frontend\Page\CacheHashCalculator;
 /**
  * Test case
  */
-class CacheHashEnforcerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CacheHashEnforcerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Mvc\Web\CacheHashEnforcer
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
index 4848cbfdbb97b0b46a195a7b5b3aa29a348b82ee..e94dbf3e4560e070573d526786723401a002a4e6 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Extbase\Mvc\Exception\InvalidControllerNameException;
 /**
  * Test case
  */
-class RequestBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RequestBuilderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Mvc\Web\RequestBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
index 7a8e51d6a553f267b8b3c75495ae4850e534e316..94ef3ab6ef2798869294e0f3295e002c199a0adf 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
@@ -32,7 +32,7 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 /**
  * Test case
  */
-class UriBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class UriBuilderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var ConfigurationManagerInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php b/typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php
index 70677453986681dc25a5e8fa00b1515d63262b39..743957ae1a34ca6f03e7a32fefb787941ded49a7 100644
--- a/typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Extbase\Object\Container\Exception\UnknownObjectException;
 /**
  * Test case
  */
-class ClassInfoFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ClassInfoFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Object\Container\ClassInfoFactory
diff --git a/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php b/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
index 35adc9066b0f8e889e4ad27931e287b762d2f6ed..2c9fddf65ed7e90e29ef959bbe7957f2e36b07ef 100644
--- a/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Extbase\Object\Exception\CannotBuildObjectException;
 /**
  * Test case
  */
-class ContainerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ContainerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Object\Container\Container
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
index 0c7178376d42c04698cc48ab1e8bef542c21eec6..1689723a36e5f1a757d0b00e7236151f878c3cb3 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic;
 /**
  * Test case
  */
-class BackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
index 323d9eb249b4b47675c937f1803818c9188c5df3..3475955303004d8f5f92218384c96762abf9dcce 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
@@ -14,16 +14,16 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic\Mapper;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Core\DataHandling\TableColumnSubType;
 use TYPO3\CMS\Core\DataHandling\TableColumnType;
 use TYPO3\CMS\Extbase\Persistence\Generic\Exception\InvalidClassException;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 
 /**
  * Test case
  */
-class DataMapFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DataMapFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @return array
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
index 51565445e31edce0411e760403d8a22225de5e75..d2111b83ed8c9adcaeb0c623c9e4f6203446052f 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
@@ -14,16 +14,16 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic\Mapper;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 
 /**
  * Test case
  */
-class DataMapperTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DataMapperTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
index ce91ea257f23cf3891a21c62bca1c19e3906ea50..19943107b86fd893da780ccb89f49b851a1ade6c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic;
 /**
  * Test case
  */
-class PersistenceManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PersistenceManagerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php
index ff7263358a7678c9257bc1ff35be2729d3aed6bb..2f2e75661a0aceea5bfe327e66a23987b10f5778 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic;
 /**
  * Test case
  */
-class QueryFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class QueryFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var string
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
index 5bfd2a8ec031a7f39ce4c066d17388d1ef14f57a..862afaea30f3dc0f6c16f367e2fb803bfbbcf4cb 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic;
 /**
  * Test case
  */
-class QueryResultTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class QueryResultTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
index d9a8c359268bd9d5dc4233830bc3001c3d4a306e..b4f1bf505d9934ef8c94ae8a0b41fa95ff1bc4c0 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic;
 /**
  * Test case
  */
-class QueryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class QueryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\Query
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/SessionTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/SessionTest.php
index e503cb1b281673362491e40149b7981ae63d6abe..82f6b06a57b647ad32f2ba730ac8e730684fad86 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/SessionTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/SessionTest.php
@@ -13,7 +13,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic;
  *
  * The TYPO3 project - inspiring people to share!
  */
-class SessionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SessionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbBackendTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbBackendTest.php
index 7986a9f4ac7be435252172671618ebab4f8988d1..d29aaa6006e88206337fbdecb566681bea70c17c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbBackendTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbBackendTest.php
@@ -26,7 +26,7 @@ use TYPO3\CMS\Extbase\Service\EnvironmentService;
 /**
  * Test case
  */
-class Typo3DbBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class Typo3DbBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var DataMapper
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
index 2e89311eb344f90e217d6090b55a48d06a88d811..3ec2a1ef46dc94f4660dba34f4dedf8b49649284 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
@@ -32,7 +32,7 @@ use TYPO3\CMS\Extbase\Persistence\Generic\Qom\SourceInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbQueryParser;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 
-class Typo3DbQueryParserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class Typo3DbQueryParserTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var arary
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Typo3QuerySettingsTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Typo3QuerySettingsTest.php
index 5fff68bcd6b4177fc8e0b5aa68831d87a0b97384..52b1ddb3b124d69a7022e2e4821c61323b3e4343 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Typo3QuerySettingsTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Typo3QuerySettingsTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic;
 /**
  * Test case
  */
-class Typo3QuerySettingsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class Typo3QuerySettingsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/ObjectStorageTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/ObjectStorageTest.php
index 5510a7d1402c1a0e0b52faaadc29ccccb2981834..e2e3dffabe6dd2d35d1e5d229191b97b46551099 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/ObjectStorageTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/ObjectStorageTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence;
 /**
  * Test case
  */
-class ObjectStorageTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ObjectStorageTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
index b76d782d7c4c5c42df6c4fdfd30715c8728c23e8..2afbf503906c40a92275c39beed40582464e335b 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnsupportedMethodException;
 /**
  * Test case
  */
-class RepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Repository|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
index 041c1fca7f9626c3ea0c6e76999c196525dc95d6..7be3f3e32a14708ed1de0b1306c555a5eb6e6985 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
@@ -31,7 +31,7 @@ use TYPO3\CMS\Extbase\Tests\Unit\Property\Fixtures\DataProviderTwoInterface;
 /**
  * Test case
  */
-class PropertyMapperTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PropertyMapperTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected $mockConfigurationBuilder;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationBuilderTest.php
index 6aaa9baa2f84bae2038cc2337daa3623081e8d30..698e6ba3d89b0215a40f779339d876de09b75d5f 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationBuilderTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Property;
 /**
  * Test case
  */
-class PropertyMappingConfigurationBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PropertyMappingConfigurationBuilderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationBuilder
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationTest.php b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationTest.php
index 50f8d8e2737d2faaf865b2061497b10b183f0906..f4e4570efaefa58eb818ccd5d9947292bfed9a3a 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Property;
 /**
  * Test case
  */
-class PropertyMappingConfigurationTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PropertyMappingConfigurationTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ArrayConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ArrayConverterTest.php
index 5206f71aceb43e55ee9fe32f42b22f440dd9dbd8..94e68a19c2766f1ad2a241fadb6fab9f2e0bf4e5 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ArrayConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ArrayConverterTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Property\TypeConverter;
 /**
  * Test case
  */
-class ArrayConverterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ArrayConverterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Property\TypeConverter\ArrayConverter
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/BooleanConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/BooleanConverterTest.php
index 65c422e960af3103ffb4512209ac73cc6f599779..429e54db1723800a21125cb0f7f6312f8d70878e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/BooleanConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/BooleanConverterTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Property\TypeConverter;
 /**
  * Test case
  */
-class BooleanConverterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BooleanConverterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Property\TypeConverter\BooleanConverter
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/DateTimeConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/DateTimeConverterTest.php
index d60bf4eceb78af5f955e27b0ce2a2fd4f56d51d5..0ce03e76a63ba3d6f10fee4f4dcc6f907e57ffe0 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/DateTimeConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/DateTimeConverterTest.php
@@ -27,7 +27,7 @@ use TYPO3\CMS\Extbase\Tests\Unit\Property\TypeConverter\Fixtures\DateTimeSubFixt
 /**
  * Test case
  */
-class DateTimeConverterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DateTimeConverterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Property\TypeConverter\DateTimeConverter
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/FloatConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/FloatConverterTest.php
index 5e232e8467bf230e64ecd5498c10acffd4c60317..7242623599d8bc9e8e68ca546db461bdb3d54f9f 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/FloatConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/FloatConverterTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Property\TypeConverter;
 /**
  * Test case
  */
-class FloatConverterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FloatConverterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Property\TypeConverterInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/IntegerConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/IntegerConverterTest.php
index 15e79254b2c1120bf6cd4e8c0dbca2b97addbfd1..23be3638fb2a58a9024345b4ead5c653c6c13f3c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/IntegerConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/IntegerConverterTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Property\TypeConverter;
 /**
  * Test case
  */
-class IntegerConverterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class IntegerConverterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Property\TypeConverterInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ObjectConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ObjectConverterTest.php
index 99d943ff38ecff79e72bcf75151576135901ffae..ea23b6fbd6b3e2e601d15872dbab88c1fee7cde1 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ObjectConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ObjectConverterTest.php
@@ -26,7 +26,7 @@ use TYPO3\CMS\Extbase\Property\TypeConverter\ObjectConverter;
 /**
  * Test case
  */
-class ObjectConverterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ObjectConverterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var ObjectConverter
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
index ebac81b25bc3a106364b613ce4a2b6745cb54330..e29176476dbfa0ba81142bfb3cb9f3e69d7578a6 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
@@ -32,7 +32,7 @@ use TYPO3\CMS\Extbase\Tests\Unit\Property\TypeConverter\Fixtures\PersistentObjec
 /**
  * Test case
  */
-class PersistentObjectConverterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PersistentObjectConverterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Property\TypeConverterInterface|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/StringConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/StringConverterTest.php
index 9a92c8d440e8ded494131e275535e6ee2d8f721f..7c3addb820fe37a7a06c89144cac7725769199b3 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/StringConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/StringConverterTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Property\TypeConverter;
 /**
  * Test case
  */
-class StringConverterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class StringConverterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Property\TypeConverterInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchemaTest.php b/typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchemaTest.php
index 63828abd4c72a98b6e5852d7fdee179143d6ee39..d2e872bc3f834e682c397db5adf6b37ebbbdbbb7 100644
--- a/typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchemaTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchemaTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Reflection;
 /**
  * Test case
  */
-class ClassSchemaTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ClassSchemaTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/DocCommentParserTest.php b/typo3/sysext/extbase/Tests/Unit/Reflection/DocCommentParserTest.php
index 2adac4f368ea4f5121007d510f485e9af29424b0..86db239306c22b3ef02149af4d24b141dfd53674 100644
--- a/typo3/sysext/extbase/Tests/Unit/Reflection/DocCommentParserTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Reflection/DocCommentParserTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Extbase\Reflection\DocCommentParser;
 /**
  * Test case
  */
-class DocCommentParserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DocCommentParserTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/ObjectAccessTest.php b/typo3/sysext/extbase/Tests/Unit/Reflection/ObjectAccessTest.php
index 25bf961acd03fbe4e2fa673a1edb636ef3783263..f214998328be61cb0f561bfa1030132e2f8b9f09 100644
--- a/typo3/sysext/extbase/Tests/Unit/Reflection/ObjectAccessTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Reflection/ObjectAccessTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Extbase\Reflection\Exception\PropertyNotAccessibleException;
 /**
  * Test case
  */
-class ObjectAccessTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ObjectAccessTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected $dummyObject;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/ReflectionServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Reflection/ReflectionServiceTest.php
index d5f7e49a61d6c8129ceb76d3af5ecc2efc442e22..5779afb4f2b1585ed641ca0b85739f4cc82fec8a 100644
--- a/typo3/sysext/extbase/Tests/Unit/Reflection/ReflectionServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Reflection/ReflectionServiceTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Extbase\Reflection\ReflectionService;
  * @anothertest second test for reflection
  * @anothertest second test for reflection with second value
  */
-class ReflectionServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ReflectionServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @param array $foo The foo parameter
diff --git a/typo3/sysext/extbase/Tests/Unit/Scheduler/FieldProviderTest.php b/typo3/sysext/extbase/Tests/Unit/Scheduler/FieldProviderTest.php
index 0b5b6bc51231025f9ab929a79239cb20069f687b..3467ab7f736bd7a184f227e28c7ce550606a7eb8 100644
--- a/typo3/sysext/extbase/Tests/Unit/Scheduler/FieldProviderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Scheduler/FieldProviderTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Scheduler\Controller\SchedulerModuleController;
 /**
  * Test case
  */
-class FieldProviderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FieldProviderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php b/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
index 3d851752cb904f37a8810de9eaadaa64a279db5c..b99fd1f3a59cabf5462235e8669f0fefc4cf8cba 100644
--- a/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Scheduler;
 /**
  * Test case
  */
-class TaskTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TaskTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Scheduler\Task|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Security/Cryptography/HashServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Security/Cryptography/HashServiceTest.php
index 5b31f956415ea56d420b8df61fe90bbf5cbd414a..b9e00736b10df088edf278b66e6349f4d0fc8cec 100644
--- a/typo3/sysext/extbase/Tests/Unit/Security/Cryptography/HashServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Security/Cryptography/HashServiceTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Extbase\Security\Exception\InvalidHashException;
 /**
  * Test case
  */
-class HashServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class HashServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Security\Cryptography\HashService
diff --git a/typo3/sysext/extbase/Tests/Unit/Service/CacheServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Service/CacheServiceTest.php
index c934cf3d240e8914c00a8590a08d9d212a8c0da2..d34115e0f998ad930506bfdcb107d22791cd0a32 100644
--- a/typo3/sysext/extbase/Tests/Unit/Service/CacheServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Service/CacheServiceTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Service;
 /**
  * Test case
  */
-class CacheServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CacheServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Service\CacheService
diff --git a/typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php
index d6b072f9416595220f81b314c9fa4b3c50e86b63..9adf32b8e539a985fdb577af391c479af1e2fee8 100644
--- a/typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php
@@ -27,7 +27,7 @@ use TYPO3\CMS\Extbase\Exception;
 /**
  * Test case
  */
-class ExtensionServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExtensionServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Service/FlexFormServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Service/FlexFormServiceTest.php
index 1d525b61ecd72e82a608f0d797f737fe3c990216..7f59e422c429007b758b8462a68fa2ef7cf32b16 100644
--- a/typo3/sysext/extbase/Tests/Unit/Service/FlexFormServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Service/FlexFormServiceTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class FlexFormServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FlexFormServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array Backup of singletons
diff --git a/typo3/sysext/extbase/Tests/Unit/Service/ImageScriptServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Service/ImageScriptServiceTest.php
index b40ef967066fbd7e0260f286462484499a4e2f5c..e04ef285c52391f6a93a6c18e657219453829e66 100644
--- a/typo3/sysext/extbase/Tests/Unit/Service/ImageScriptServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Service/ImageScriptServiceTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Extbase\Service\ImageService;
 /**
  * Test case
  */
-class ImageScriptServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ImageScriptServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var ImageService
diff --git a/typo3/sysext/extbase/Tests/Unit/Service/TypoScriptServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Service/TypoScriptServiceTest.php
index d6d0266e2a049b1a0fb4e9c115010ead9d215d1f..ce4c3e4291b283839327c8d3214a41e6f3777915 100644
--- a/typo3/sysext/extbase/Tests/Unit/Service/TypoScriptServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Service/TypoScriptServiceTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Service;
 /**
  * Test case
  */
-class TypoScriptServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TypoScriptServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * data provider for convertTypoScriptArrayToPlainArray
diff --git a/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php b/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
index bcf43fd118afd69023250313d6cebaa99e619b53..1af4ecc299a0072161d55317cc546eb7ea5c1a3f 100644
--- a/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Extbase\Tests\Unit\SignalSlot\Fixtures\SlotMethodDoesNotExistFixtu
 /**
  * Test case
  */
-class DispatcherTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DispatcherTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/ArrayUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/ArrayUtilityTest.php
index ff5a4a87ea0b1197434435b818c898576fc3d122..9560955b16a95fe096922599445aaa0acbc51f3c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Utility/ArrayUtilityTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Utility/ArrayUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Utility;
 /**
  * Test case
  */
-class ArrayUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ArrayUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
index 4d473eb48ec52fa4cb81c279d749736e23e549c6..f42038ae70d756e8a65ded3d44785da2ee0599db 100644
--- a/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
 /**
  * Test case
  */
-class DebuggerUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DebuggerUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
index 3b3bab4f3b1e058fc1a43e75b3c72e2464596d32..528de3606bfc2637e6af6dd0597114b05ca1d888 100644
--- a/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Utility;
 /**
  * Testcase for class \TYPO3\CMS\Extbase\Utility\ExtensionUtility
  */
-class ExtensionUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExtensionUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected function setUp()
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php
index 473528d30eb6f8039fb94eec1d1afed342c78818..58adc902ba710cc8fa9dc683005120919558067a 100644
--- a/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 /**
  * Test case
  */
-class LocalizationUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LocalizationUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Instance of configurationManager, injected to subject
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractCompositeValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractCompositeValidatorTest.php
index 1a02ea599533e0e0439633b45684f1917cc2e94c..389b7df4e70426c0494e325e68a624ab8393fe2b 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractCompositeValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractCompositeValidatorTest.php
@@ -28,7 +28,7 @@ use TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator\Fixture\AbstractCompositeV
  *
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  */
-class AbstractCompositeValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractCompositeValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractValidatorTest.php
index 29a33e0685a8275224456218fcde1dc32876ab76..2180233273a7370c2c184bfda5f1290e5784afeb 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractValidatorTest.php
@@ -28,7 +28,7 @@ use TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator\Fixture\AbstractValidatorC
  *
  * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
  */
-class AbstractValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractValidatorTestcase.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractValidatorTestcase.php
index 54fd8a9db1af2b8576a367cdc8fa72991889d734..12dcd6058764fa1c72ad5d63ca13b59b94902719 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractValidatorTestcase.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AbstractValidatorTestcase.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator;
 /**
  * Test case for the Abstract Validator
  */
-abstract class AbstractValidatorTestcase extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+abstract class AbstractValidatorTestcase extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected $validatorClassName;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php
index 8568f51cef10e6c32523d4a311efa0952357417f..df7df3ec2e0d40b371c61d0ef468f0c79acd04de 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator;
 /**
  * Test case
  */
-class AlphanumericValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AlphanumericValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
index bf2a22dae8ca0425ae9ff75cf882d1e484f35630..80e4d193cac5963722443036178361af5c72932b 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator;
 /**
  * Test case
  */
-class CollectionValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CollectionValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var string
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
index 4aa0f0f3dae4b5f5d33a112af4710ab9be7b48dc..5a71d2cd47d2398e4f96f8c6c62ca0be054e7dba 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Extbase\Validation\Exception\NoSuchValidatorException;
 /**
  * Test case
  */
-class ConjunctionValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ConjunctionValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php
index 813d970ebe82c0cc5c44016556b60baf3af73cbb..8b38f3e338b0d54754a7ecede037975d1fabcfeb 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator;
 /**
  * Test case
  */
-class DisjunctionValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DisjunctionValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php
index 64466945b7c99e5b030cfdb390991fb8713a9dca..bb730147774ade83e7d7fb451941f1c4fd8889f6 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator;
 /**
  * Test case
  */
-class EmailAddressValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class EmailAddressValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Data provider with valid email addresses
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberRangeValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberRangeValidatorTest.php
index e9b1c75ffcce26762573842b530bb05d41687ce8..bd645570cbf0f6956ad3babcdfc4534aa003c8bc 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberRangeValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberRangeValidatorTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator;
 /**
  * Test case
  */
-class NumberRangeValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class NumberRangeValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected $validatorClassName = \TYPO3\CMS\Extbase\Validation\Validator\NumberRangeValidator::class;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberValidatorTest.php
index 5000e9b6a85404daa84e47025911ff81e26162aa..501447fd5c2cda6a18460d704589b6454e1b2977 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberValidatorTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator;
 /**
  * Test case
  */
-class NumberValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class NumberValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected $validatorClassName = \TYPO3\CMS\Extbase\Validation\Validator\NumberValidator::class;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php
index d7f48611ac85d8b82e807f9c65af6acbd5093a53..224a867f365337e3e792d110f22fced17e2ac488 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php
@@ -24,7 +24,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator;
 /**
  * Test case
  */
-class RegularExpressionValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RegularExpressionValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected $validatorClassName = \TYPO3\CMS\Extbase\Validation\Validator\RegularExpressionValidator::class;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
index f7ca65541f6478c9ccee017aa5adea032acf63af..fcb7368ba5b95a90443980e4f0e79463122d06e8 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Extbase\Validation\Exception\InvalidValidationOptionsException;
 /**
  * Test case
  */
-class StringLengthValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class StringLengthValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     protected $validatorClassName = \TYPO3\CMS\Extbase\Validation\Validator\StringLengthValidator::class;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorResolverTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorResolverTest.php
index 93982889cf03973c22fde43883b61ab03d681929..a2f8a0eeb2753f5dace83a01e404019ac8f31b78 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorResolverTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorResolverTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Extbase\Validation\Exception\NoSuchValidatorException;
 /**
  * Test case
  */
-class ValidatorResolverTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ValidatorResolverTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Validation\ValidatorResolver | \PHPUnit_Framework_MockObject_MockObject | \TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
index b2ac37600f6b7c5f20c3aaf4bf79f7038eb5715b..3bd896a409e65adb2e3e1bc2750d08043cecd0e2 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Controller;
  * Download from TER controller test
  *
  */
-class DownloadControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DownloadControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
index cb7ba85b0fc35c6588a64565af9179c9c323c93e..a8bfed436bd32a349f1294bfd9699048082a36ac 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
@@ -14,14 +14,14 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Controller;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Extensionmanager\Controller\UpdateFromTerController;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 
 /**
  * Update from TER controller test
  *
  */
-class UpdateFromTerControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class UpdateFromTerControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
index 2bf4ff3e4302183ec94acad91c06e0a86b280414..c1e15db4c0346e362550dc6b4c11f2228c96fb19 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Controller;
  * Update from TER controller test
  *
  */
-class UploadExtensionFileControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class UploadExtensionFileControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @return array The test data for getExtensionFromZipFileExtractsExtensionKey
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
index 039746814c9d80dbab8a101128906eea9f37b737..0bfa6f879291f36f55cd98186699b0298610758d 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
  * Download queue test
  *
  */
-class DownloadQueueTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DownloadQueueTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Extensionmanager\Domain\Model\DownloadQueue
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
index f6b45222742b0240b4bb673a3964f0896a15301a..fddfb76ac76f7c92ddfeff851cac832f4b88ac3f 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Domain\Model;
 /**
  * Extension test
  */
-class ExtensionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExtensionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Data provider for getCategoryIndexFromStringOrNumberReturnsIndex
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
index 687b4714298a7f69b71d26e2ffa6cf4b02abd434..5bc5eed0969efa89888df28c939f55ae27e5af87 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Domain\Repository;
  * Tests for ConfigurationItemRepository
  *
  */
-class ConfigurationItemRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ConfigurationItemRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extensionmanager\Domain\Repository\ConfigurationItemRepository|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
index dfda131f499f804bfbcc3993a2a8c08bb936a5ee..78b8bf95e3fe8693abd0be2a54211def9d4783ef 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Domain\Repository;
  * Test case
  *
  */
-class RepositoryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RepositoryRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Report/ExtensionStatusTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Report/ExtensionStatusTest.php
index 0782dbe41bfca06b08b8baa06c3a8b1f28c1c508..bd3ff5ae8101f7237b985407b6ff931537416ec0 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Report/ExtensionStatusTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Report/ExtensionStatusTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Report;
 /**
  * Test case
  */
-class ExtensionStatusTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExtensionStatusTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
index ccab3da50b8728af292095a67111665a0428c2e8..e8f9148924a3680a20900427fbe77a05570afb94 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Service;
  * Testcase
  *
  */
-class ExtensionManagementServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExtensionManagementServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
index 61e835f5130528505684d333f59238a108b87d95..eaf58d79cc3964089917f10d9cac6ae7eaa196ab 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Task;
  * Test case
  *
  */
-class UpdateExtensionListTaskTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class UpdateExtensionListTaskTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
index 2477350343244405be1427d23b4433679eda849e..9241ddd10358963b03c01b9351b1f2877d27e677 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
  * Configuration utility test
  *
  */
-class ConfigurationUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ConfigurationUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
index fefa107438185a19150ddf57ff9c5274f80d1b15..58b3bef6260b2ee7dd2b4f950bb35fc740617126 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
  * Test for DependencyUtility
  *
  */
-class DependencyUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DependencyUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php
index c9dd5ab223b3453b2d76fba3db1409d58bad7e58..5b7161db403903d7ddda64561ed9a0c07d87d721 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
 /**
  * Test case
  */
-class EmConfUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class EmConfUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php
index 50c85b7ff76ab904b99085101239d22f3cb1bea8..02811f468301a8093b7ba8a76f50710c38ae601c 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
 /**
  * Test for ExtensionModelUtilityTest
  */
-class ExtensionModelUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExtensionModelUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
index 86e6278d2e6b98b2d0b7093d471d988d363185d6..4c79c8ea34d7f5879ad44feed1801e27cda82529 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
  * Testcase
  *
  */
-class FileHandlingUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FileHandlingUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array List of created fake extensions to be deleted in tearDown() again
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
index 69e561d02d66c41a3e7b2ef91b52174f37a95b29..cab0fb4e445a31c0ea5a0c9fe41eb9ae5cd17aeb 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
 /**
  * Test case
  */
-class InstallUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class InstallUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var string
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
index 1c9f91d96bf187b8b53c2bce92dbc45ef3d0830c..ecc8db446a8cdb0ebc5062215021f42f21a3f975 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
  * List utility test
  *
  */
-class ListUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ListUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extensionmanager\Utility\ListUtility
diff --git a/typo3/sysext/felogin/Tests/Functional/Tca/ContentVisibleFieldsTest.php b/typo3/sysext/felogin/Tests/Functional/Tca/ContentVisibleFieldsTest.php
index 880efdbb7321abda625acf8fc9687413ffa23b45..d73f6fdcc45681e76222ad6921afbb307fa6604d 100644
--- a/typo3/sysext/felogin/Tests/Functional/Tca/ContentVisibleFieldsTest.php
+++ b/typo3/sysext/felogin/Tests/Functional/Tca/ContentVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['felogin'];
 
diff --git a/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php b/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
index e21287159a9bfdd366ef99e662528044359fc3f2..36e4ce174dc720274134ba9022a57dcc4553ee93 100644
--- a/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
+++ b/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
@@ -27,7 +27,7 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 /**
  * Test case
  */
-class FrontendLoginControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FrontendLoginControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Felogin\Controller\FrontendLoginController|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/filemetadata/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php b/typo3/sysext/filemetadata/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php
index bcd3a99add5284f99e013c43edb3bb593f54c19e..bf5f08538741b024ea5ef2b6dfd2dd4428977a08 100644
--- a/typo3/sysext/filemetadata/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php
+++ b/typo3/sysext/filemetadata/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class FileMetadataVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class FileMetadataVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['filemetadata'];
 
diff --git a/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php b/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php
index 662fecb217d3724a86eefdf78b92912043be3b69..69de2c9232820603b80f8aeeff72b41b8ee336ac 100644
--- a/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php
@@ -3,7 +3,7 @@ namespace TYPO3\Fluid\Tests\Functional;
 
 use TYPO3\CMS\Fluid\View\StandaloneView;
 
-class EscapeChildrenRenderingStandaloneTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class EscapeChildrenRenderingStandaloneTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $testExtensionsToLoad = ['typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test'];
 
diff --git a/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingTest.php b/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingTest.php
index f85d1a54dfe48d9cedf82e1342f5c2a3f4ccf484..7f5d11b6b01d2c669fe669b235aa9b24121c7ebc 100644
--- a/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingTest.php
@@ -3,7 +3,7 @@ namespace TYPO3\Fluid\Tests\Functional;
 
 use TYPO3\CMS\Fluid\View\TemplateView;
 
-class EscapeChildrenRenderingTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class EscapeChildrenRenderingTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $testExtensionsToLoad = ['typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test'];
 
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Cache/FluidTemplateCacheTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Cache/FluidTemplateCacheTest.php
index ec199afefe5a8aeb32f9067d50a531faa6e729e1..562142c0277cbb98b8c6dbc5bb9e4c2330937369 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Cache/FluidTemplateCacheTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Cache/FluidTemplateCacheTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Fluid\Core\Cache\FluidTemplateCache;
 /**
  * Test case
  */
-class FluidTemplateCacheTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FluidTemplateCacheTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Parser/PreProcessor/XmlnsNamespaceTemplatePreProcessorTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Parser/PreProcessor/XmlnsNamespaceTemplatePreProcessorTest.php
index bd46b44e39101aea6cc97232daabd9c8d3e7ccd4..a422d29761d7f5b8b0c51e5b46ac77c88d64d342 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Parser/PreProcessor/XmlnsNamespaceTemplatePreProcessorTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Parser/PreProcessor/XmlnsNamespaceTemplatePreProcessorTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture;
 /**
  * Class XmlnsNamespaceTemplatePreProcessorTest
  */
-class XmlnsNamespaceTemplatePreProcessorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class XmlnsNamespaceTemplatePreProcessorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @param string $source
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/LegacyNamespaceExpressionNodeTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/LegacyNamespaceExpressionNodeTest.php
index 326c6e3210a1d8fd4d92c6fd1ae456529a58d01b..159eba71a1683c3021046c73e2222a512174a014 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/LegacyNamespaceExpressionNodeTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/LegacyNamespaceExpressionNodeTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture;
 /**
  * Class LegacyNamespaceExpressionNodeTest
  */
-class LegacyNamespaceExpressionNodeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LegacyNamespaceExpressionNodeTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
index 788c0d3359d52ab6be815f6730ca23e4d6b43fa3..01994d443a9e8955de95ce4c7217bdd9de0b4f2d 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
@@ -21,7 +21,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
 /**
  * Test case
  */
-class RenderingContextTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RenderingContextTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Parsing state
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Variables/CmsVariableProviderTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Variables/CmsVariableProviderTest.php
index 48fc2cbdb413f527493fabab58606c30f4240838..df00f371e5fa9c70ee628a3c5bbf2e9e886cece0 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Variables/CmsVariableProviderTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Variables/CmsVariableProviderTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Fluid\Core\Variables\CmsVariableProvider;
 /**
  * Test case
  */
-class CmsVariableProviderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CmsVariableProviderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractViewHelperTest.php
index 2ce7fc675573e16551f96c7d1573f8cab909ad29..487a219231e7c37459ccdca2ff74b52d34d446fd 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractViewHelperTest.php
@@ -24,7 +24,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
 /**
  * Test case
  */
-class AbstractViewHelperTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractViewHelperTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Reflection\ReflectionService
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ArgumentDefinitionTest.php b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ArgumentDefinitionTest.php
index 6e6643d5f57d7623a107dbf8499d19334e887322..a6f3a15041695afb92e3a39167631dbb630d8099 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ArgumentDefinitionTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ArgumentDefinitionTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\Core\ViewHelper;
 /**
  * Test case
  */
-class ArgumentDefinitionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ArgumentDefinitionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ViewHelperResolverTest.php b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ViewHelperResolverTest.php
index 31214ecfb588a807826548e1f2cbd190d5e0342e..fbdcc2ac37cf8cde3eab04205fc0113e35929a29 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ViewHelperResolverTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ViewHelperResolverTest.php
@@ -22,7 +22,7 @@ use TYPO3Fluid\Fluid\ViewHelpers\RenderViewHelper;
 /**
  * Test case
  */
-class ViewHelperResolverTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ViewHelperResolverTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
index 0a2b2b195947d4f607400b8b927ad503f6af0dc6..2aad2206a5e9b2bf17c9dd075a042c1b57e96e7b 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Fluid\View\TemplateView;
 /**
  * Test case
  */
-class AbstractWidgetControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractWidgetControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
index 93eda163388d252671fc1f25f1d3120b79ab004a..f656991f6c9aeced3f391a50d0ce1efdf486c09e 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
@@ -22,7 +22,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
 /**
  * Test case
  */
-class AbstractWidgetViewHelperTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractWidgetViewHelperTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetViewHelper
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php
index f31a5261f7947f0becebdcc2889ab547e7528fb7..ef6fba325666c9dba6a229940dee0911a6095452 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Fluid\Core\Widget\Exception\WidgetContextNotFoundException;
 /**
  * Test case
  */
-class AjaxWidgetContextHolderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AjaxWidgetContextHolderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php
index f1f6c113b72212a0939408983ddf3a087073f5b1..c8a0840dc30cbc17596e30555083c167dd63f494 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Fluid\Core\Widget\WidgetContext;
 /**
  * Test case
  */
-class WidgetContextTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class WidgetContextTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Fluid\Core\Widget\WidgetContext
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestBuilderTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestBuilderTest.php
index 99b35efd9ba7a9a058528a6da48a527e45c91eed..9e6f2f49e6015cf634a69bbfba19aea6a460e4c8 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestBuilderTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestBuilderTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\Core\Widget;
 /**
  * Test case
  */
-class WidgetRequestBuilderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class WidgetRequestBuilderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Fluid\Core\Widget\WidgetRequestBuilder
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php
index 97a4d846d8d46ef43962c6d5575b9b879826faef..e13b7a1c3cc14f4eaa941c3128ff4e1b3067d17c 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Fluid\Core\Widget\WidgetRequestHandler;
 /**
  * Test case
  */
-class WidgetRequestHandlerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class WidgetRequestHandlerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Fluid\Core\Widget\WidgetRequestHandler
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php
index 290475bd9aa6e8ff7dc7c374424141c9ca3bc166..78901dda7d1f308b8024e933b38fd1bc1c212fb9 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\Core\Widget;
 /**
  * Test case
  */
-class WidgetRequestTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class WidgetRequestTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php b/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
index 12dc33bd1c0abca056e62dee9a266bab6e148a9d..dbc479dd20e115d60fb7859b2f866e2dcb8fd9d0 100644
--- a/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
@@ -13,15 +13,15 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\View;
  *
  * The TYPO3 project - inspiring people to share!
  */
-use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3\CMS\Fluid\View\AbstractTemplateView;
+use TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
 
 /**
  * Test case
  */
-class AbstractTemplateViewTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractTemplateViewTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var AbstractTemplateView|AccessibleObjectInterface
diff --git a/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php b/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
index db0e7f50bcaaa2d1652896690857ddbf7ebf1e77..609e8312240bf1e1222fa1aa06c5cfefb05fdcac 100644
--- a/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
@@ -31,7 +31,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
 /**
  * Test case
  */
-class StandaloneViewTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class StandaloneViewTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/fluid/Tests/Unit/View/TemplatePathsTest.php b/typo3/sysext/fluid/Tests/Unit/View/TemplatePathsTest.php
index 50b0a9f9219dbe13e0485aeb62e6d41bc67bb959..597e6f3bb831557310085580f5afdc05ac5bbb08 100644
--- a/typo3/sysext/fluid/Tests/Unit/View/TemplatePathsTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/View/TemplatePathsTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Fluid\View\TemplatePaths;
 /**
  * Test case
  */
-class TemplatePathsTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TemplatePathsTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @return array
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
index b080fb73e00d81a5b06a023993dd10f7cc05e11e..504509b55e50ead7403b48a1bdffc758d04c9d16 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\Components\TestingFramework\Core\UnitTestCase;
 use TYPO3\CMS\Core\Resource\FileReference;
 use TYPO3\CMS\Extbase\Service\ImageService;
 use TYPO3\CMS\Fluid\ViewHelpers\ImageViewHelper;
+use TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase;
 use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
 
 /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
index 54c38668970ffddb801ec8b630dee70b4ba9e954..d830b972096e356d650ccf8ec7530d95a62ec0a6 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 /**
  * Test case
  */
-class PaginateControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PaginateControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\Query
diff --git a/typo3/sysext/fluid_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php b/typo3/sysext/fluid_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php
index 517e8afa22f52288c212d5e6160cb41e9dff1b9b..59e43340cb052df8f85f280c4de136d5c56f56d3 100644
--- a/typo3/sysext/fluid_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php
+++ b/typo3/sysext/fluid_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['fluid_styled_content'];
 
diff --git a/typo3/sysext/form/Tests/Unit/Controller/AbstractBackendControllerTest.php b/typo3/sysext/form/Tests/Unit/Controller/AbstractBackendControllerTest.php
index 927c96cc7b3526e6d6732bf15ffd6c52da9c6413..8b60ae091534d13d0e6c8acf62382f85d5992d54 100644
--- a/typo3/sysext/form/Tests/Unit/Controller/AbstractBackendControllerTest.php
+++ b/typo3/sysext/form/Tests/Unit/Controller/AbstractBackendControllerTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Form\Controller\AbstractBackendController;
 /**
  * Test case
  */
-class AbstractBackendControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractBackendControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Controller/FormEditorControllerTest.php b/typo3/sysext/form/Tests/Unit/Controller/FormEditorControllerTest.php
index b16c7b1399b8e32f86d30f72da57f06915b520f6..333b1c284215f0833381da917cf66228283ab1ba 100644
--- a/typo3/sysext/form/Tests/Unit/Controller/FormEditorControllerTest.php
+++ b/typo3/sysext/form/Tests/Unit/Controller/FormEditorControllerTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Form\Service\TranslationService;
 /**
  * Test case
  */
-class FormEditorControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FormEditorControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Controller/FormFrontendControllerTest.php b/typo3/sysext/form/Tests/Unit/Controller/FormFrontendControllerTest.php
index b85c45beeb4b6e5ac09e737a33b0735a2b0b8f94..93147a894da1376147bc28ce72256852f389d9a3 100644
--- a/typo3/sysext/form/Tests/Unit/Controller/FormFrontendControllerTest.php
+++ b/typo3/sysext/form/Tests/Unit/Controller/FormFrontendControllerTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Form\Mvc\Configuration\TypoScriptService;
 /**
  * Test case
  */
-class FormFrontendControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FormFrontendControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Controller/FormManagerControllerTest.php b/typo3/sysext/form/Tests/Unit/Controller/FormManagerControllerTest.php
index 18c34ca75581b170520bf0db4eed27bb0f1a1577..aa17dc78bd2e49b09363811f21c881191828b8fc 100644
--- a/typo3/sysext/form/Tests/Unit/Controller/FormManagerControllerTest.php
+++ b/typo3/sysext/form/Tests/Unit/Controller/FormManagerControllerTest.php
@@ -28,7 +28,7 @@ use TYPO3\CMS\Form\Service\TranslationService;
 /**
  * Test case
  */
-class FormManagerControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FormManagerControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Domain/Configuration/ConfigurationServiceTest.php b/typo3/sysext/form/Tests/Unit/Domain/Configuration/ConfigurationServiceTest.php
index 4e827819fbb61dbd5e2184c330682bf9bdd23de6..e316fd3dbf0f37e9b1d09de643db54faa3134149 100644
--- a/typo3/sysext/form/Tests/Unit/Domain/Configuration/ConfigurationServiceTest.php
+++ b/typo3/sysext/form/Tests/Unit/Domain/Configuration/ConfigurationServiceTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Form\Domain\Configuration\Exception\PrototypeNotFoundException;
 /**
  * Test case
  */
-class ConfigurationServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ConfigurationServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Domain/Finishers/AbstractFinisherTest.php b/typo3/sysext/form/Tests/Unit/Domain/Finishers/AbstractFinisherTest.php
index b3f22289a71714bb8bd4eb194373d5f242320810..39337ec61219674cb2c7b9f6d88223335d894ef7 100644
--- a/typo3/sysext/form/Tests/Unit/Domain/Finishers/AbstractFinisherTest.php
+++ b/typo3/sysext/form/Tests/Unit/Domain/Finishers/AbstractFinisherTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Form\Domain\Runtime\FormRuntime;
 /**
  * Test case
  */
-class AbstractFinisherTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractFinisherTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractSectionTest.php b/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractSectionTest.php
index 59e963c009797186f6cecf962e565a5021811972..d93f75b5aac3d9bbf162d5b045ac899daa50081e 100644
--- a/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractSectionTest.php
+++ b/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractSectionTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Form\Domain\Model\FormElements\AbstractSection;
 /**
  * Test case
  */
-class AbstractSectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractSectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Domain/Runtime/FormRuntimeTest.php b/typo3/sysext/form/Tests/Unit/Domain/Runtime/FormRuntimeTest.php
index d92d25ce5c06c9082db29979d475fc7bdb59ceea..b344cc0761f05c8cd46b8ee4adbdee995331272a 100644
--- a/typo3/sysext/form/Tests/Unit/Domain/Runtime/FormRuntimeTest.php
+++ b/typo3/sysext/form/Tests/Unit/Domain/Runtime/FormRuntimeTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Form\Domain\Runtime\FormState;
 /**
  * Test case
  */
-class FormRuntimeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FormRuntimeTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Hooks/DataStructureIdentifierHookTest.php b/typo3/sysext/form/Tests/Unit/Hooks/DataStructureIdentifierHookTest.php
index 89fa9326496d6447043e437bfbd4ff101408dbc3..beeb84453018115c53a0e36ac9a16b8ca32e30fc 100644
--- a/typo3/sysext/form/Tests/Unit/Hooks/DataStructureIdentifierHookTest.php
+++ b/typo3/sysext/form/Tests/Unit/Hooks/DataStructureIdentifierHookTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface;
 /**
  * Test case
  */
-class DataStructureIdentifierHookTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DataStructureIdentifierHookTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Configuration/InheritancesResolverServiceTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Configuration/InheritancesResolverServiceTest.php
index 7a656933a86ffcfba0cd0e30630c0153e45e8f94..6c45d17aba6b5e014bfcb12208acdfd5ca614dee 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/Configuration/InheritancesResolverServiceTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/Configuration/InheritancesResolverServiceTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Form\Mvc\Configuration\InheritancesResolverService;
 /**
  * Test case
  */
-class InheritancesResolverServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class InheritancesResolverServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var InheritancesResolverService
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Configuration/TypoScriptServiceTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Configuration/TypoScriptServiceTest.php
index 64ff6ceb9c0f5eed861ce632233f0f510a7bbc9e..a591a78edf713f7a37869bc46ffc1912a486bfae 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/Configuration/TypoScriptServiceTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/Configuration/TypoScriptServiceTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 /**
  * Test case
  */
-class TypoScriptServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TypoScriptServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Configuration/YamlSourceTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Configuration/YamlSourceTest.php
index 370342f576ed9d699be384df036959aedb576409..b901cab348e0a788e050f1b5a29831fb761e62c9 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/Configuration/YamlSourceTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/Configuration/YamlSourceTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Form\Mvc\Configuration\YamlSource;
 /**
  * Test case
  */
-class YamlSourceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class YamlSourceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php
index 99e49716d526909aa2b03b0ec9d19eb08c912fbd..81fea3ea29ba5981e456a74f918b4e81f6dcff2f 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManager;
 /**
  * Test case
  */
-class FormPersistenceManagerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FormPersistenceManagerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/ProcessingRuleTest.php b/typo3/sysext/form/Tests/Unit/Mvc/ProcessingRuleTest.php
index b8c686a51b9b02493a56e33c62b573702fc839ad..7820c5c22b079db1f916e8db78d30ad74f141c34 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/ProcessingRuleTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/ProcessingRuleTest.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Form\Tests\Unit\Mvc\Validation\Fixtures\TestValidator;
 /**
  * Test case
  */
-class ProcessingRuleTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ProcessingRuleTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Validation/CountValidatorTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Validation/CountValidatorTest.php
index 667433036bd953994b931b5154582ca537cf6bfa..6aae77d142faeb7db133fbe6a3b234217e065079 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/Validation/CountValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/Validation/CountValidatorTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Form\Mvc\Validation\CountValidator;
 /**
  * Test case
  */
-class CountValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CountValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Validation/EmptyValidatorTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Validation/EmptyValidatorTest.php
index 271195021c2a6d6a63e32d93d4d7b2bc14a363d3..0e3a69ff144cd7c42c80ea6236d22afa80780fa1 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/Validation/EmptyValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/Validation/EmptyValidatorTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Form\Mvc\Validation\EmptyValidator;
 /**
  * Test case
  */
-class EmptyValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class EmptyValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Validation/MimeTypeValidatorTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Validation/MimeTypeValidatorTest.php
index 2f5c9e7c3d6ffb4f06aa6e654e5f29a0273111dd..5d891b7961937fd2de3ec4fac48299bcb9af3b9a 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/Validation/MimeTypeValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/Validation/MimeTypeValidatorTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Form\Mvc\Validation\MimeTypeValidator;
 /**
  * Test case
  */
-class MimeTypeValidatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MimeTypeValidatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/Service/TranslationServiceTest.php b/typo3/sysext/form/Tests/Unit/Service/TranslationServiceTest.php
index 8920c46bfed5fe59ea14069c1a7d6f927652a285..864f687f3cf3510ad8ca818197c557e76f0f55e9 100644
--- a/typo3/sysext/form/Tests/Unit/Service/TranslationServiceTest.php
+++ b/typo3/sysext/form/Tests/Unit/Service/TranslationServiceTest.php
@@ -27,7 +27,7 @@ use TYPO3\CMS\Lang\LanguageService;
 /**
  * Test case
  */
-class TranslationServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TranslationServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/form/Tests/Unit/ViewHelpers/Form/DatePickerViewHelperTest.php b/typo3/sysext/form/Tests/Unit/ViewHelpers/Form/DatePickerViewHelperTest.php
index 243449518cd07fdb551b3537a0b847c13280f17e..0923f811b91322e58ebe6a2ca7c9c407ab854039 100644
--- a/typo3/sysext/form/Tests/Unit/ViewHelpers/Form/DatePickerViewHelperTest.php
+++ b/typo3/sysext/form/Tests/Unit/ViewHelpers/Form/DatePickerViewHelperTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Form\ViewHelpers\Form\DatePickerViewHelper;
 /**
  * Test case
  */
-class DatePickerViewHelperTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DatePickerViewHelperTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php
index 6ff43dc1c85fdf39596f7d10d2484e104879002d..240c8a94194260b873e1225c19d251525ef7ec8f 100644
--- a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Frontend\Page\PageRepository;
 /**
  * Testcase for TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
  */
-class ContentObjectRendererTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class ContentObjectRendererTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var ContentObjectRenderer
diff --git a/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php
index 5bc6ca5d88b6f9580030fe08d50d23b20af84078..362d094eba3885d9f8b29cbc9e38fb7b19ab6b32 100644
--- a/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Frontend\ContentObject\TextContentObject;
 /**
  * Test case
  */
-class FluidTemplateContentObjectTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class FluidTemplateContentObjectTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['fluid'];
 
diff --git a/typo3/sysext/frontend/Tests/Functional/Controller/TypoScriptFrontendControllerTest.php b/typo3/sysext/frontend/Tests/Functional/Controller/TypoScriptFrontendControllerTest.php
index ed13ad44b4ab663048b56c8f1c235d0b5c533486..68dfb79f46cc05498a6e9b1b014e403491ab3e42 100644
--- a/typo3/sysext/frontend/Tests/Functional/Controller/TypoScriptFrontendControllerTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Controller/TypoScriptFrontendControllerTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 /**
  * Test case
  */
-class TypoScriptFrontendControllerTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class TypoScriptFrontendControllerTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var TypoScriptFrontendController
diff --git a/typo3/sysext/frontend/Tests/Functional/Page/PageRepositoryTest.php b/typo3/sysext/frontend/Tests/Functional/Page/PageRepositoryTest.php
index e4662c14c7fc188bde11ee6eeb28a1d2e8943ec9..e57c9cf54948e708e6d37a42be3441b8b4307309 100644
--- a/typo3/sysext/frontend/Tests/Functional/Page/PageRepositoryTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Page/PageRepositoryTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Frontend\Page\PageRepositoryGetPageHookInterface;
 /**
  * Test case
  */
-class PageRepositoryTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class PageRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['frontend'];
 
diff --git a/typo3/sysext/frontend/Tests/Functional/Tca/BackendLayoutVisibleFieldsTest.php b/typo3/sysext/frontend/Tests/Functional/Tca/BackendLayoutVisibleFieldsTest.php
index 3d9874d51a664f2c958d04757c014527e99c66bf..19ffc0e8971d1401b63debfa1ed5d4874eb17121 100644
--- a/typo3/sysext/frontend/Tests/Functional/Tca/BackendLayoutVisibleFieldsTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Tca/BackendLayoutVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class BackendLayoutVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class BackendLayoutVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $backendLayoutFields = [
         'title',
diff --git a/typo3/sysext/frontend/Tests/Functional/Tca/ContentVisibleFieldsTest.php b/typo3/sysext/frontend/Tests/Functional/Tca/ContentVisibleFieldsTest.php
index 6ca6235ba032d33db0385520ad7aa191bd0dc18a..0981da0168399ef975834a9939e097c9871371e5 100644
--- a/typo3/sysext/frontend/Tests/Functional/Tca/ContentVisibleFieldsTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Tca/ContentVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class ContentVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $commonContentFields = [
         'CType',
diff --git a/typo3/sysext/frontend/Tests/Functional/Tca/DomainVisibleFieldsTest.php b/typo3/sysext/frontend/Tests/Functional/Tca/DomainVisibleFieldsTest.php
index 5d47dcdde0fd4d3a77c511e43979c12897a978d8..15d3bc2e28fa5610b2b1c9484dd0874d523599cd 100644
--- a/typo3/sysext/frontend/Tests/Functional/Tca/DomainVisibleFieldsTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Tca/DomainVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class DomainVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class DomainVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $domainFields = [
         'hidden',
diff --git a/typo3/sysext/frontend/Tests/Functional/Tca/FrontendGroupsVisibleFieldsTest.php b/typo3/sysext/frontend/Tests/Functional/Tca/FrontendGroupsVisibleFieldsTest.php
index 6492c032ee574bc6625335d3883f4e6601e97c17..5c35648ae5c9d043f7313afc10d6cf68ad2ed6ee 100644
--- a/typo3/sysext/frontend/Tests/Functional/Tca/FrontendGroupsVisibleFieldsTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Tca/FrontendGroupsVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class FrontendGroupsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class FrontendGroupsVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $frontendGroupFields = [
         'hidden',
diff --git a/typo3/sysext/frontend/Tests/Functional/Tca/FrontendUsersVisibleFieldsTest.php b/typo3/sysext/frontend/Tests/Functional/Tca/FrontendUsersVisibleFieldsTest.php
index 93de9e49a73ae594a4eee931bea8c5474fe9bef9..843bee65cca5d5e0d6f1c2944860bad1bfc40d2f 100644
--- a/typo3/sysext/frontend/Tests/Functional/Tca/FrontendUsersVisibleFieldsTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Tca/FrontendUsersVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class FrontendUsersVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class FrontendUsersVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $frontendUsersFields = [
         'disable',
diff --git a/typo3/sysext/frontend/Tests/Functional/Tca/PagesLanguageOverlayVisibleFieldsTest.php b/typo3/sysext/frontend/Tests/Functional/Tca/PagesLanguageOverlayVisibleFieldsTest.php
index 399845d461ad748efd742c98f544c3efb61f3e3b..a96fe4dec1c8fb46825bcb12dc64613ad07a9c79 100644
--- a/typo3/sysext/frontend/Tests/Functional/Tca/PagesLanguageOverlayVisibleFieldsTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Tca/PagesLanguageOverlayVisibleFieldsTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Page\PageRepository;
 use TYPO3\CMS\Lang\LanguageService;
 
-class PagesLanguageOverlayVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class PagesLanguageOverlayVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * These form fields a visisble in the default page types.
diff --git a/typo3/sysext/frontend/Tests/Functional/Tca/TemplateVisibleFieldsTest.php b/typo3/sysext/frontend/Tests/Functional/Tca/TemplateVisibleFieldsTest.php
index fea34d667fde470a9126ecea40d641a4eb5cc9ef..c07b1afb559c05f11f297228a12a6d4bcbcecb38 100644
--- a/typo3/sysext/frontend/Tests/Functional/Tca/TemplateVisibleFieldsTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Tca/TemplateVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class TemplateVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class TemplateVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $templateFields = [
         'hidden',
diff --git a/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php b/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
index 255aa492877bfaa0d41512e7ba37b76d60a65774..921a67d153a531ff37d682a894568493fb462d1e 100644
--- a/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Frontend\Tests\Unit\Configuration\TypoScript\ConditionMatching\Fix
 /**
  * Test case
  */
-class ConditionMatcherTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ConditionMatcherTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var string Name of a key in $GLOBALS for this test
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
index 810d89ffc14f51a0bae7b24ba35ca557850e594f..9ab3d5b387bcd2683786c0b79c6fe52aa22fdc25 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Frontend\Page\PageRepository;
 /**
  * Testcase for TYPO3\CMS\Frontend\ContentObject\CaseContentObject
  */
-class CaseContentObjectTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CaseContentObjectTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var CaseContentObject|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentDataProcessorTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentDataProcessorTest.php
index 1f6218b12e79c6c49e6db6917e9e584e9f2ab909..2cb9a44ea4fef0103d8f7b27cc20c861c08b4376 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentDataProcessorTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentDataProcessorTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Frontend\Tests\Unit\ContentObject\Fixtures\DataProcessorFixture;
 /**
  * Testcase for TYPO3\CMS\Frontend\ContentObject\ContentDataProcessor
  */
-class ContentDataProcessorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ContentDataProcessorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var ContentDataProcessor
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
index 24dab9a36f7215c7c298970e3fdaa8e8dfd028f7..b5f4215d111b077bb1e5db27ff39b45405d8c0b3 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
@@ -54,7 +54,7 @@ use TYPO3\CMS\Frontend\Tests\Unit\ContentObject\Fixtures\PageRepositoryFixture;
 /**
  * Testcase for TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
  */
-class ContentObjectRendererTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ContentObjectRendererTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
index 1a311be6b0c515326a95fdec84f40bf87f050cc5..f4d703ee4c2200d15af23946ea80214e3ad548df 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
@@ -30,7 +30,7 @@ use TYPO3\CMS\Frontend\Resource\FileCollector;
 /**
  * Testcase for TYPO3\CMS\Frontend\ContentObject\FilesContentObject
  */
-class FilesContentObjectTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FilesContentObjectTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Frontend\ContentObject\FilesContentObject|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
index 233a77905955eaadc2adc0249fae96e8d75afb9c..8e90248124a5c90e5d32a2301e38c495c7156af9 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Frontend\ContentObject\FluidTemplateContentObject;
 /**
  * Testcase
  */
-class FluidTemplateContentObjectTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class FluidTemplateContentObjectTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array A backup of registered singleton instances
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
index affc054dbb9105769dccbae998a513accc5a9eb0..fe83cb23ffdc47f6e112279e9a8cbff9d2d5775e 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject;
  * Test case
  *
  */
-class AbstractMenuContentObjectTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractMenuContentObjectTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/MenuContentObjectFactoryTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/MenuContentObjectFactoryTest.php
index 1360e55fe987abd09f2dfd14b7df89be41fc0827..b1541ba5d4d0c823a9cdabdd23a3760058ac6c27 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/MenuContentObjectFactoryTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/MenuContentObjectFactoryTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Frontend\ContentObject\Menu\MenuContentObjectFactory;
 /**
  * Testcase
  */
-class MenuContentObjectFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class MenuContentObjectFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
index cbb82dbedd1e5a77967b304f27ecd1ecac710b54..58082fd2ad565f2593efb8e7eb224a4d4998a1da 100644
--- a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Frontend\Page\PageRepository;
 /**
  * Testcase for TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
  */
-class TypoScriptFrontendControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TypoScriptFrontendControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface|TypoScriptFrontendController
diff --git a/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php b/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
index b80a97313daf1b506b1e294b8def0b952a505c4e..0e868c8db94c84858f9216acf1f2f92cb4b30367 100644
--- a/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\Page;
 /**
  * Testcase
  */
-class CacheHashCalculatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CacheHashCalculatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Frontend\Page\CacheHashCalculator
diff --git a/typo3/sysext/frontend/Tests/Unit/Page/PageGeneratorTest.php b/typo3/sysext/frontend/Tests/Unit/Page/PageGeneratorTest.php
index a062d14a9354ddf2005bad4a4d67ac3b9a1fe186..10fe5e73a19c9c040adee5caefd2ba238a55194c 100644
--- a/typo3/sysext/frontend/Tests/Unit/Page/PageGeneratorTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Page/PageGeneratorTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Frontend\Tests\Unit\Page\Fixtures\PageGeneratorFixture;
 /**
  * Test case
  */
-class PageGeneratorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PageGeneratorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var PageGeneratorFixture
diff --git a/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php b/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
index c9394164c98dd1deb3ebce06e8158b6d6f242228..28770c99562d6162c5c9e3b713b59e5a50067d51 100644
--- a/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\Page;
 /**
  * Test case
  */
-class PageRepositoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PageRepositoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Frontend\Page\PageRepository|\TYPO3\Components\TestingFramework\Core\AccessibleObjectInterface
diff --git a/typo3/sysext/frontend/Tests/Unit/Plugin/AbstractPluginTest.php b/typo3/sysext/frontend/Tests/Unit/Plugin/AbstractPluginTest.php
index fc26615d81dfeb174c5e61ce580cd21415430a41..82364361781ef2de9d3b0741b0ec14069fa4350b 100644
--- a/typo3/sysext/frontend/Tests/Unit/Plugin/AbstractPluginTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Plugin/AbstractPluginTest.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Frontend\Tests\Unit\Fixtures\ResultBrowserPluginHook;
 /**
  * Testcase for TYPO3\CMS\Frontend\Plugin\AbstractPlugin
  */
-class AbstractPluginTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractPluginTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var AbstractPlugin
diff --git a/typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php b/typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php
index c7b6a74e1bb9e90ffd6a12241a342d216a049453..5ce3762eae724167458452c3705bc7168a893b6b 100644
--- a/typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Frontend\DataProcessing\GalleryProcessor;
 /**
  * Tests for  GalleryProcessor
  */
-class GalleryProcessorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class GalleryProcessorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var ContentObjectRenderer|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/frontend/Tests/Unit/Service/TypoLinkCodecServiceTest.php b/typo3/sysext/frontend/Tests/Unit/Service/TypoLinkCodecServiceTest.php
index edb1a01e3f491435da688ae776f8f79ce91b40d1..6ea385da774a8a32a504b4e663d5d43042af2b95 100644
--- a/typo3/sysext/frontend/Tests/Unit/Service/TypoLinkCodecServiceTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Service/TypoLinkCodecServiceTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Frontend\Service\TypoLinkCodecService;
 /**
  * Test case
  */
-class TypoLinkCodecServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class TypoLinkCodecServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var TypoLinkCodecService
diff --git a/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php b/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php
index 49185f34e863502937bc4ca02d96b6c39e563c45..3b3b6318651f3891de52caa4340735a6dbf9a26f 100644
--- a/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class AdminPanelViewTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AdminPanelViewTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Set up
diff --git a/typo3/sysext/impexp/Tests/Functional/Export/AbstractExportTestCase.php b/typo3/sysext/impexp/Tests/Functional/Export/AbstractExportTestCase.php
index 5c9c8e560e591fc9a743a2a310df918f9e3873e4..60b82ec926300cf4be04168dcc0b925b8635ab63 100644
--- a/typo3/sysext/impexp/Tests/Functional/Export/AbstractExportTestCase.php
+++ b/typo3/sysext/impexp/Tests/Functional/Export/AbstractExportTestCase.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Functional test for the Export
  */
-abstract class AbstractExportTestCase extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+abstract class AbstractExportTestCase extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var array
diff --git a/typo3/sysext/indexed_search/Tests/Functional/Tca/IndexConfigVisibleFieldsTest.php b/typo3/sysext/indexed_search/Tests/Functional/Tca/IndexConfigVisibleFieldsTest.php
index b2bc314ac2deff59cdaa816da8a32e2aac695a5a..4bc980d6654e8946464d04f7371c803e4f48fdea 100644
--- a/typo3/sysext/indexed_search/Tests/Functional/Tca/IndexConfigVisibleFieldsTest.php
+++ b/typo3/sysext/indexed_search/Tests/Functional/Tca/IndexConfigVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class IndexConfigVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class IndexConfigVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected static $commonIndexConfigFields = [
         'title',
diff --git a/typo3/sysext/indexed_search/Tests/Functional/Utility/LikeWildcardTest.php b/typo3/sysext/indexed_search/Tests/Functional/Utility/LikeWildcardTest.php
index a806bd539c4b09409c7208e410bdf4d5089a3365..c33ea76e400c5f1d65ac2dbaf23da7990b5b3cca 100644
--- a/typo3/sysext/indexed_search/Tests/Functional/Utility/LikeWildcardTest.php
+++ b/typo3/sysext/indexed_search/Tests/Functional/Utility/LikeWildcardTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\IndexedSearch\Utility\LikeWildcard;
 /**
  * This class contains unit tests for the LikeQueryUtility
  */
-class LikeWildcardTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class LikeWildcardTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php b/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
index 324f6b065eaa5a205f16f90c30f74f39d92350c1..327386cfa972e393c528356dc06bd3f346a192e3 100644
--- a/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
+++ b/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\IndexedSearch\Tests\Unit;
 /**
  * This class contains unit tests for the indexer
  */
-class IndexerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class IndexerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Indexer instance
diff --git a/typo3/sysext/install/Tests/Functional/SqlSchemaMigrationServiceTest.php b/typo3/sysext/install/Tests/Functional/SqlSchemaMigrationServiceTest.php
index 6ffe4726855b689f0b47f24004f9085872431840..a2e60c68550897adc9d366edf9c9abdf5690752d 100644
--- a/typo3/sysext/install/Tests/Functional/SqlSchemaMigrationServiceTest.php
+++ b/typo3/sysext/install/Tests/Functional/SqlSchemaMigrationServiceTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Install\Tests\Functional;
 /**
  * Functional tests for the SQL schema migration service.
  */
-class SqlSchemaMigrationServiceTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class SqlSchemaMigrationServiceTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var \TYPO3\CMS\Install\Service\SqlSchemaMigrationService
diff --git a/typo3/sysext/install/Tests/Unit/Controller/Action/Ajax/ExtensionCompatibilityTesterTest.php b/typo3/sysext/install/Tests/Unit/Controller/Action/Ajax/ExtensionCompatibilityTesterTest.php
index 25008c56c69d7243724b61cdb84ea365e1bf6186..3efd8bf586bddea5142d8b72a8e426c2162e3889 100644
--- a/typo3/sysext/install/Tests/Unit/Controller/Action/Ajax/ExtensionCompatibilityTesterTest.php
+++ b/typo3/sysext/install/Tests/Unit/Controller/Action/Ajax/ExtensionCompatibilityTesterTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class ExtensionCompatibilityTesterTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExtensionCompatibilityTesterTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Core\Package\UnitTestPackageManager A backup of unit test package manager
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/DefaultFactoryTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/DefaultFactoryTest.php
index b554e0f1350c28642641d96bb969f4de2576125a..c863bbc616f392d2128edd0468414914e3d3b156 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/DefaultFactoryTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/DefaultFactoryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
 /**
  * Test case
  */
-class DefaultFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DefaultFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
index 73a4211e8e648279c2b73dfa82622d4ac6c515f4..c3d8c26af5c6c68ec3ad2f4a4b0579ed797dfe49 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
 /**
  * Test case
  */
-class LinkNodeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LinkNodeTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
index 80abdf929f885ca69a3c354a91b79bb67f473223..0526fd508b5f4c8f967d27b2eb01f2ada597c364 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Install\FolderStructure\Exception\RootNodeException;
 /**
  * Test case
  */
-class RootNodeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RootNodeTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
index 02c6200a8e006ab2c8f8258a771ebd360355996b..77484b228a7437f404d94bb2ad98314e6df4232d 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
 /**
  * Test case
  */
-class StructureFacadeTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class StructureFacadeTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php b/typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php
index b6836b9aa7f21c0a7ef633f659717d12cfb80ed2..811ac68f74852e453d8851831e27c0f34975a9ed 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php
@@ -19,7 +19,7 @@ use org\bovigo\vfs\vfsStream;
 /**
  * Test case
  */
-abstract class FolderStructureTestCase extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+abstract class FolderStructureTestCase extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Create a random directory in the virtual file system and return the path.
diff --git a/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
index e44e0e0fd060bf14d85e55861d4379d5eb989d6f..cb8a35c860724c017b1a6ab74c5f4eee58bb5f23 100644
--- a/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Install\Service;
 /**
  * Test case
  */
-class CoreUpdateServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CoreUpdateServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
index 5d3ec428937f7753822b6639d42bb4e144b714e3..e1bd47fd0cfc151a14b9fa441b8038089776b445 100644
--- a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Install\Service\Exception\CoreVersionServiceException;
 /**
  * Test case
  */
-class CoreVersionServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CoreVersionServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/install/Tests/Unit/Service/EnableFileServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/EnableFileServiceTest.php
index da970a4210723838c649b86511561b91967a9616..8e0a589e9fa25164843b85454e00462b4fa2a258 100644
--- a/typo3/sysext/install/Tests/Unit/Service/EnableFileServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/EnableFileServiceTest.php
@@ -19,7 +19,7 @@ use org\bovigo\vfs\vfsStream;
 /**
  * Test case
  */
-class EnableFileServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class EnableFileServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Data provider
diff --git a/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
index 38b85eb4b073c67c4b283c83ecbd11b64f35b82d..71f0517c8ca37302037d508d4959a0832d03bc45 100644
--- a/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Install\Controller\Exception\RedirectException;
 /**
  * Test case
  */
-class SilentConfigurationUpgradeServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SilentConfigurationUpgradeServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject
diff --git a/typo3/sysext/install/Tests/Unit/Service/SqlSchemaMigrationServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/SqlSchemaMigrationServiceTest.php
index bddd0d4d98b98cb649dfcca5d5e85123defb61a1..618147233ea9b15be6acdb28dfc78f4b154da771 100644
--- a/typo3/sysext/install/Tests/Unit/Service/SqlSchemaMigrationServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/SqlSchemaMigrationServiceTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Install\Service\SqlSchemaMigrationService;
 /**
  * Test case
  */
-class SqlSchemaMigrationServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SqlSchemaMigrationServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Get a SchemaService instance with mocked DBAL enable database connection, DBAL not enabled
diff --git a/typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php b/typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php
index 10bd89fa838cfe11abb8e5a755cc777ecb2dc58d..b5b73983f9b8efdf84987ece59a1742d6978520c 100644
--- a/typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php
+++ b/typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Install\Status\StatusUtility;
 /**
  * Test case
  */
-class StatusUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class StatusUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/install/Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php b/typo3/sysext/install/Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php
index e32423cc090a73e15ba65e6144f5617928279452..4562ce6a800a133aef62bde9ffbe26d9ae482131 100644
--- a/typo3/sysext/install/Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php
+++ b/typo3/sysext/install/Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php
@@ -19,7 +19,7 @@ use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
 use TYPO3\CMS\Install\UpgradeAnalysis\DocumentationFile;
 
-class DocumentationFileTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class DocumentationFileTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
 
     /**
diff --git a/typo3/sysext/install/Tests/Unit/View/JsonViewTest.php b/typo3/sysext/install/Tests/Unit/View/JsonViewTest.php
index e77c6bc4c453c47d3a167b5d9ceaf04ae6efd83e..13f49f0914189dd57b10a1e4fc4c956f2a0c44e8 100644
--- a/typo3/sysext/install/Tests/Unit/View/JsonViewTest.php
+++ b/typo3/sysext/install/Tests/Unit/View/JsonViewTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Install\Status\Exception;
 /**
  * Tests for the custom json view class
  */
-class JsonViewTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class JsonViewTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php b/typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php
index 1243f70230c084c555376a2bba4588fbf9b9d8eb..be2a38b04278f9a6f0beb0903fb4241e64b0c371 100644
--- a/typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php
+++ b/typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Lang\Tests\Unit\Domain\Model;
 /**
  * Testcase for Extension
  */
-class ExtensionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ExtensionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Lang\Domain\Model\Extension
diff --git a/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageTest.php b/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageTest.php
index eea14cdd36260df31274005a4a7dd91e18de2ec0..a2d7536dc864bdc73eb754664a801e2eb28317bc 100644
--- a/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageTest.php
+++ b/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Lang\Tests\Unit\Domain\Model;
 /**
  * Testcase for Language
  */
-class LanguageTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class LanguageTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Lang\Domain\Model\Language
diff --git a/typo3/sysext/lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php b/typo3/sysext/lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php
index 9b6b3b11e75925f95ecbfee52778be1fbad9a999..35b3ab803a9b7e2177b14cccaa589ac078a3ea93 100644
--- a/typo3/sysext/lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php
+++ b/typo3/sysext/lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Lowlevel\Tests\Unit\Utility;
 /**
  * Testcase for the \TYPO3\CMS\Lowlevel\Utility\ArrayBrowser class in the TYPO3 Core.
  */
-class ArrayBrowserTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ArrayBrowserTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Lowlevel\Utility\ArrayBrowser
diff --git a/typo3/sysext/recordlist/Tests/Unit/RecordList/AbstractDatabaseRecordListTest.php b/typo3/sysext/recordlist/Tests/Unit/RecordList/AbstractDatabaseRecordListTest.php
index 2166e233176c1c0bab66868eab2cc7492bbad7e5..c556bb254f756add165db753c1824f59d087306a 100644
--- a/typo3/sysext/recordlist/Tests/Unit/RecordList/AbstractDatabaseRecordListTest.php
+++ b/typo3/sysext/recordlist/Tests/Unit/RecordList/AbstractDatabaseRecordListTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRecordList;
 /**
  * Test case
  */
-class AbstractDatabaseRecordListTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AbstractDatabaseRecordListTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php b/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php
index 8bda23e585dd8c352c5ecc90c4687bb12e25ac52..ff7408816b95e74627545ec024ff1204728da1df 100644
--- a/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php
+++ b/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Functional test for the Export
  */
-abstract class AbstractRecycleTestCase extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+abstract class AbstractRecycleTestCase extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var array
diff --git a/typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php b/typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php
index d8bffeb08caf85eb9268be065801e204093a3179..920cde1b8640743b3269ed27cd00a10236c4e655 100644
--- a/typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php
+++ b/typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Scheduler\Controller\SchedulerModuleController;
 /**
  * Testcase
  */
-class CleanerFieldProviderTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CleanerFieldProviderTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var CleanerFieldProvider
diff --git a/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php b/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
index 026ffbcafa67d235af6ccc5e1d599ef932983270..439992baa312e5e690a58f7d801f35ec83a2c016 100644
--- a/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
+++ b/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
@@ -28,7 +28,7 @@ use TYPO3\CMS\Recycler\Task\CleanerTask;
 /**
  * Testcase
  */
-class CleanerTaskTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CleanerTaskTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|CleanerTask
diff --git a/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php b/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php
index 8c3a5824f8f2866c863e03b19294810d9d4832ef..73c72419e72a83f1ce928c7d2138c5f2f57a9789 100644
--- a/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php
+++ b/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Reports\Tests\Unit\Report\Status;
 /**
  * Test case
  */
-class Typo3StatusTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class Typo3StatusTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Set up
diff --git a/typo3/sysext/rsaauth/Tests/Functional/Storage/SplitStorageTest.php b/typo3/sysext/rsaauth/Tests/Functional/Storage/SplitStorageTest.php
index d7163c71b520a2a05d6f802905ba9c8b41e31909..54da92245ba781da3473f973a09fce7280b13b45 100644
--- a/typo3/sysext/rsaauth/Tests/Functional/Storage/SplitStorageTest.php
+++ b/typo3/sysext/rsaauth/Tests/Functional/Storage/SplitStorageTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Rsaauth\Storage\SplitStorage;
 /**
  * Test case.
  */
-class SplitStorageTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class SplitStorageTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * XML database fixtures to be loaded into database.
diff --git a/typo3/sysext/rsaauth/Tests/Unit/Backend/CommandLineBackendTest.php b/typo3/sysext/rsaauth/Tests/Unit/Backend/CommandLineBackendTest.php
index caf6e7df2214a2f0a43d4a6eac58c4f1f8656695..0a15567a0dca7fa6722422d2bab36ec278e27d21 100644
--- a/typo3/sysext/rsaauth/Tests/Unit/Backend/CommandLineBackendTest.php
+++ b/typo3/sysext/rsaauth/Tests/Unit/Backend/CommandLineBackendTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Rsaauth\Backend\CommandLineBackend;
 /**
  * Test case.
  */
-class CommandLineBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CommandLineBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var CommandLineBackend
diff --git a/typo3/sysext/rsaauth/Tests/Unit/Backend/PhpBackendTest.php b/typo3/sysext/rsaauth/Tests/Unit/Backend/PhpBackendTest.php
index 025b46356dcc62525becdbdc55bb62d387cbe26f..9adb813f597fd97dca4fec04cabf89b7a94dffc8 100644
--- a/typo3/sysext/rsaauth/Tests/Unit/Backend/PhpBackendTest.php
+++ b/typo3/sysext/rsaauth/Tests/Unit/Backend/PhpBackendTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Rsaauth\Backend\PhpBackend;
 /**
  * Test case.
  */
-class PhpBackendTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PhpBackendTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var PhpBackend
diff --git a/typo3/sysext/rsaauth/Tests/Unit/KeypairTest.php b/typo3/sysext/rsaauth/Tests/Unit/KeypairTest.php
index 5b822d88e5cb07055150df88cfb03125f43b33ab..93c9d8f4cdd9540d874925cd9d7c7bcc16974139 100644
--- a/typo3/sysext/rsaauth/Tests/Unit/KeypairTest.php
+++ b/typo3/sysext/rsaauth/Tests/Unit/KeypairTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Rsaauth\Keypair;
 /**
  * Test case.
  */
-class KeypairTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class KeypairTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Keypair
diff --git a/typo3/sysext/rtehtmlarea/Tests/Functional/Tca/AcronymVisibleFieldsTest.php b/typo3/sysext/rtehtmlarea/Tests/Functional/Tca/AcronymVisibleFieldsTest.php
index 686ffa831b183ca08f6f9bb806d6aabdd89ccbdf..226058c6eb9e583e1e8b5cb398d0a98bc964712f 100644
--- a/typo3/sysext/rtehtmlarea/Tests/Functional/Tca/AcronymVisibleFieldsTest.php
+++ b/typo3/sysext/rtehtmlarea/Tests/Functional/Tca/AcronymVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class AcronymVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class AcronymVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['rtehtmlarea'];
 
diff --git a/typo3/sysext/saltedpasswords/Tests/Functional/SaltedPasswordServiceTest.php b/typo3/sysext/saltedpasswords/Tests/Functional/SaltedPasswordServiceTest.php
index a31aeb716245a5d3eb91be46c6540e17d4aab5a9..ce8f84b3d94ca3988dc419290cadb0eea003e625 100644
--- a/typo3/sysext/saltedpasswords/Tests/Functional/SaltedPasswordServiceTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Functional/SaltedPasswordServiceTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Saltedpasswords\SaltedPasswordService;
 /**
  * Test case for \TYPO3\CMS\Saltedpasswords\SaltedPasswordService
  */
-class SaltedPasswordServiceTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class SaltedPasswordServiceTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
 
     /**
diff --git a/typo3/sysext/saltedpasswords/Tests/Functional/Task/BulkUpdateTaskTest.php b/typo3/sysext/saltedpasswords/Tests/Functional/Task/BulkUpdateTaskTest.php
index abafa14085f64deb8f78ab29d648a91416823eb1..5a3d408332c2754530c7f2202081bf8f593cdcc7 100644
--- a/typo3/sysext/saltedpasswords/Tests/Functional/Task/BulkUpdateTaskTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Functional/Task/BulkUpdateTaskTest.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Saltedpasswords\Task\BulkUpdateTask;
 /**
  * Test case for \TYPO3\CMS\Saltedpasswords\Utility\SaltedPasswordsUtility
  */
-class BulkUpdateTaskTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class BulkUpdateTaskTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * XML database fixtures to be loaded into database.
diff --git a/typo3/sysext/saltedpasswords/Tests/Functional/Utility/SaltedPasswordsUtilityTest.php b/typo3/sysext/saltedpasswords/Tests/Functional/Utility/SaltedPasswordsUtilityTest.php
index e2ad828b280ce143610863fafae573aad6f67544..ca15309823e7c6c9e8e2cb9979b53a1375511d37 100644
--- a/typo3/sysext/saltedpasswords/Tests/Functional/Utility/SaltedPasswordsUtilityTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Functional/Utility/SaltedPasswordsUtilityTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Saltedpasswords\Utility\SaltedPasswordsUtility;
 /**
  * Test case for \TYPO3\CMS\Saltedpasswords\Utility\SaltedPasswordsUtility
  */
-class SaltedPasswordsUtilityTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class SaltedPasswordsUtilityTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
 
     /**
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
index 9e752a0b8b8105dc66a0c5f36564de89f71be726..22303be785df21d3badd0945f17f99849a8a8388 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Saltedpasswords\Evaluation\Evaluator;
 /**
  * Testcase for SaltedPasswordsUtility
  */
-class EvaluatorTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class EvaluatorTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var Evaluator
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
index f4d9ff4d23a2362db82c993666e45b93b689e438..286ec095495790415793cf582cf2af4037abddbe 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Crypto\Random;
 /**
  * Testcase for BlowfishSalt
  */
-class BlowfishSaltTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class BlowfishSaltTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Keeps instance of object to test.
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
index 8864b504ebaa61240942caae0fc1a223c39e6895..c2037ad1555de2b6b8bfe06c58e29081e0418fa4 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Crypto\Random;
 /**
  * Testcases for Md5Salt
  */
-class Md5SaltTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class Md5SaltTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Keeps instance of object to test.
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
index 88279c85b4244989a08665fbdda05dc93b59d4b0..d61302999784365fcd74f5278fb767089e7b3e27 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Saltedpasswords\Salt\Pbkdf2Salt;
 /**
  * Testcase for Pbkdf2Salt
  */
-class Pbkdf2SaltTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class Pbkdf2SaltTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Keeps instance of object to test.
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
index 51b70431becc25465e27c3e475f78293669eab9f..00a11789ff86a2a73d6d99fdb7e8eccb8063b11b 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Crypto\Random;
 /**
  * Testcase for PhpassSalt
  */
-class PhpassSaltTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class PhpassSaltTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Keeps instance of object to test.
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
index 8c88840ce7e24f7535de69a0e99dd2a5555dcc66..68e525be3af58e92cdeb1b90988a985aadc7bb69 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Crypto\Random;
 /**
  * Testcase for SaltFactory
  */
-class SaltFactoryTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SaltFactoryTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Keeps instance of object to test.
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Utility/SaltedPasswordsUtilityTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Utility/SaltedPasswordsUtilityTest.php
index 7927c86c3ab1633a73abda5c08fe326f81c303b6..13b6b29c351389e4ee19502ce163e9a7cff8db96 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Utility/SaltedPasswordsUtilityTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Utility/SaltedPasswordsUtilityTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Saltedpasswords\Tests\Unit\Utility;
 /**
  * Testcase for SaltedPasswordsUtility
  */
-class SaltedPasswordsUtilityTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SaltedPasswordsUtilityTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/scheduler/Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php b/typo3/sysext/scheduler/Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php
index eab15796aa3c886e7a124598370fbdc11df70b5b..69341aecdfe5aa21a8f612406f512ab4bf869028 100644
--- a/typo3/sysext/scheduler/Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php
+++ b/typo3/sysext/scheduler/Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class TaskGroupVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class TaskGroupVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['scheduler'];
 
diff --git a/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php b/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php
index 58be8fda8eac1d1bf810ec1ff1710cb43fa4d786..7d4974ba1061dbc48ac9af8f2574672af5dcdb49 100644
--- a/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Scheduler\CronCommand\CronCommand;
 /**
  * Test case
  */
-class CronCommandTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CronCommandTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @const integer timestamp of 1.1.2010 0:00 (Friday), timezone UTC/GMT
diff --git a/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php b/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php
index 1a17e12eb23b805302217a0df8d40c8cf0e26a98..dfb1d428db988057f1951e9b83928fdf721e0892 100644
--- a/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Scheduler\Tests\Unit\CronCommand\AccessibleProxies\NormalizeComman
 /**
  * Test case
  */
-class NormalizeCommandTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class NormalizeCommandTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @return array
diff --git a/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php b/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
index 6297bebc2ddada536f2cdf237daa06bae5495862..1d048e40ef89b236ed4cf19b6e59804bcf9595ae 100644
--- a/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * Test case
  */
-class CachingFrameworkGarbageCollectionTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class CachingFrameworkGarbageCollectionTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var array
diff --git a/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php b/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php
index 84e4a77e6c280054bac14144f7fc3fac5186437c..2c261660b47ed2c08eda442c45ff00f708cbfa81 100644
--- a/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php
+++ b/typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Setup\Controller\SetupModuleController;
 /**
  * Class SetupModuleControllerTest
  */
-class SetupModuleControllerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class SetupModuleControllerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @test
diff --git a/typo3/sysext/sv/Tests/Functional/AuthenticationServiceTest.php b/typo3/sysext/sv/Tests/Functional/AuthenticationServiceTest.php
index 6af8fa6e42a16ddc23984c6dce9d7c1e116c4261..8dbbc72206e80a456c10a2962146fb3aa56a694f 100644
--- a/typo3/sysext/sv/Tests/Functional/AuthenticationServiceTest.php
+++ b/typo3/sysext/sv/Tests/Functional/AuthenticationServiceTest.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Sv\AuthenticationService;
 /**
  * Testcase for class \TYPO3\CMS\Sv\AuthenticationService
  */
-class AuthenticationServiceTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class AuthenticationServiceTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
      * @var AuthenticationService
diff --git a/typo3/sysext/sv/Tests/Unit/AuthenticationServiceTest.php b/typo3/sysext/sv/Tests/Unit/AuthenticationServiceTest.php
index ed72bb19d0c7701493f796c06e259e611937dc13..794097a87053447fc169af0b5b1f35d6bd8040a5 100644
--- a/typo3/sysext/sv/Tests/Unit/AuthenticationServiceTest.php
+++ b/typo3/sysext/sv/Tests/Unit/AuthenticationServiceTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Sv\Tests\Unit;
  * Testcase for class \TYPO3\CMS\Sv\AuthenticationService
  *
  */
-class AuthenticationServiceTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class AuthenticationServiceTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * Date provider for processLoginReturnsCorrectData
diff --git a/typo3/sysext/sv/Tests/Unit/Report/ServicesListReportTest.php b/typo3/sysext/sv/Tests/Unit/Report/ServicesListReportTest.php
index fec68305cc894aab443a3a38eee705d751f28e33..aad09034cf34295370c0bd19b86241cbf3501bbb 100644
--- a/typo3/sysext/sv/Tests/Unit/Report/ServicesListReportTest.php
+++ b/typo3/sysext/sv/Tests/Unit/Report/ServicesListReportTest.php
@@ -26,7 +26,7 @@ use TYPO3\CMS\Sv\Report\ServicesListReport;
 /**
  * Test case for class ServicesListReport
  */
-class ServicesListReportTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class ServicesListReportTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var ServicesListReport
diff --git a/typo3/sysext/sys_action/Tests/Functional/Tca/ActionVisibleFieldsTest.php b/typo3/sysext/sys_action/Tests/Functional/Tca/ActionVisibleFieldsTest.php
index 3a123c8e6cf3120c1bcc3b75e527ee86f0575987..94feecd6ba70194446d84f8611acfe3087b44f4c 100644
--- a/typo3/sysext/sys_action/Tests/Functional/Tca/ActionVisibleFieldsTest.php
+++ b/typo3/sysext/sys_action/Tests/Functional/Tca/ActionVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class ActionVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class ActionVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['sys_action'];
 
diff --git a/typo3/sysext/sys_note/Tests/Functional/Tca/NoteVisibleFieldsTest.php b/typo3/sysext/sys_note/Tests/Functional/Tca/NoteVisibleFieldsTest.php
index a5733b7ca6610ef3dcd4c1ac4c31f71046d6c76f..5904f6a11e7edc9ded513c99b2e234eb60e5038f 100644
--- a/typo3/sysext/sys_note/Tests/Functional/Tca/NoteVisibleFieldsTest.php
+++ b/typo3/sysext/sys_note/Tests/Functional/Tca/NoteVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class NoteVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class NoteVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['sys_note'];
 
diff --git a/typo3/sysext/workspaces/Tests/Functional/ActionHandler/ActionHandlerTest.php b/typo3/sysext/workspaces/Tests/Functional/ActionHandler/ActionHandlerTest.php
index 2a00c8a5953dfc8525217bcbd5000ec333df1514..616a95a0abb615e8aa489d0f4e6958a26c771ecb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/ActionHandler/ActionHandlerTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/ActionHandler/ActionHandlerTest.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 /**
  * Action handler test
  */
-class ActionHandlerTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class ActionHandlerTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['version', 'workspaces'];
 
diff --git a/typo3/sysext/workspaces/Tests/Functional/Service/WorkspaceServiceTest.php b/typo3/sysext/workspaces/Tests/Functional/Service/WorkspaceServiceTest.php
index 5855f7bc031e606f2076488bea1eb0c20f819d08..65a61e0988b4b344602252eb410e1baf543fc948 100644
--- a/typo3/sysext/workspaces/Tests/Functional/Service/WorkspaceServiceTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/Service/WorkspaceServiceTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Workspaces\Tests\Functional\Service;
 /**
  * Workspace service test
  */
-class WorkspaceServiceTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class WorkspaceServiceTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['version', 'workspaces'];
 
diff --git a/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php b/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php
index 92e19aa4fdc088915d1567ed3eefb5b75b8d1a45..9ebf994b2421f77b4a5df753f5c2d88f70596ebc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class WorkspaceStageVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class WorkspaceStageVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['workspaces'];
 
diff --git a/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php b/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php
index 02891dfb437002edb8c592c4d8b3492453d83f8e..8b243287f227db7a9c1027d0642df8db950428b4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
-class WorkspaceVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\FunctionalTestCase
+class WorkspaceVisibleFieldsTest extends \TYPO3\Components\TestingFramework\Core\Functional\FunctionalTestCase
 {
     protected $coreExtensionsToLoad = ['workspaces'];
 
diff --git a/typo3/sysext/workspaces/Tests/Unit/Controller/Remote/RemoteServerTest.php b/typo3/sysext/workspaces/Tests/Unit/Controller/Remote/RemoteServerTest.php
index 8ed4b476216083f2542b2c9c7a9315fdcab3834e..050b4215319e7f80a5f0f161bba2a1f1506a28dc 100644
--- a/typo3/sysext/workspaces/Tests/Unit/Controller/Remote/RemoteServerTest.php
+++ b/typo3/sysext/workspaces/Tests/Unit/Controller/Remote/RemoteServerTest.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 /**
  * RemoteServer test
  */
-class RemoteServerTest extends \TYPO3\Components\TestingFramework\Core\UnitTestCase
+class RemoteServerTest extends \TYPO3\Components\TestingFramework\Core\Unit\UnitTestCase
 {
     /**
      * @var \TYPO3\CMS\Workspaces\Controller\Remote\RemoteServer